diff --git a/lib/core/facets/kernel/__dir__.rb b/lib/core/facets/kernel/__dir__.rb index 937e9e81..bc1e0a75 100644 --- a/lib/core/facets/kernel/__dir__.rb +++ b/lib/core/facets/kernel/__dir__.rb @@ -9,7 +9,7 @@ module Kernel def __DIR__(*paths) c = caller.first - return nil unless c.rindex(/:\d+(:in `.*')?$/) + return nil unless c.rindex(/:\d+(:in [`'].*')?$/) file = $` # File.dirname(c) return nil if /\A\((.*)\)/ =~ file # eval, etc. #File.expand_path(File.join(File.dirname(file), paths)) diff --git a/lib/core/facets/kernel/callstack.rb b/lib/core/facets/kernel/callstack.rb index 8069ccf0..342c20be 100644 --- a/lib/core/facets/kernel/callstack.rb +++ b/lib/core/facets/kernel/callstack.rb @@ -31,7 +31,7 @@ def callstack(level = 1) stack = [] call_str_array.each{ |call_str| file, lineno, method = call_str.split(':') - if method =~ /in `(.*)'/ then + if method =~ /in [`'](.*)'/ then method = $1.intern() end stack << [file, lineno.to_i, method] diff --git a/lib/core/facets/kernel/require_all.rb b/lib/core/facets/kernel/require_all.rb index 62f962ea..d4f4df8e 100644 --- a/lib/core/facets/kernel/require_all.rb +++ b/lib/core/facets/kernel/require_all.rb @@ -13,7 +13,7 @@ module Kernel def require_all(pattern) c = caller.first - fail "Can't parse #{c}" unless c.rindex(/:\d+(:in `.*')?$/) + fail "Can't parse #{c}" unless c.rindex(/:\d+(:in [`'].*')?$/) file = $` # File.dirname(c) if /\A\((.*)\)/ =~ file # eval, etc. raise LoadError, "require_relative is called in #{$1}" @@ -27,7 +27,7 @@ def require_all(pattern) # Same as #require_all, but for #load. def load_all(pattern, safe=nil) c = caller.first - fail "Can't parse #{c}" unless c.rindex(/:\d+(:in `.*')?$/) + fail "Can't parse #{c}" unless c.rindex(/:\d+(:in [`'].*')?$/) file = $` # File.dirname(c) if /\A\((.*)\)/ =~ file # eval, etc. raise LoadError, "require_relative is called in #{$1}"