Skip to content
Snippets Groups Projects
Commit af95f8fa authored by Michael Haupt's avatar Michael Haupt
Browse files

avoid recursion in cat builtin

parent ed7879c0
Branches
No related tags found
No related merge requests found
...@@ -23,10 +23,12 @@ ...@@ -23,10 +23,12 @@
package com.oracle.truffle.r.nodes.builtin.base; package com.oracle.truffle.r.nodes.builtin.base;
import static com.oracle.truffle.r.nodes.builtin.RBuiltinKind.SUBSTITUTE; import static com.oracle.truffle.r.nodes.builtin.RBuiltinKind.SUBSTITUTE;
import com.oracle.truffle.api.*; import com.oracle.truffle.api.*;
import com.oracle.truffle.api.CompilerDirectives.*; import com.oracle.truffle.api.CompilerDirectives.*;
import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.dsl.*;
import com.oracle.truffle.api.frame.*; import com.oracle.truffle.api.frame.*;
import com.oracle.truffle.api.frame.FrameInstance.FrameAccess;
import com.oracle.truffle.r.nodes.*; import com.oracle.truffle.r.nodes.*;
import com.oracle.truffle.r.nodes.access.*; import com.oracle.truffle.r.nodes.access.*;
import com.oracle.truffle.r.nodes.builtin.*; import com.oracle.truffle.r.nodes.builtin.*;
...@@ -93,18 +95,26 @@ public abstract class Cat extends RInvisibleBuiltinNode { ...@@ -93,18 +95,26 @@ public abstract class Cat extends RInvisibleBuiltinNode {
if (args[i] instanceof Object[]) { if (args[i] instanceof Object[]) {
// in case cat is called with a ... parameter, it is passed as an array within the // in case cat is called with a ... parameter, it is passed as an array within the
// args array // args array
cat(frame, (Object[]) args[i], file, sep, fill, labels, append); Object[] wrappedArgs = (Object[]) args[i];
for (int j = 0; j < wrappedArgs.length; ++j) {
catIntl(toString.executeString(frame, wrappedArgs[j]));
catSep(sep, wrappedArgs, j);
}
} else { } else {
catIntl(toString.executeString(frame, args[i])); catIntl(toString.executeString(frame, args[i]));
} }
if (i < args.length - 1 || sep.contains("\n")) { catSep(sep, args, i);
catIntl(sep);
}
} }
controlVisibility(); controlVisibility();
return RNull.instance; return RNull.instance;
} }
private static void catSep(String sep, Object[] os, int j) {
if (j < os.length - 1 || sep.contains("\n")) {
catIntl(sep);
}
}
@SlowPath @SlowPath
private static void catIntl(String s) { private static void catIntl(String s) {
RContext.getInstance().getConsoleHandler().print(s); RContext.getInstance().getConsoleHandler().print(s);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment