jruby · Sep 27, 2014 · Sep 27, 2014 · Sep 27, 2014 · Sep 27, 2014
diff --git a/core/src/main/java/org/jruby/truffle/TruffleBridgeImpl.java b/core/src/main/java/org/jruby/truffle/TruffleBridgeImpl.java
@@ -17,12 +17,12 @@
 import org.jruby.TruffleBridge;
 import org.jruby.internal.runtime.methods.DynamicMethod;
 import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.truffle.nodes.RubyRootNode;
 import org.jruby.truffle.nodes.core.CoreMethodNodeManager;
 import org.jruby.truffle.nodes.methods.MethodDefinitionNode;
 import org.jruby.truffle.runtime.NilPlaceholder;
 import org.jruby.truffle.runtime.RubyArguments;
 import org.jruby.truffle.runtime.RubyContext;
-import org.jruby.truffle.runtime.RubyParserResult;
 import org.jruby.truffle.runtime.backtrace.Backtrace;
 import org.jruby.truffle.runtime.control.RaiseException;
 import org.jruby.truffle.runtime.core.RubyArray;
@@ -115,8 +115,8 @@ public Object execute(TranslatorDriver.ParserContext parserContext, Object self,
                 source = Source.fromBytes(bytes, inputFile, new BytesDecoder.UTF8BytesDecoder());
             }
 
-            final RubyParserResult parseResult = truffleContext.getTranslator().parse(truffleContext, source, parserContext, parentFrame, null);
-            final CallTarget callTarget = Truffle.getRuntime().createCallTarget(parseResult.getRootNode());
+            final RubyRootNode parsedRootNode = truffleContext.getTranslator().parse(truffleContext, source, parserContext, parentFrame, null);
+            final CallTarget callTarget = Truffle.getRuntime().createCallTarget(parsedRootNode);
             return callTarget.call(RubyArguments.pack(null, parentFrame, self, null, new Object[]{}));
         } catch (RaiseException e) {
             // TODO(CS): what's this cast about?

diff --git a/core/src/main/java/org/jruby/truffle/nodes/methods/ShellResultNode.java b/core/src/main/java/org/jruby/truffle/nodes/methods/ShellResultNode.java
diff --git a/core/src/main/java/org/jruby/truffle/runtime/InputReader.java b/core/src/main/java/org/jruby/truffle/runtime/InputReader.java
diff --git a/core/src/main/java/org/jruby/truffle/runtime/NilPlaceholder.java b/core/src/main/java/org/jruby/truffle/runtime/NilPlaceholder.java
@@ -21,9 +21,4 @@ public final class NilPlaceholder {
     private NilPlaceholder() {
     }
 
-    @Override
-    public String toString() {
-        return "";
-    }
-
 }
diff --git a/core/src/main/java/org/jruby/truffle/runtime/RubyContext.java b/core/src/main/java/org/jruby/truffle/runtime/RubyContext.java
@@ -27,6 +27,7 @@
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.truffle.TruffleHooks;
 import org.jruby.truffle.nodes.RubyNode;
+import org.jruby.truffle.nodes.RubyRootNode;
 import org.jruby.truffle.nodes.debug.RubyASTProber;
 import org.jruby.truffle.runtime.control.*;
 import org.jruby.truffle.runtime.core.*;
@@ -158,45 +159,9 @@ public Object eval(String code, RubyBinding binding, RubyNode currentNode) {
         return execute(this, source, TranslatorDriver.ParserContext.TOP_LEVEL, binding.getSelf(), binding.getFrame(), currentNode);
     }
 
-    public void runShell(Node node, MaterializedFrame frame) {
-        final BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
-
-        MaterializedFrame existingLocals = frame;
-
-        String prompt = "Ruby> ";
-        if (node != null) {
-            final SourceSection src = node.getSourceSection();
-            if (src != null) {
-                prompt = (src.getSource().getName() + ":" + src.getStartLine() + "> ");
-            }
-        }
-
-        while (true) {
-            try {
-                System.out.print(prompt);
-                final String line = reader.readLine();
-
-                final ShellResult result = evalShell(line, existingLocals);
-
-                System.out.println("=> " + result.getResult());
-
-                existingLocals = result.getFrame();
-            } catch (BreakShellException e) {
-                return;
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    public ShellResult evalShell(String code, MaterializedFrame existingLocals) {
-        final Source source = Source.fromText(code, "shell");
-        return (ShellResult) execute(this, source, TranslatorDriver.ParserContext.SHELL, coreLibrary.getMainObject(), existingLocals, null);
-    }
-
     public Object execute(RubyContext context, Source source, TranslatorDriver.ParserContext parserContext, Object self, MaterializedFrame parentFrame, RubyNode currentNode) {
-        final RubyParserResult parseResult = translator.parse(context, source, parserContext, parentFrame, currentNode);
-        final CallTarget callTarget = Truffle.getRuntime().createCallTarget(parseResult.getRootNode());
+        final RubyRootNode rootNode = translator.parse(context, source, parserContext, parentFrame, currentNode);
+        final CallTarget callTarget = Truffle.getRuntime().createCallTarget(rootNode);
         return callTarget.call(RubyArguments.pack(null, parentFrame, self, null, new Object[]{}));
     }
 

diff --git a/core/src/main/java/org/jruby/truffle/runtime/RubyParserResult.java b/core/src/main/java/org/jruby/truffle/runtime/RubyParserResult.java
diff --git a/core/src/main/java/org/jruby/truffle/runtime/ShellResult.java b/core/src/main/java/org/jruby/truffle/runtime/ShellResult.java
diff --git a/core/src/main/java/org/jruby/truffle/translator/TranslatorDriver.java b/core/src/main/java/org/jruby/truffle/translator/TranslatorDriver.java
@@ -66,7 +66,7 @@ public MethodDefinitionNode parse(RubyContext context, org.jruby.ast.Node parseT
         return translator.compileFunctionNode(sourceSection, "(unknown)", argsNode, bodyNode, false);
     }
 
-    public RubyParserResult parse(RubyContext context, Source source, ParserContext parserContext, MaterializedFrame parentFrame, RubyNode currentNode) {
+    public RubyRootNode parse(RubyContext context, Source source, ParserContext parserContext, MaterializedFrame parentFrame, RubyNode currentNode) {
         // Set up the JRuby parser
 
         final org.jruby.parser.Parser parser = new org.jruby.parser.Parser(context.getRuntime());
@@ -115,7 +115,7 @@ public RubyParserResult parse(RubyContext context, Source source, ParserContext
         return parse(currentNode, context, source, parserContext, parentFrame, node);
     }
 
-    public RubyParserResult parse(RubyNode currentNode, RubyContext context, Source source, ParserContext parserContext, MaterializedFrame parentFrame, org.jruby.ast.RootNode rootNode) {
+    public RubyRootNode parse(RubyNode currentNode, RubyContext context, Source source, ParserContext parserContext, MaterializedFrame parentFrame, org.jruby.ast.RootNode rootNode) {
         final SourceSection sourceSection = source.createSection("<main>", 0, source.getCode().length());
         final SharedMethodInfo sharedMethodInfo = new SharedMethodInfo(sourceSection, "<main>", false, rootNode);
 
@@ -177,12 +177,7 @@ public RubyParserResult parse(RubyNode currentNode, RubyContext context, Source
 
         // Shell result
 
-        if (parserContext == TranslatorDriver.ParserContext.SHELL) {
-            truffleNode = new ShellResultNode(context, truffleNode.getSourceSection(), truffleNode);
-        }
-
-        final RootNode root = new RubyRootNode(context, truffleNode.getSourceSection(), environment.getFrameDescriptor(), environment.getSharedMethodInfo(), truffleNode);
-        return new RubyParserResult(root);
+        return new RubyRootNode(context, truffleNode.getSourceSection(), environment.getFrameDescriptor(), environment.getSharedMethodInfo(), truffleNode);
     }
 
     private Object getData(RubyContext context) {