ruby-next-core 0.14.0 → 0.15.1

data/lib/ruby-next/cli.rb

@@ -80,18 +80,16 @@ module RubyNext
     end
 
     def optparser
-      @optparser ||= begin
-        OptionParser.new do |opts|
-          opts.banner = "Usage: ruby-next COMMAND [options]"
-
-          opts.on("-v", "--version", "Print version") do
-            $stdout.puts RubyNext::VERSION
-            exit 0
-          end
-
-          opts.on("-h", "--help", "Print help") do
-            @print_help = true
-          end
+      @optparser ||= OptionParser.new do |opts|
+        opts.banner = "Usage: ruby-next COMMAND [options]"
+
+        opts.on("-v", "--version", "Print version") do
+          $stdout.puts RubyNext::VERSION
+          exit 0
+        end
+
+        opts.on("-h", "--help", "Print help") do
+          @print_help = true
         end
       end
     end

data/lib/ruby-next/commands/nextify.rb

@@ -24,6 +24,8 @@ module RubyNext
           contents = File.read(path)
           transpile path, contents
         end
+
+        ensure_rbnext!
       end
 
       def parse!(args)
@@ -150,6 +152,7 @@ module RubyNext
         transpile path, contents, version: version
       rescue SyntaxError, StandardError => e
         warn "Failed to transpile #{path}: #{e.class} — #{e.message}"
+        warn e.backtrace.take(10).join("\n") if ENV["RUBY_NEXT_DEBUG"] == "1"
         exit 1
       end
 
@@ -185,6 +188,17 @@ module RubyNext
         FileUtils.rm_r(next_dir_path)
       end
 
+      def ensure_rbnext!
+        return if CLI.dry_run? || stdout?
+
+        return if File.directory?(next_dir_path)
+
+        return if next_dir_path.end_with?(".rb")
+
+        FileUtils.mkdir_p next_dir_path
+        File.write(File.join(next_dir_path, ".keep"), "")
+      end
+
       def next_dir_path
         @next_dir_path ||= (out_path || File.join(lib_path, RUBY_NEXT_DIR))
       end

data/lib/ruby-next/core/proc/compose.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# rubocop:disable Style/LambdaCall
 RubyNext::Core.patch Proc, name: "ProcCompose", method: :<<, version: "2.6" do
   <<-RUBY
 def <<(other)

data/lib/ruby-next/core/refinement/import.rb

@@ -54,7 +54,7 @@ RubyNext::Core.singleton_class.module_eval do
 
     # Copy constants (they could be accessed from methods)
     other.constants.each do |name|
-      Kernel.eval "#{name} = #{other}::#{name}", bind
+      Kernel.eval "#{name} = #{other}::#{name}", bind # rubocop:disable Style/EvalWithLocation
     end
   end
 end

data/lib/ruby-next/core.rb

@@ -62,7 +62,7 @@ module RubyNext
         mod_name = singleton? ? singleton.name : mod.name
         camelized_method_name = method_name.to_s.split("_").map(&:capitalize).join
 
-        "#{mod_name}#{camelized_method_name}".gsub(/\W/, "") # rubocop:disable Performance/StringReplacement
+        "#{mod_name}#{camelized_method_name}".gsub(/\W/, "")
       end
 
       def build_location(trace_locations)

data/lib/ruby-next/irb.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "ruby-next"
+# Include RubyNext into TOPLEVEL_BINDING for polyfills to work
+eval("using RubyNext", TOPLEVEL_BINDING, __FILE__, __LINE__)
+
+require "ruby-next/language"
+
+# IRB extension to transpile code before evaluating
+module RubyNext
+  module IRBExt
+    def evaluate(context, statements, *args)
+      new_statements = ::RubyNext::Language.transform(
+        statements,
+        rewriters: ::RubyNext::Language.current_rewriters,
+        using: false
+      )
+
+      super(context, new_statements, *args)
+    end
+  end
+end
+
+IRB::WorkSpace.prepend(RubyNext::IRBExt)

data/lib/ruby-next/language/rewriters/2.5/rescue_within_block.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module RubyNext
+  module Language
+    module Rewriters
+      class RescueWithinBlock < Base
+        NAME = "rescue-within-block"
+        SYNTAX_PROBE = "lambda do
+          raise 'err'
+        rescue
+          $! # => #<RuntimeError: err>
+        end.call"
+
+        MIN_SUPPORTED_VERSION = Gem::Version.new("2.5.0")
+
+        def on_block(block_node)
+          exception_node = block_node.children.find do |node|
+            node && (node.type == :rescue || node.type == :ensure)
+          end
+
+          return super(block_node) unless exception_node
+
+          context.track! self
+
+          insert_before(exception_node.loc.expression, "begin;")
+          insert_after(exception_node.loc.expression, ";end")
+
+          new_children = block_node.children.map do |child|
+            next s(:kwbegin, exception_node) if child == exception_node
+
+            child
+          end
+
+          process(
+            block_node.updated(:block, new_children)
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -182,7 +182,6 @@ module RubyNext
           end
         end
 
-        # rubocop:disable Style/MethodMissingSuper
         # rubocop:disable Style/MissingRespondToMissing
         class Noop < Base
           # Return node itself, no memoization
@@ -243,6 +242,7 @@ module RubyNext
 
           @deconstructed_keys = {}
           @predicates = Predicates::CaseIn.new
+          @lvars = []
 
           matchee_ast =
             s(:begin, s(:lvasgn, MATCHEE, node.children[0]))
@@ -272,6 +272,7 @@ module RubyNext
 
           @deconstructed_keys = {}
           @predicates = Predicates::Noop.new
+          @lvars = []
 
           matchee =
             s(:begin, s(:lvasgn, MATCHEE, node.children[0]))
@@ -282,10 +283,12 @@ module RubyNext
               arr: MATCHEE_ARR,
               hash: MATCHEE_HASH
             ) do
-              send(
-                :"#{node.children[1].type}_clause",
-                node.children[1]
-              ).then do |node|
+              with_declared_locals do
+                send(
+                  :"#{node.children[1].type}_clause",
+                  node.children[1]
+                )
+              end.then do |node|
                 s(:begin,
                   s(:or,
                     node,
@@ -311,6 +314,7 @@ module RubyNext
 
           @deconstructed_keys = {}
           @predicates = Predicates::Noop.new
+          @lvars = []
 
           matchee =
             s(:begin, s(:lvasgn, MATCHEE, node.children[0]))
@@ -321,10 +325,12 @@ module RubyNext
               arr: MATCHEE_ARR,
               hash: MATCHEE_HASH
             ) do
-              send(
-                :"#{node.children[1].type}_clause",
-                node.children[1]
-              )
+              with_declared_locals do
+                send(
+                  :"#{node.children[1].type}_clause",
+                  node.children[1]
+                )
+              end
             end
 
           node.updated(
@@ -395,13 +401,15 @@ module RubyNext
         def build_when_clause(clause)
           predicates.reset!
           [
-            with_guard(
-              send(
-                :"#{clause.children[0].type}_clause",
-                clause.children[0]
-              ),
-              clause.children[1] # guard
-            ),
+            with_declared_locals do
+              with_guard(
+                send(
+                  :"#{clause.children[0].type}_clause",
+                  clause.children[0]
+                ),
+                clause.children[1] # guard
+              )
+            end,
             process(clause.children[2] || s(:nil)) # expression
           ].then do |children|
             s(:when, *children)
@@ -442,7 +450,7 @@ module RubyNext
           var = node.children[0]
           return s(:true) if var == :_
 
-          check_match_var_alternation!(var) unless var.is_a?(::Parser::AST::Node)
+          check_match_var_alternation!(var)
 
           s(:begin,
             s(:or,
@@ -541,11 +549,10 @@ module RubyNext
         def array_find(head, *nodes, tail)
           index = s(:lvar, :__i__)
 
-          match_vars = []
-
           head_match =
             unless head.children.empty?
-              match_vars << build_var_assignment(head.children[0].children[0])
+              # we only need to call this to track the lvar usage
+              build_var_assignment(head.children[0].children[0])
 
               arr_take = s(:send,
                 s(:lvar, locals[:arr]),
@@ -557,16 +564,19 @@ module RubyNext
 
           tail_match =
             unless tail.children.empty?
-              match_vars << build_var_assignment(tail.children[0].children[0])
+              # we only need to call this to track the lvar usage
+              build_var_assignment(tail.children[0].children[0])
 
               match_var_clause(tail.children[0], arr_slice(index + nodes.size, -1))
             end
 
           nodes.each do |node|
             if node.type == :match_var
-              match_vars << build_var_assignment(node.children[0])
+              # we only need to call this to track the lvar usage
+              build_var_assignment(node.children[0])
             elsif node.type == :match_as
-              match_vars << build_var_assignment(node.children[1].children[0])
+              # we only need to call this to track the lvar usage
+              build_var_assignment(node.children[1].children[0])
             end
           end
 
@@ -594,19 +604,7 @@ module RubyNext
             s(:args,
               s(:arg, :_),
               s(:arg, :__i__)),
-            pattern).then do |block|
-            next block if match_vars.empty?
-
-            # We need to declare match vars outside of `find` block
-            locals_declare = s(:begin, s(:masgn,
-              s(:mlhs, *match_vars),
-              s(:nil)))
-
-            s(:begin,
-              s(:or,
-                locals_declare,
-                block))
-          end
+            pattern)
         end
 
         def array_match_rest(index, node, *tail)
@@ -649,6 +647,14 @@ module RubyNext
           end
         end
 
+        def find_pattern_array_element(node, index)
+          element = arr_item_at(index)
+          locals.with(arr: locals[:arr, index]) do
+            predicates.push :"i#{index}"
+            find_pattern_clause(node, element).tap { predicates.pop }
+          end
+        end
+
         def hash_pattern_array_element(node, index)
           element = arr_item_at(index)
           locals.with(hash: locals[:arr, index]) do
@@ -829,6 +835,15 @@ module RubyNext
           end
         end
 
+        def find_pattern_hash_element(node, key)
+          element = hash_value_at(key)
+          key_index = deconstructed_key(key)
+          locals.with(arr: locals[:hash, key_index]) do
+            predicates.push :"k#{key_index}"
+            find_pattern_clause(node, element).tap { predicates.pop }
+          end
+        end
+
         def hash_element(head, *tail)
           send("#{head.type}_hash_element", head).then do |node|
             next node if tail.empty?
@@ -948,6 +963,24 @@ module RubyNext
           end
         end
 
+        def with_declared_locals
+          lvars.clear
+          node = yield
+
+          return node if lvars.empty?
+
+          # We need to declare match lvars outside of the outer `find` block,
+          # so we do that for that whole pattern
+          locals_declare = s(:begin, s(:masgn,
+            s(:mlhs, *lvars.uniq.map { s(:lvasgn, _1) }),
+            s(:nil)))
+
+          s(:begin,
+            s(:or,
+              locals_declare,
+              node))
+        end
+
         def no_matching_pattern
           raise_error(
             :NoMatchingPatternError,
@@ -982,13 +1015,17 @@ module RubyNext
 
         private
 
-        attr_reader :deconstructed_keys, :predicates
+        attr_reader :deconstructed_keys, :predicates, :lvars
 
         # Raise SyntaxError if match-var is used within alternation
         # https://github.com/ruby/ruby/blob/672213ef1ca2b71312084057e27580b340438796/compile.c#L5900
         def check_match_var_alternation!(name)
           return unless locals.key?(ALTERNATION_MARKER)
 
+          if name.is_a?(::Parser::AST::Node)
+            raise ::SyntaxError, "illegal variable in alternative pattern (#{name.children.first})"
+          end
+
           return if name.start_with?("_")
 
           raise ::SyntaxError, "illegal variable in alternative pattern (#{name})"
@@ -1008,7 +1045,10 @@ module RubyNext
 
         # Value could be omitted for mass assignment
         def build_var_assignment(var, value = nil)
-          return s(:lvasgn, *[var, value].compact) unless var.is_a?(::Parser::AST::Node)
+          unless var.is_a?(::Parser::AST::Node)
+            lvars << var
+            return s(:lvasgn, *[var, value].compact)
+          end
 
           asign_type = :"#{var.type.to_s[0]}vasgn"
 

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

@@ -66,7 +66,7 @@ module RubyNext
         end
 
         class << self
-          # Returns true if the syntax is supported
+          # Returns true if the syntax is not supported
           # by the current Ruby (performs syntax check, not version check)
           def unsupported_syntax?
             save_verbose, $VERBOSE = $VERBOSE, nil

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

@@ -67,7 +67,7 @@ end
 
 # Patch Kernel to hijack require/require_relative/load/eval
 module Kernel
-  module_function # rubocop:disable Style/ModuleFunction
+  module_function
 
   alias_method :require_without_ruby_next, :require
   def require(path)

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

@@ -12,7 +12,7 @@ module RubyNext
         return if File.directory?(target_dir)
 
         Dir.chdir(root_dir) do
-          unless system("bundle exec ruby-next nextify ./#{lib_dir} -o #{target_dir} > /dev/null 2>&1")
+          unless system("bundle exec ruby-next nextify ./#{lib_dir} -o #{target_dir} --min-version=#{RUBY_VERSION} > /dev/null 2>&1")
             RubyNext.warn "Traspiled files are missing in: #{target_dir}. \n" \
               "Make sure you have gem 'ruby-next' in your Gemfile to auto-transpile the required files from source on load. " \
               "Otherwise the code from #{root_dir} may not work correctly."

data/lib/ruby-next/language.rb

@@ -186,6 +186,9 @@ module RubyNext
     require "ruby-next/language/rewriters/2.3/safe_navigation"
     rewriters << Rewriters::SafeNavigation
 
+    require "ruby-next/language/rewriters/2.5/rescue_within_block"
+    rewriters << Rewriters::RescueWithinBlock
+
     require "ruby-next/language/rewriters/2.7/args_forward"
     rewriters << Rewriters::ArgsForward
 

data/lib/ruby-next/pry.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+# This file contains patches for Pry integration.
+# It's supposed to be required inside .pryrc files.
+
+require "ruby-next/language/setup"
+require "ruby-next/language/runtime"
+
+# Enables refinements by injecting "using RubyNext"
+# before Pry copies and memorizes the TOPLEVEL_BINDING.
+Pry.singleton_class.prepend(Module.new do
+  def toplevel_binding
+    unless defined?(@_using_injected) && @_using_injected
+      orig_binding = super
+
+      # Copy TOPLEVEL_BINDING without local variables.
+      TOPLEVEL_BINDING.eval <<-RUBY
+        using RubyNext
+
+        def self.__pry__
+          binding
+        end
+
+        Pry.toplevel_binding = __pry__
+
+        class << self; undef __pry__; end
+      RUBY
+
+      # Inject local variables from the original binding.
+      orig_binding.local_variables.each do |var|
+        value = orig_binding.local_variable_get(var)
+        @toplevel_binding.local_variable_set(var, value)
+      end
+
+      @_using_injected = true
+    end
+
+    super
+  end
+end)
+
+# Enables edge Ruby syntax by transpiling the code
+# before it's evaluated in the context of a binding.
+Pry.prepend(Module.new do
+  def current_binding
+    super.tap do |obj|
+      next if obj.respond_to?(:__nextified__)
+
+      obj.instance_eval do
+        def eval(code, *args)
+          new_code = ::RubyNext::Language::Runtime.transform(code, using: false)
+
+          super(new_code, *args)
+        end
+
+        def __nextified__
+        end
+      end
+    end
+  end
+end)
+
+# Enables edge Ruby syntax for multi-line input.
+Pry::Code.singleton_class.prepend(Module.new do
+  def complete_expression?(str)
+    silence_stderr do
+      ::Parser::RubyNext.parse(str)
+    end
+
+    true
+  rescue Parser::SyntaxError => ex
+    case ex.message
+    when /unexpected token \$end/
+      false
+    else
+      true
+    end
+  end
+
+  private
+
+  def silence_stderr
+    stderr = StringIO.new
+    orig_stderr, $stderr = $stderr, stderr
+
+    yield
+
+    $stderr = orig_stderr
+  end
+end)

data/lib/ruby-next/version.rb

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

data/lib/uby-next/irb.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require "ruby-next/irb"

data/lib/uby-next/pry.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require "ruby-next/pry"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-next-core
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-29 00:00:00.000000000 Z
+date: 2022-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-next-parser
@@ -67,6 +67,7 @@ files:
 - lib/.rbnext/2.3/ruby-next/language/rewriters/base.rb
 - lib/.rbnext/2.3/ruby-next/utils.rb
 - lib/.rbnext/2.7/ruby-next/core.rb
+- lib/.rbnext/2.7/ruby-next/language/rewriters/2.7/pattern_matching.rb
 - lib/ruby-next.rb
 - lib/ruby-next/cli.rb
 - lib/ruby-next/commands/base.rb
@@ -102,6 +103,7 @@ files:
 - lib/ruby-next/core/time/floor.rb
 - lib/ruby-next/core/unboundmethod/bind_call.rb
 - lib/ruby-next/core_ext.rb
+- lib/ruby-next/irb.rb
 - lib/ruby-next/language.rb
 - lib/ruby-next/language/bootsnap.rb
 - lib/ruby-next/language/eval.rb
@@ -111,6 +113,7 @@ files:
 - lib/ruby-next/language/rewriters/2.3/safe_navigation.rb
 - lib/ruby-next/language/rewriters/2.3/squiggly_heredoc.rb
 - lib/ruby-next/language/rewriters/2.4/dir.rb
+- lib/ruby-next/language/rewriters/2.5/rescue_within_block.rb
 - lib/ruby-next/language/rewriters/2.6/endless_range.rb
 - lib/ruby-next/language/rewriters/2.7/args_forward.rb
 - lib/ruby-next/language/rewriters/2.7/numbered_params.rb
@@ -135,11 +138,14 @@ files:
 - lib/ruby-next/language/setup.rb
 - lib/ruby-next/language/unparser.rb
 - lib/ruby-next/logging.rb
+- lib/ruby-next/pry.rb
 - lib/ruby-next/rubocop.rb
 - lib/ruby-next/setup_self.rb
 - lib/ruby-next/utils.rb
 - lib/ruby-next/version.rb
 - lib/uby-next.rb
+- lib/uby-next/irb.rb
+- lib/uby-next/pry.rb
 homepage: http://github.com/palkan/ruby-next
 licenses:
 - MIT
@@ -164,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Ruby Next core functionality