ruby-next-core 0.5.3 → 0.9.0

data/lib/ruby-next/cli.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "ruby-next"
-require "ruby-next/language"
 
 require "ruby-next/commands/base"
 require "ruby-next/commands/nextify"
@@ -11,10 +10,14 @@ module RubyNext
   # Command line interface for RubyNext
   class CLI
     class << self
-      attr_accessor :verbose
+      attr_accessor :verbose, :dry_run
+
+      alias verbose? verbose
+      alias dry_run? dry_run
     end
 
     self.verbose = false
+    self.dry_run = false
 
     COMMANDS = {
       "nextify" => Commands::Nextify,
@@ -37,6 +40,8 @@ module RubyNext
 
       args.delete(command)
 
+      args.unshift(*load_args_from_rc(command))
+
       COMMANDS.fetch(command) do
         raise "Unknown command: #{command}. Available commands: #{COMMANDS.keys.join(",")}"
       end.run(args)
@@ -90,5 +95,15 @@ module RubyNext
         end
       end
     end
+
+    def load_args_from_rc(command)
+      return [] unless File.file?(".rbnextrc")
+
+      require "yaml"
+      command_args = YAML.load_file(".rbnextrc")[command]
+      return [] unless command_args
+
+      command_args.lines.flat_map { |line| line.chomp.split(/\s+/) }
+    end
   end
 end

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

@@ -11,6 +11,9 @@ module RubyNext
         end
       end
 
+      attr_reader :dry_run
+      alias dry_run? dry_run
+
       def initialize(args)
         parse! args
       end
@@ -24,8 +27,13 @@ module RubyNext
       end
 
       def log(msg)
-        return unless CLI.verbose
-        $stdout.puts msg
+        return unless CLI.verbose?
+
+        if CLI.dry_run?
+          $stdout.puts "[DRY RUN] #{msg}"
+        else
+          $stdout.puts msg
+        end
       end
 
       def base_parser
@@ -35,6 +43,11 @@ module RubyNext
           opts.on("-V", "Turn on verbose mode") do
             CLI.verbose = true
           end
+
+          opts.on("--dry-run", "Print verbose output without generating files") do
+            CLI.dry_run = true
+            CLI.verbose = true
+          end
         end
       end
     end

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

@@ -69,7 +69,7 @@ module RubyNext
         RubyNext::Core.patches.extensions
           .values
           .flatten
-          .filter do |patch|
+          .select do |patch|
           next if min_version && Gem::Version.new(patch.version) <= min_version
           next if filter && !filter.match?(patch.name)
           true
@@ -136,8 +136,10 @@ module RubyNext
 
         return $stdout.puts(contents) if out_path == "stdout"
 
-        FileUtils.mkdir_p File.dirname(out_path)
-        File.write(out_path, contents)
+        unless CLI.dry_run?
+          FileUtils.mkdir_p File.dirname(out_path)
+          File.write(out_path, contents)
+        end
 
         log "Generated: #{out_path}"
       end

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

@@ -3,6 +3,8 @@
 require "fileutils"
 require "pathname"
 
+require "ruby-next/language"
+
 module RubyNext
   module Commands
     class Nextify < Base
@@ -12,6 +14,10 @@ module RubyNext
 
       def run
         log "RubyNext core strategy: #{RubyNext::Core.strategy}"
+        log "RubyNext transpile mode: #{RubyNext::Language.mode}"
+
+        remove_rbnext!
+
         paths.each do |path|
           contents = File.read(path)
           transpile path, contents
@@ -38,9 +44,12 @@ module RubyNext
             @single_version = true
           end
 
-          opts.on("--enable-method-reference", "Enable reverted method reference syntax (requires custom parser)") do
-            require "ruby-next/language/rewriters/method_reference"
-            Language.rewriters << Language::Rewriters::MethodReference
+          opts.on("--edge", "Enable edge (master) Ruby features") do |val|
+            require "ruby-next/language/edge"
+          end
+
+          opts.on("--proposed", "Enable proposed/experimental Ruby features") do |val|
+            require "ruby-next/language/proposed"
           end
 
           opts.on(
@@ -59,6 +68,8 @@ module RubyNext
           end
         end
 
+        optparser.parse!(args)
+
         @lib_path = args[0]
 
         if print_help
@@ -67,12 +78,11 @@ module RubyNext
         end
 
         unless lib_path&.then(&File.method(:exist?))
+          $stdout.puts "Path not found: #{lib_path}"
           $stdout.puts optparser.help
           exit 2
         end
 
-        optparser.parse!(args)
-
         @paths =
           if File.directory?(lib_path)
             Dir[File.join(lib_path, "**/*.rb")]
@@ -89,7 +99,13 @@ module RubyNext
         rewriters = Language.rewriters.select { |rw| rw.unsupported_version?(version) }
 
         context = Language::TransformContext.new
-        new_contents = Language.transform contents, context: context, rewriters: rewriters
+
+        new_contents =
+          if Gem::Version.new(version) >= Gem::Version.new("2.7.0") && !defined?(Unparser::Emitter::CaseMatch)
+            Language.rewrite contents, context: context, rewriters: rewriters
+          else
+            Language.transform contents, context: context, rewriters: rewriters
+          end
 
         return unless context.dirty?
 
@@ -106,34 +122,45 @@ module RubyNext
       end
 
       def save(contents, path, version)
-        return $stdout.puts(contents) if out_path == "stdout"
+        return $stdout.puts(contents) if stdout?
 
         paths = [Pathname.new(path).relative_path_from(Pathname.new(lib_path))]
 
         paths.unshift(version.segments[0..1].join(".")) unless single_version?
 
         next_path =
-          if out_path
-            if out_path.end_with?(".rb")
-              out_path
-            else
-              File.join(out_path, *paths)
-            end
+          if next_dir_path.end_with?(".rb")
+            out_path
           else
-            File.join(
-              lib_path,
-              RUBY_NEXT_DIR,
-              *paths
-            )
+            File.join(next_dir_path, *paths)
           end
 
-        FileUtils.mkdir_p File.dirname(next_path)
+        unless CLI.dry_run?
+          FileUtils.mkdir_p File.dirname(next_path)
 
-        File.write(next_path, contents)
+          File.write(next_path, contents)
+        end
 
         log "Generated: #{next_path}"
       end
 
+      def remove_rbnext!
+        return if CLI.dry_run? || stdout?
+
+        return unless File.directory?(next_dir_path)
+
+        log "Remove old files: #{next_dir_path}"
+        FileUtils.rm_r(next_dir_path)
+      end
+
+      def next_dir_path
+        @next_dir_path ||= (out_path || File.join(lib_path, RUBY_NEXT_DIR))
+      end
+
+      def stdout?
+        out_path == "stdout"
+      end
+
       alias single_version? single_version
     end
   end

data/lib/ruby-next/core.rb

@@ -2,6 +2,8 @@
 
 require "set"
 
+require_relative "utils"
+
 module RubyNext
   module Core
     # Patch contains the extension implementation
@@ -95,7 +97,7 @@ module RubyNext
     end
 
     class << self
-      STRATEGIES = %i[refine core_ext].freeze
+      STRATEGIES = %i[refine core_ext backports].freeze
 
       attr_reader :strategy
 
@@ -109,7 +111,11 @@ module RubyNext
       end
 
       def core_ext?
-        strategy == :core_ext
+        strategy == :core_ext || strategy == :backports
+      end
+
+      def backports?
+        strategy == :backports
       end
 
       def patch(*args, **kwargs, &block)
@@ -136,6 +142,8 @@ module RubyNext
   end
 end
 
+require "backports/2.5" if RubyNext::Core.backports?
+
 require_relative "core/kernel/then"
 
 require_relative "core/proc/compose"
@@ -176,6 +184,9 @@ require_relative "core/struct/deconstruct_keys"
 # Generate refinements
 RubyNext.module_eval do
   RubyNext::Core.patches.refined.each do |mod, patches|
+    # Only refine modules when supported
+    next unless mod.is_a?(Class) || RubyNext::Utils.refine_modules?
+
     refine mod do
       patches.each do |patch|
         module_eval(patch.body, *patch.location)

data/lib/ruby-next/core/time/ceil.rb

@@ -3,7 +3,8 @@
 RubyNext::Core.patch Time, method: :ceil, version: "2.7" do
   <<~'RUBY'
     def ceil(den = 0)
-      change = subsec.ceil(den) - subsec
+      sceil = (subsec * 10**den).ceil.to_r / 10**den
+      change = sceil - subsec
       self + change
     end
   RUBY

data/lib/ruby-next/core_ext.rb

@@ -15,4 +15,4 @@ RubyNext::Core.patches.extensions.each do |mod, patches|
   end
 end
 
-RubyNext::Core.strategy = :core_ext
+RubyNext::Core.strategy = :core_ext unless RubyNext::Core.core_ext?

data/lib/ruby-next/language.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-gem "parser", ">= 2.7.0.0"
+gem "ruby-next-parser", ">= 2.8.0.3"
 gem "unparser", ">= 0.4.7"
 
 require "set"
@@ -83,6 +83,14 @@ module RubyNext
       end
 
       def runtime!
+        require "ruby-next/language/rewriters/runtime"
+
+        if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.7.0") && !defined?(Unparser::Emitter::CaseMatch)
+          RubyNext.warn "Ruby Next fallbacks to \"rewrite\" transpiling mode since Unparser doesn't support 2.7 AST yet.\n" \
+            "See https://github.com/mbj/unparser/pull/142"
+          self.mode = :rewrite
+        end
+
         @runtime = true
       end
 
@@ -166,9 +174,12 @@ module RubyNext
     require "ruby-next/language/rewriters/endless_range"
     rewriters << Rewriters::EndlessRange
 
-    if ENV["RUBY_NEXT_ENABLE_METHOD_REFERENCE"] == "1"
-      require "ruby-next/language/rewriters/method_reference"
-      RubyNext::Language.rewriters << RubyNext::Language::Rewriters::MethodReference
+    if ENV["RUBY_NEXT_EDGE"] == "1"
+      require "ruby-next/language/edge"
+    end
+
+    if ENV["RUBY_NEXT_PROPOSED"] == "1"
+      require "ruby-next/language/proposed"
     end
   end
 end

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

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# Load edge Ruby features
+
+require "ruby-next/language/rewriters/endless_method"
+RubyNext::Language.rewriters << RubyNext::Language::Rewriters::EndlessMethod
+
+require "ruby-next/language/rewriters/right_hand_assignment"
+RubyNext::Language.rewriters << RubyNext::Language::Rewriters::RightHandAssignment

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

@@ -3,14 +3,16 @@
 module RubyNext
   module Language
     module KernelEval
-      refine Kernel do
-        def eval(source, bind = nil, *args)
-          new_source = ::RubyNext::Language::Runtime.transform(
-            source,
-            using: bind&.receiver == TOPLEVEL_BINDING.receiver || bind&.receiver&.is_a?(Module)
-          )
-          RubyNext.debug_source(new_source, "(#{caller_locations(1, 1).first})")
-          super new_source, bind, *args
+      if Utils.refine_modules?
+        refine Kernel do
+          def eval(source, bind = nil, *args)
+            new_source = ::RubyNext::Language::Runtime.transform(
+              source,
+              using: bind&.receiver == TOPLEVEL_BINDING.receiver || bind&.receiver&.is_a?(Module)
+            )
+            RubyNext.debug_source(new_source, "(#{caller_locations(1, 1).first})")
+            super new_source, bind, *args
+          end
         end
       end
     end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "parser/ruby27"
+require "parser/rubynext"
 
 module RubyNext
   module Language
@@ -10,7 +10,7 @@ module RubyNext
 
     class << self
       def parser
-        ::Parser::Ruby27.new(Builder.new).tap do |prs|
+        ::Parser::RubyNext.new(Builder.new).tap do |prs|
           prs.diagnostics.tap do |diagnostics|
             diagnostics.all_errors_are_fatal = true
           end
@@ -23,6 +23,8 @@ module RubyNext
         end
 
         parser.parse(buffer)
+      rescue ::Parser::SyntaxError => e
+        raise ::SyntaxError, e.message
       end
 
       def parse_with_comments(source, file = "(string)")
@@ -31,6 +33,8 @@ module RubyNext
         end
 
         parser.parse_with_comments(buffer)
+      rescue ::Parser::SyntaxError => e
+        raise ::SyntaxError, e.message
       end
     end
   end

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

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+# Load experimental, proposed etc. Ruby features
+
+require "ruby-next/language/rewriters/method_reference"
+RubyNext::Language.rewriters << RubyNext::Language::Rewriters::MethodReference

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

@@ -25,21 +25,23 @@ module RubyNext
         end
 
         def on_send(node)
-          return unless node.children[2]&.type == :forwarded_args
+          return super(node) unless node.children[2]&.type == :forwarded_args
 
           replace(node.children[2].loc.expression, "*#{REST}, &#{BLOCK}")
 
-          node.updated(
-            nil,
-            [
-              *node.children[0..1],
-              *forwarded_args
-            ]
+          process(
+            node.updated(
+              nil,
+              [
+                *node.children[0..1],
+                *forwarded_args
+              ]
+            )
           )
         end
 
         def on_super(node)
-          return unless node.children[0]&.type == :forwarded_args
+          return super(node) unless node.children[0]&.type == :forwarded_args
 
           replace(node.children[0].loc.expression, "*#{REST}, &#{BLOCK}")