ruby-next-core 0.14.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55cb050984d91ee15965b5629bd998d7300af1051e7ad721f1dfed77fc6df7c7
-  data.tar.gz: ac68a6f7da2b826b11a40be72948601f2d12ce8b1cd27ab9953977238c1e488d
+  metadata.gz: fc36fd395eedfde5c29e65f1f3a75c683630d5111349b3070d3b4e6d200477ad
+  data.tar.gz: e53e28aec62f7e425a98ba1eeb9591778ca1dbab13a0390113fc7440aab9663d
 SHA512:
-  metadata.gz: 7cd0de569637973ff61866733a6a3d59dac4e317bf5e522b23a88fc5af8941e4a072ae1dfbf26163a661c71911f7801545cad00134cd826d4913f684b03473e8
-  data.tar.gz: 2ebf8f0a42bd0771cfbc2f2240a3844436d3f108e5cec292ec2cd7e3bebef0a332088357a892cf3cd2b0c6835e9f39679cc472cd6a0ac4d120850194d8f2e783
+  metadata.gz: 50069c2ef6b59005d7efc640e1d84a74e17e4e385aaadce3ac54c2e3e061c7f71b727943140899210af997196f0bdf5a1157b86b97ce7af3de307e68a1cffe12
+  data.tar.gz: edf464100a254380bee320c586f48afc35782027303840fd319f32260ac5cf771c6f349d7447b9ed2f8a55bab424395664099dbd58600a05ffcd79e49080509f

data/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 ## master
 
+## 0.15.1 (2022-04-05)
+
+- Fix transpiling `rescue` within nested blocks. ([@palkan][])
+
+## 0.15.0 (2022-03-21)
+
+- Support IRB ([@palkan][])
+
+- Create empty `.rbnext` folder during `nextify` if nothing to transpile. ([@palkan][])
+
+This would prevent from auto-transpiling a library every time when no files should be transpiled.
+
+- Auto-transpile using the current Ruby version. ([@palkan][])
+
+- Support Pry. ([@baygeldin][])
+
+- Add `rescue/ensure/else` within block rewriter for Ruby < 2.5. ([@fargelus][])
+
+## 0.14.1 (2022-01-21)
+
+- Fix nested find patterns transpiling. ([@palkan][])
+
 ## 0.14.0 🎄
 
 - Add `Integer.try_convert`. ([@palkan][])

data/README.md

@@ -71,6 +71,8 @@ _Please, submit a PR to add your project to the list!_
   - [`ruby -ruby-next`](#uby-next)
   - [Logging & Debugging](#logging-and-debugging)
 - [RuboCop](#rubocop)
+- [Using with IRB](#irb)
+- [Using with Pry](#pry)
 - [Using with EOL Rubies](#using-with-eol-rubies)
 - [Proposed & edge features](#proposed-and-edge-features)
 - [Known limitations](#known-limitations)
@@ -454,6 +456,38 @@ AllCops:
 
 **NOTE:** you need `ruby-next` gem available in the environment where you run RuboCop (having `ruby-next-core` is not enough).
 
+## IRB
+
+Ruby Next supports IRB. In order to enable edge Ruby features for your REPL, add the following line to your `.irbrc`:
+
+```ruby
+require "ruby-next/irb"
+```
+
+Alternatively, you can require it at startup:
+
+```sh
+irb -r ruby-next/irb
+# or
+irb -ruby-next/irb
+```
+
+## Pry
+
+Ruby Next supports Pry. In order to enable edge Ruby features for your REPL, add the following line to your `.pryrc`:
+
+```ruby
+require "ruby-next/pry"
+```
+
+Alternatively, you can require it at startup:
+
+```sh
+pry -r ruby-next/pry
+# or
+pry -ruby-next/pry
+```
+
 ## Using with EOL Rubies
 
 We currently provide support for Ruby 2.2, 2.3 and 2.4.
@@ -510,9 +544,9 @@ These features are disabled by default, you must opt-in in one of the following
 # It's important to load language module first
 require "ruby-next/language"
 
-require "ruby-next/language/edge"
+require "ruby-next/language/rewriters/edge"
 # or
-require "ruby-next/language/proposed"
+require "ruby-next/language/rewriters/proposed"
 
 # and then activate the runtime mode
 require "ruby-next/language/runtime"

data/lib/.rbnext/2.1/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/.rbnext/2.1/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/.rbnext/2.3/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/.rbnext/2.3/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 { |_1| 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/.rbnext/2.3/ruby-next/language/rewriters/base.rb

@@ -65,7 +65,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/.rbnext/2.7/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)