[Truffle] Kernel#caller in terms of #caller_locations

jruby · May 1, 2015 · 16c4f9c · 16c4f9c
1 parent 80decc9
commit 16c4f9c
Showing 3 changed files with 11 additions and 36 deletions.
diff --git a/spec/truffle/tags/core/kernel/caller_tags.txt b/spec/truffle/tags/core/kernel/caller_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
@@ -297,40 +297,6 @@ public RubySymbol calleeName(VirtualFrame frame) {
         }
     }
 
-    @CoreMethod(names = "caller", isModuleFunction = true, optional = 1)
-    public abstract static class CallerNode extends CoreMethodArrayArgumentsNode {
-
-        public CallerNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-        }
-
-        @Specialization
-        public Object caller(UndefinedPlaceholder omit) {
-            return caller(1);
-        }
-
-        @Specialization
-        public Object caller(int omit) {
-            notDesignedForCompilation();
-
-            omit += 1; // Always ignore this node
-
-            Backtrace backtrace = RubyCallStack.getBacktrace(this);
-            List<Activation> activations = backtrace.getActivations();
-            int size = activations.size() - omit;
-
-            if (size < 0) {
-                return nil();
-            }
-
-            Object[] callers = new Object[size];
-            for (int n = 0; n < size; n++) {
-                callers[n] = getContext().makeString(MRIBacktraceFormatter.formatCallerLine(activations, n + omit));
-            }
-            return new RubyArray(getContext().getCoreLibrary().getArrayClass(), callers, callers.length);
-        }
-    }
-
     @CoreMethod(names = "caller_locations", isModuleFunction = true, optional = 2)
     public abstract static class CallerLocationsNode extends CoreMethodArrayArgumentsNode {
 

diff --git a/truffle/src/main/ruby/core/kernel.rb b/truffle/src/main/ruby/core/kernel.rb
@@ -13,9 +13,19 @@ def printf(*args)
   end
   module_function :printf
 
-
   alias_method :trust, :untaint
   alias_method :untrust, :taint
   alias_method :untrusted?, :tainted?
 
+  def caller(start = 1, limit = nil)
+    start += 1
+    if limit.nil?
+      args = [start]
+    else
+      args = [start, limit]
+    end
+    caller_locations(*args).map(&:inspect)
+  end
+  module_function :caller
+
 end