live_ast 0.6.3 → 0.7.0

data/lib/live_ast/evaler.rb

@@ -1,66 +1,32 @@
 module LiveAST
   module Evaler
     class << self
+      include Common
+
       def eval(parser_source, *args)
-        evaler_source, bind, *location = handle_args(*args)
+        evaler_source, bind, *rest = handle_args(*args)
 
-        file, line = handle_location(bind, *location)
-        file = Linker.strip_token(file)
+        file, line = location_for_eval(bind, *rest)
+        file = LiveAST.strip_token(file)
 
         key, _ = Linker.new_cache_synced(parser_source, file, line, false)
 
         begin
           NATIVE_EVAL.call(evaler_source, bind, key, line)
         rescue Exception => ex
-          fix_backtrace(ex.backtrace)
+          ex.backtrace.map! { |s| LiveAST.strip_token s }
           raise ex
         end
       end
 
-      #
-      # match eval's error messages
-      #
       def handle_args(*args)
-        unless (2..4).include? args.size
-          raise ArgumentError,
-          "wrong number of arguments (#{args.size} for 2..4)"
-        end
-        unless args[1].is_a? Binding
-          raise TypeError,
-          "wrong argument type #{args[1].class} (expected Binding)"
-        end
-        args[0] = arg_to_str(args[0])
-        args[2] = arg_to_str(args[2]) unless args[2].nil?
-        args
-      end
-
-      def arg_to_str(arg)
-        begin
-          arg.to_str
-        rescue
-          raise TypeError, "can't convert #{arg.class} into String"
+        args.tap do
+          check_arity(args, 2..4)
+          args[0] = arg_to_str(args[0])
+          check_type(args[1], Binding)
+          args[2] = arg_to_str(args[2]) if args[2]
         end
       end
-
-      #
-      # match eval's behavior
-      #
-      def handle_location(bind, *location)
-        case location.size
-        when 0
-          NATIVE_EVAL.call("[__FILE__, __LINE__]", bind)
-        when 1
-          [location.first, 1]
-        else
-          location
-        end
-      end
-
-      def fix_backtrace(backtrace)
-        backtrace.map! { |line|
-          LiveAST::Linker.strip_token line
-        }
-      end
     end
   end
 end

data/lib/live_ast/full.rb

@@ -0,0 +1,2 @@
+require 'live_ast'
+require 'live_ast/replace_eval'

data/lib/live_ast/irb_spy.rb

@@ -1,27 +1,33 @@
 
 module LiveAST
+  @history = nil
+
   module IRBSpy
-    def self.code_at(line)
-      unless defined?(@history)
-        raise NotImplementedError,
-        "LiveAST cannot access history for this IRB input method"
-      end
-      grow = 0
-      begin
-        code = @history[line..(line + grow)].join
-        LiveAST.parser.new.parse(code) or raise "#{LiveAST.parser} error"
-      rescue
-        grow += 1
-        retry if line + grow < @history.size
-        raise
+    class << self
+      attr_writer :history
+
+      def code_at(line)
+        unless @history
+          raise NotImplementedError,
+          "LiveAST cannot access history for this IRB input method"
+        end
+        grow = 0
+        begin
+          code = @history[line..(line + grow)].join
+          LiveAST.parser.new.parse(code) or raise "#{LiveAST.parser} error"
+        rescue
+          grow += 1
+          retry if line + grow < @history.size
+          raise
+        end
+        code
       end
-      code
     end
   end
 end
 
 [
- IRB::StdioInputMethod,
+ defined?(IRB::StdioInputMethod) ? IRB::StdioInputMethod : nil,
  defined?(IRB::ReadlineInputMethod) ? IRB::ReadlineInputMethod : nil,
 ].compact.each do |klass|
   klass.module_eval do
@@ -29,7 +35,7 @@ end
     def gets
       live_ast_original_gets.tap do
         if defined?(@line)
-          LiveAST::IRBSpy.instance_variable_set(:@history, @line)
+          LiveAST::IRBSpy.history = @line
         end
       end
     end

data/lib/live_ast/linker.rb

@@ -117,10 +117,6 @@ module LiveAST
           @caches.delete_if { |key, _| key.index REVISION_TOKEN }
         end
       end
-
-      def strip_token(file)
-        file.sub(/#{Regexp.quote REVISION_TOKEN}[a-z]+/, "")
-      end
     end
   end
 end

data/lib/live_ast/replace_eval.rb

@@ -0,0 +1,118 @@
+require 'live_ast/base'
+require 'boc'
+
+module LiveAST
+  module ReplaceEval
+    class << self
+      def cache
+        Thread.current[:_live_ast_arg_cache] ||= {}
+      end
+
+      def handle_args(args)
+        if args.empty?
+          raise ArgumentError, "block not supplied"
+        end
+        
+        args[0] = Common.arg_to_str(args[0])
+        
+        unless (1..3).include? args.size
+          raise ArgumentError,
+          "wrong number of arguments: instance_eval(src) or instance_eval{..}"
+        end
+        
+        args[1] = Common.arg_to_str(args[1]) if args[1]
+      end
+
+      def module_or_instance_eval(which, remote_self, bind, args)
+        handle_args(args)
+        begin       
+          cache[:remote_self] = remote_self
+          cache[:args] = args
+        
+          code = %{
+            ::LiveAST::ReplaceEval.cache[:remote_self].
+            live_ast_original_#{which}_eval %{
+              ::LiveAST.eval(
+                ::LiveAST::ReplaceEval.cache[:args][0],
+                binding,
+                *::LiveAST::ReplaceEval.cache[:args][1..-1])
+            }
+          }
+          live_ast_original_eval(code, bind)
+        ensure
+          cache.clear
+        end
+      end
+    end
+  end
+end
+
+module Kernel
+  private
+
+  alias_method :live_ast_original_eval, :eval
+
+  def eval(*args)
+    LiveAST::Common.check_arity(args, 1..4)
+    LiveAST.eval(
+      args[0],
+      args[1] || Boc.value,
+      *LiveAST::Common.location_for_eval(*args[1..3]))
+  end
+
+  class << self
+    alias_method :live_ast_original_singleton_eval, :eval
+
+    def eval(*args)
+      LiveAST::Common.check_arity(args, 1..4)
+      LiveAST.eval(
+        "::Kernel.live_ast_original_instance_eval do;" << args[0] << ";end",
+        args[1] || Boc.value,
+        *LiveAST::Common.location_for_eval(*args[1..3]))
+    end
+  end
+end
+
+class Binding
+  alias_method :live_ast_original_binding_eval, :eval
+
+  def eval(*args)
+    LiveAST.eval(args[0], self, *args[1..-1])
+  end
+end
+
+class BasicObject
+  alias_method :live_ast_original_instance_eval, :instance_eval
+
+  def instance_eval(*args, &block)
+    if block
+      live_ast_original_instance_eval(*args, &block)
+    else
+      ::LiveAST::ReplaceEval.module_or_instance_eval(
+        :instance, self, ::Boc.value, args)
+    end
+  end
+end
+
+class Module
+  alias_method :live_ast_original_module_eval, :module_eval
+
+  def module_eval(*args, &block)
+    if block
+      live_ast_original_module_eval(*args, &block)
+    else
+      LiveAST::ReplaceEval.module_or_instance_eval(
+        :module, self, Boc.value, args)
+    end
+  end
+end
+
+Boc.enable Kernel, :eval
+Boc.enable Kernel.singleton_class, :eval
+Boc.enable Module, :module_eval
+Boc.enable BasicObject, :instance_eval
+
+class Module
+  remove_method :class_eval
+  alias_method :class_eval, :module_eval
+end

data/lib/live_ast/replace_raise.rb

@@ -8,14 +8,11 @@ module Kernel
   def raise(*args)
     ex = begin
            live_ast_original_raise(*args)
-         rescue Exception => ex
-           ex
+         rescue Exception => t
+           t
          end
-
     ex.backtrace.reject! { |line| line.index __FILE__ }
-
-    LiveAST::Evaler.fix_backtrace ex.backtrace
-
+    ex.backtrace.map! { |line| LiveAST.strip_token line }
     live_ast_original_raise ex
   end
 end

data/lib/live_ast/version.rb

@@ -1,3 +1,3 @@
 module LiveAST
-  VERSION = "0.6.3"
+  VERSION = "0.7.0"
 end

data/test/backtrace_test.rb

@@ -136,7 +136,7 @@ define_unsorted_test_case "BacktraceTest", RegularTest do
       orig_top = exception_backtrace { orig.call }.first
       live_top = exception_backtrace { live.call }.first
 
-      assert_equal orig_top, LiveAST::Linker.strip_token(live_top)
+      assert_equal orig_top, LiveAST.strip_token(live_top)
 
       if will_succeed
         assert_equal orig_top, live_top

data/test/encoding_test.rb

@@ -45,7 +45,7 @@ class AllEncodingTest < RegularTest
 
   def test_bad
     orig = assert_raises ArgumentError do
-      require "./test/encoding_test/bad.rb"
+      live_ast_original_load "./test/encoding_test/bad.rb"
     end
     live = assert_raises ArgumentError do
       LiveAST.load "./test/encoding_test/bad.rb"

data/test/main.rb

@@ -24,7 +24,7 @@ class JLMiniTest < MiniTest::Unit::TestCase
     if onlies.empty?
       default
     else
-      puts "\n!!! NOTE: running ONLY *__only tests for #{self}"
+      puts "\nNOTE: running ONLY *__only tests for #{self}"
       onlies
     end
   end
@@ -48,26 +48,16 @@ class JLMiniTest < MiniTest::Unit::TestCase
   end
 
   def assert_nothing_raised
-    assert_equal 3, 3
     yield
+    assert_nil nil
   rescue => ex
     raise MiniTest::Assertion,
     exception_details(ex, "Expected nothing raised, but got:")
   end
 
   %w[
-    empty
-    equal
-    in_delta
-    in_epsilon
-    includes
-    instance_of
-    kind_of
-    match
-    nil
-    operator
-    respond_to
-    same
+    empty equal in_delta in_epsilon includes instance_of
+    kind_of match nil operator respond_to same
   ].each { |name|
     alias_method "assert_not_#{name}", "refute_#{name}"
   }
@@ -122,3 +112,27 @@ class RegularTest < BaseTest
     require 'live_ast'
   end
 end
+
+class ReplaceEvalTest < BaseTest
+  def initialize(*args)
+    super
+    ok = begin
+           require 'live_ast/full'
+           true
+         rescue LoadError
+           if RUBY_ENGINE == "ruby"
+             raise "need: gem install boc"
+           end
+           false
+         end
+
+    unless ok
+      self.class.class_eval do
+        instance_methods(false).each do |m|
+          remove_method(m)
+          define_method(m) { }
+        end
+      end
+    end
+  end
+end

data/test/readme_test.rb

@@ -5,9 +5,9 @@ if LiveAST.parser::Test.respond_to?(:unified_sexp?) and
     LiveAST.parser::Test.unified_sexp?
   sections = [
     "Synopsis",
-    "Loading Source",
-    "Noninvasive Interface",
     "+to_ruby+",
+    "Noninvasive Interface",
+    "Pure Ruby and +ast_eval+",
   ]
 
   Levitate.doc_to_test("README.rdoc", *sections)