ruby-next-core 0.5.3 → 0.9.0

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

@@ -59,7 +59,7 @@ module RubyNext
           def unsupported_syntax?
             save_verbose, $VERBOSE = $VERBOSE, nil
             eval_mid = Kernel.respond_to?(:eval_without_ruby_next) ? :eval_without_ruby_next : :eval
-            Kernel.send eval_mid, self::SYNTAX_PROBE
+            Kernel.send eval_mid, self::SYNTAX_PROBE, nil, __FILE__, __LINE__
             false
           rescue SyntaxError, NameError
             true
@@ -78,10 +78,6 @@ module RubyNext
           def transform(source)
             Language.transform(source, rewriters: [self], using: false)
           end
-
-          def warn_custom_parser_required_for(feature)
-            RubyNext.warn(CUSTOM_PARSER_REQUIRED % feature)
-          end
         end
 
         attr_reader :locals

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module RubyNext
+  module Language
+    module Rewriters
+      class EndlessMethod < Base
+        SYNTAX_PROBE = "obj = Object.new; def obj.foo() = 42"
+        MIN_SUPPORTED_VERSION = Gem::Version.new("2.8.0")
+
+        def on_def_e(node)
+          context.track! self
+
+          replace(node.loc.assignment, "; ")
+          insert_after(node.loc.expression, "; end")
+
+          process(
+            node.updated(
+              :def,
+              node.children
+            )
+          )
+        end
+
+        def on_defs_e(node)
+          context.track! self
+
+          replace(node.loc.assignment, "; ")
+          insert_after(node.loc.expression, "; end")
+
+          process(
+            node.updated(
+              :defs,
+              node.children
+            )
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -28,12 +28,6 @@ module RubyNext
             ]
           )
         end
-
-        begin
-          transform(SYNTAX_PROBE)
-        rescue ::Parser::SyntaxError
-          warn_custom_parser_required_for("method reference")
-        end
       end
     end
   end

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

@@ -816,11 +816,12 @@ module RubyNext
         end
 
         def respond_to_missing?(mid, *)
-          return true if mid.match?(/_(clause|array_element)/)
+          return true if mid.to_s.match?(/_(clause|array_element)/)
           super
         end
 
         def method_missing(mid, *args, &block)
+          mid = mid.to_s
           return case_eq_clause(*args) if mid.match?(/_clause$/)
           return case_eq_array_element(*args) if mid.match?(/_array_element$/)
           return case_eq_hash_element(*args) if mid.match?(/_hash_element$/)

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module RubyNext
+  module Language
+    module Rewriters
+      class RightHandAssignment < Base
+        SYNTAX_PROBE = "1 + 2 => a"
+        MIN_SUPPORTED_VERSION = Gem::Version.new("2.8.0")
+
+        def on_rasgn(node)
+          context.track! self
+
+          val_node, asgn_node = *node
+
+          remove(val_node.loc.expression.end.join(asgn_node.loc.expression))
+          insert_before(val_node.loc.expression, "#{asgn_node.loc.expression.source} = ")
+
+          process(
+            asgn_node.updated(
+              nil,
+              asgn_node.children + [val_node]
+            )
+          )
+        end
+
+        def on_mrasgn(node)
+          context.track! self
+
+          lhs, rhs = *node
+
+          replace(lhs.loc.expression.end.join(rhs.loc.expression), ")")
+          insert_before(lhs.loc.expression, "#{rhs.loc.expression.source} = (")
+
+          process(
+            node.updated(
+              :masgn,
+              [rhs, lhs]
+            )
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+# Load rewriters only required for runtime transpiling
+
+require "ruby-next/language/rewriters/runtime/dir"
+RubyNext::Language.rewriters << RubyNext::Language::Rewriters::Dir

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module RubyNext
+  module Language
+    module Rewriters
+      # Special rewriter for Ruby <=2.3, which doesn't support __dir__ in iseq.eval
+      class Dir < Base
+        SYNTAX_PROBE = "defined?(RubyVM::InstructionSequence) && RubyVM::InstructionSequence.compile('raise SyntaxError if __dir__.nil?', 'test.rb').eval"
+        MIN_SUPPORTED_VERSION = Gem::Version.new("2.4.0")
+
+        def on_send(node)
+          return super(node) unless node.children[1] == :__dir__
+
+          context.track! self
+
+          replace(node.loc.expression, "File.dirname(__FILE__)")
+
+          process(
+            node.updated(
+              nil,
+              [
+                s(:const, nil, :File),
+                :dirname,
+                s(:send, nil, "__FILE__")
+              ]
+            )
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -42,7 +42,7 @@ module RubyNext
           path
         end
 
-        if defined?(JRUBY_VERSION)
+        if defined?(JRUBY_VERSION) || defined?(TruffleRuby)
           def evaluate(code, filepath)
             new_toplevel.eval(code, filepath)
           end
@@ -89,7 +89,8 @@ module Kernel
 
   alias_method :require_relative_without_ruby_next, :require_relative
   def require_relative(path)
-    from = caller_locations(1..1).first.absolute_path || File.join(Dir.pwd, "main")
+    loc = caller_locations(1..1).first
+    from = loc.absolute_path || loc.path || File.join(Dir.pwd, "main")
     realpath = File.absolute_path(
       File.join(
         File.dirname(File.absolute_path(from)),

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

@@ -5,6 +5,21 @@ require "ruby-next"
 
 module RubyNext
   module Language
+    # Module responsible for transpiling a library at load time
+    module GemTranspiler
+      def self.maybe_transpile(root_dir, lib_dir, target_dir)
+        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")
+            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."
+          end
+        end
+      end
+    end
+
     class << self
       unless method_defined?(:runtime?)
         def runtime?
@@ -12,7 +27,7 @@ module RubyNext
         end
       end
 
-      def setup_gem_load_path(lib_dir = "lib", rbnext_dir: RUBY_NEXT_DIR)
+      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)
 
@@ -29,6 +44,10 @@ module RubyNext
 
         return if Language.runtime? && Language.watch_dirs.include?(dirname)
 
+        next_dirname = File.join(dirname, rbnext_dir)
+
+        GemTranspiler.maybe_transpile(File.dirname(dirname), lib_dir, next_dirname) if transpile
+
         current_index = $LOAD_PATH.index(dirname)
 
         raise "Gem's lib is not in the $LOAD_PATH: #{dirname}" if current_index.nil?
@@ -38,7 +57,7 @@ module RubyNext
         loop do
           break unless version
 
-          version_dir = File.join(dirname, rbnext_dir, version.segments[0..1].join("."))
+          version_dir = File.join(next_dirname, version.segments[0..1].join("."))
 
           if File.exist?(version_dir)
             $LOAD_PATH.insert current_index, version_dir

data/lib/ruby-next/logging.rb

@@ -38,6 +38,6 @@ module RubyNext
     attr_reader :debug_filter
   end
 
-  self.silence_warnings = ENV["RUBY_NEXT_WARN"] != "false"
+  self.silence_warnings = ENV["RUBY_NEXT_WARN"] == "false"
   self.debug_enabled = ENV["RUBY_NEXT_DEBUG"]
 end

data/lib/ruby-next/rubocop.rb

@@ -1,7 +1,50 @@
 # frozen_string_literal: true
 
 # This file contains patches to RuboCop to support
-# edge features and fix some bugs with 2.7 syntax
+# edge features and fix some bugs with 2.7+ syntax
+
+require "parser/ruby-next/version"
+
+module RuboCop
+  # Transform Ruby Next parser version to a float, e.g.: "2.8.0.1" => 2.801
+  RUBY_NEXT_VERSION = Parser::NEXT_VERSION.match(/(^\d+)\.(.+)$/)[1..-1].map { |part| part.delete(".") }.join(".").to_f
+
+  class TargetRuby
+    class RuboCopNextConfig < RuboCopConfig
+      private
+
+      def find_version
+        version = @config.for_all_cops["TargetRubyVersion"]
+        return unless version == "next"
+
+        RUBY_NEXT_VERSION
+      end
+    end
+
+    new_rubies = KNOWN_RUBIES + [RUBY_NEXT_VERSION]
+    remove_const :KNOWN_RUBIES
+    const_set :KNOWN_RUBIES, new_rubies
+
+    new_sources = [RuboCopNextConfig] + SOURCES
+    remove_const :SOURCES
+    const_set :SOURCES, new_sources
+  end
+end
+
+module RuboCop
+  class ProcessedSource
+    module ParserClassExt
+      def parser_class(version)
+        return super unless version == RUBY_NEXT_VERSION
+
+        require "parser/rubynext"
+        Parser::RubyNext
+      end
+    end
+
+    prepend ParserClassExt
+  end
+end
 
 module RuboCop
   module AST
@@ -41,6 +84,32 @@ module RuboCop
           send(:"on_#{child.type}", child)
         end
       end
+
+      unless method_defined?(:on_def_e)
+        def on_def_e(node)
+          _name, _args_node, body_node = *node
+          send(:"on_#{body_node.type}", body_node)
+        end
+
+        def on_defs_e(node)
+          _definee_node, _name, _args_node, body_node = *node
+          send(:"on_#{body_node.type}", body_node)
+        end
+      end
+
+      unless method_defined?(:on_rasgn)
+        def on_rasgn(node)
+          val_node, asgn_node = *node
+          send(:"on_#{asgn_node.type}", asgn_node)
+          send(:"on_#{val_node.type}", val_node)
+        end
+
+        def on_mrasgn(node)
+          lhs, rhs = *node
+          send(:"on_#{lhs.type}", lhs)
+          send(:"on_#{rhs.type}", rhs)
+        end
+      end
     end
   end
 end

data/lib/ruby-next/utils.rb

@@ -33,5 +33,35 @@ module RubyNext
         lines.unshift "   0:  # source: #{path}"
       end
     end
+
+    # Returns true if modules refinement is supported in current version
+    def refine_modules?
+      @refine_modules ||=
+        begin
+          # Make sure that including modules within refinements works
+          # See https://github.com/oracle/truffleruby/issues/2026
+          eval <<~RUBY, TOPLEVEL_BINDING, __FILE__, __LINE__ + 1
+            module RubyNext::Utils::A; end
+            class RubyNext::Utils::B
+              include RubyNext::Utils::A
+            end
+
+            using(Module.new do
+              refine RubyNext::Utils::A do
+                include(Module.new do
+                  def i_am_refinement
+                    "yes, you are!"
+                  end
+                end)
+              end
+            end)
+
+            RubyNext::Utils::B.new.i_am_refinement
+          RUBY
+          true
+        rescue TypeError, NoMethodError
+          false
+        end
+    end
   end
 end

data/lib/ruby-next/version.rb

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

data/lib/uby-next.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+# Activate all features
+ENV["RUBY_NEXT_EDGE"] = "1"
+ENV["RUBY_NEXT_PROPOSED"] = "1"
+
 require "ruby-next/language/runtime"
 require "ruby-next/core/runtime"
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ruby-next-core
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-25 00:00:00.000000000 Z
+date: 2020-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: parser
+  name: ruby-next-parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0.5
+        version: 2.8.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0.5
+        version: 2.8.0.6
 - !ruby/object:Gem::Dependency
   name: unparser
   requirement: !ruby/object:Gem::Requirement
@@ -84,14 +84,20 @@ files:
 - lib/ruby-next/core_ext.rb
 - lib/ruby-next/language.rb
 - lib/ruby-next/language/bootsnap.rb
+- lib/ruby-next/language/edge.rb
 - lib/ruby-next/language/eval.rb
 - lib/ruby-next/language/parser.rb
+- lib/ruby-next/language/proposed.rb
 - lib/ruby-next/language/rewriters/args_forward.rb
 - lib/ruby-next/language/rewriters/base.rb
+- lib/ruby-next/language/rewriters/endless_method.rb
 - lib/ruby-next/language/rewriters/endless_range.rb
 - lib/ruby-next/language/rewriters/method_reference.rb
 - lib/ruby-next/language/rewriters/numbered_params.rb
 - lib/ruby-next/language/rewriters/pattern_matching.rb
+- lib/ruby-next/language/rewriters/right_hand_assignment.rb
+- lib/ruby-next/language/rewriters/runtime.rb
+- lib/ruby-next/language/rewriters/runtime/dir.rb
 - lib/ruby-next/language/runtime.rb
 - lib/ruby-next/language/setup.rb
 - lib/ruby-next/language/unparser.rb
@@ -117,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="