From 3972dc71ae775680649aca8e42553cc9c9f48378 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 20 Nov 2016 02:12:48 +0000
Subject: forwardable/impl.rb

* lib/forwardable/impl.rb (_valid_method?, _compile_method):
  extract to separate implementation specific part.
  [ruby-core:78138] [Bug #12938]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56848 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/rubyvm/extconf.rb              |  1 +
 ext/rubyvm/lib/forwardable/impl.rb | 19 +++++++++++++++++++
 lib/forwardable.rb                 | 21 ++++++---------------
 lib/forwardable/impl.rb            | 24 ++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 15 deletions(-)
 create mode 100644 ext/rubyvm/extconf.rb
 create mode 100644 ext/rubyvm/lib/forwardable/impl.rb
 create mode 100644 lib/forwardable/impl.rb

diff --git a/ext/rubyvm/extconf.rb b/ext/rubyvm/extconf.rb
new file mode 100644
index 0000000000..8c40f58e2b
--- /dev/null
+++ b/ext/rubyvm/extconf.rb
@@ -0,0 +1 @@
+create_makefile("rubyvm")
diff --git a/ext/rubyvm/lib/forwardable/impl.rb b/ext/rubyvm/lib/forwardable/impl.rb
new file mode 100644
index 0000000000..ddf732156a
--- /dev/null
+++ b/ext/rubyvm/lib/forwardable/impl.rb
@@ -0,0 +1,19 @@
+# :stopdoc:
+module Forwardable
+  FILTER_EXCEPTION = ""
+
+  def self._valid_method?(method)
+    iseq = RubyVM::InstructionSequence.compile("().#{method}", nil, nil, 0, false)
+  rescue SyntaxError => e
+    false
+  else
+    iseq.to_a.dig(-1, 1, 1, :mid) == method.to_sym
+  end
+
+  def self._compile_method(src, file, line)
+    RubyVM::InstructionSequence.compile(src, file, file, line,
+               trace_instruction: false,
+               tailcall_optimization: true)
+      .eval
+  end
+end
diff --git a/lib/forwardable.rb b/lib/forwardable.rb
index b94c9a3e61..0c04fb3a27 100644
--- a/lib/forwardable.rb
+++ b/lib/forwardable.rb
@@ -110,8 +110,10 @@
 # +delegate.rb+.
 #
 module Forwardable
+  require 'forwardable/impl'
+
   # Version of +forwardable.rb+
-  FORWARDABLE_VERSION = "1.1.0"
+  FORWARDABLE_VERSION = "1.2.0"
 
   @debug = nil
   class << self
@@ -195,14 +197,8 @@ module Forwardable
       accessor = "#{accessor}()"
     end
 
-    vm = RubyVM::InstructionSequence
     method_call = ".__send__(:#{method}, *args, &block)"
-    if begin
-         iseq = vm.compile("().#{method}", nil, nil, 0, false)
-       rescue SyntaxError
-       else
-         iseq.to_a.dig(-1, 1, 1, :mid) == method.to_sym
-       end
+    if _valid_method?(method)
       loc, = caller_locations(2,1)
       pre = "_ ="
       mesg = "#{Module === obj ? obj : obj.class}\##{ali} at #{loc.path}:#{loc.lineno} forwarding to private method "
@@ -217,22 +213,17 @@ module Forwardable
         end;
     end
 
-    line_no = __LINE__+1; str = "#{<<-"begin;"}\n#{<<-"end;"}"
+    _compile_method("#{<<-"begin;"}\n#{<<-"end;"}", __FILE__, __LINE__+1)
     begin;
       proc do
         def #{ali}(*args, &block)
           #{pre}
           begin
             #{accessor}
-          end#{method_call}
+          end#{method_call}#{FILTER_EXCEPTION}
         end
       end
     end;
-
-    vm.compile(str, __FILE__, __FILE__, line_no,
-               trace_instruction: false,
-               tailcall_optimization: true)
-      .eval
   end
 end
 
diff --git a/lib/forwardable/impl.rb b/lib/forwardable/impl.rb
new file mode 100644
index 0000000000..220d25aa95
--- /dev/null
+++ b/lib/forwardable/impl.rb
@@ -0,0 +1,24 @@
+# :stopdoc:
+module Forwardable
+  FILE_REGEXP = %r"#{Regexp.quote(File.dirname(__FILE__))}"
+  FILTER_EXCEPTION = <<-'END'
+
+        rescue ::Exception
+          $@.delete_if {|s| ::Forwardable::FILE_REGEXP =~ s} unless ::Forwardable::debug
+          ::Kernel::raise
+  END
+
+  def self._valid_method?(method)
+    catch {|tag|
+      eval("BEGIN{throw tag}; ().#{method}", binding, __FILE__, __LINE__)
+    }
+  rescue SyntaxError
+    false
+  else
+    true
+  end
+
+  def self._compile_method(src, file, line)
+    eval(src, nil, file, line)
+  end
+end
-- 
cgit v1.2.3