jruby · Aug 21, 2015 · Aug 21, 2015 · Aug 21, 2015 · Aug 21, 2015 · Aug 21, 2015
diff --git a/truffle/src/main/java/org/jruby/truffle/Main.java b/truffle/src/main/java/org/jruby/truffle/Main.java
@@ -36,9 +36,7 @@ public static void main(String[] args) {
 
         config.setCompileMode(RubyInstanceConfig.CompileMode.TRUFFLE);
 
-        if (in == null) {
-            return;
-        } else {
+        if (in != null) {
             // Global variables
             IAccessor programName = new ValueAccessor(runtime.newString(filename));
             runtime.getGlobalVariables().define("$PROGRAM_NAME", programName, GlobalVariable.Scope.GLOBAL);

diff --git a/truffle/src/main/java/org/jruby/truffle/TruffleVMMain.java b/truffle/src/main/java/org/jruby/truffle/TruffleVMMain.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 1.0
+ * GNU General Public License version 2
+ * GNU Lesser General Public License version 2.1
+ */
+package org.jruby.truffle;
+
+import com.oracle.truffle.api.vm.TruffleVM;
+import org.jruby.truffle.runtime.RubyLanguage;
+
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+
+public class TruffleVMMain {
+
+    public static void main(String[] args) {
+        final TruffleVM vm = TruffleVM.newVM().build();
+
+        for (String arg : args) {
+            try (InputStream inputStream = new FileInputStream(arg)) {
+                final Reader reader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
+                vm.eval(RubyLanguage.MIME_TYPE, reader);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
+    }
+
+}
diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/RubyContext.java b/truffle/src/main/java/org/jruby/truffle/runtime/RubyContext.java
@@ -113,6 +113,7 @@ public class RubyContext extends ExecutionContext implements TruffleContextInter
     public RubyContext(Ruby runtime) {
         this(runtime, null);
     }
+
     public RubyContext(Ruby runtime, TruffleLanguage.Env env) {
         latestInstance = this;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/RubyLanguage.java b/truffle/src/main/java/org/jruby/truffle/runtime/RubyLanguage.java
@@ -22,18 +22,21 @@
 
 import java.io.IOException;
 
-@TruffleLanguage.Registration(name = "Ruby", version = Constants.RUBY_VERSION, mimeType = "application/x-ruby")
+@TruffleLanguage.Registration(name = "Ruby", version = Constants.RUBY_VERSION, mimeType = RubyLanguage.MIME_TYPE)
 public class RubyLanguage extends TruffleLanguage<RubyContext> {
 
+    public static final String MIME_TYPE = "application/x-ruby";
+
     private RubyLanguage() {
     }
 
     public static final RubyLanguage INSTANCE = new RubyLanguage();
 
     @Override
     public RubyContext createContext(Env env) {
-        Ruby r = Ruby.newInstance();
-        return new RubyContext(r, env);
+        final RubyContext context = new RubyContext(Ruby.newInstance(), env);
+        context.initialize();
+        return context;
     }
 
     @Override

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/backtrace/BacktraceFormatter.java b/truffle/src/main/java/org/jruby/truffle/runtime/backtrace/BacktraceFormatter.java
@@ -142,11 +142,16 @@ public String formatLine(List<Activation> activations, int n) {
         final Activation activation = activations.get(n);
         final SourceSection sourceSection = activation.getCallNode().getEncapsulatingSourceSection();
         final SourceSection reportedSourceSection;
-        final String reportedName;
+        String reportedName;
 
         if (isCore(sourceSection) && !flags.contains(FormattingFlags.INCLUDE_CORE_FILES)) {
             reportedSourceSection = nextUserSourceSection(activations, n);
-            reportedName = RubyArguments.getMethod(activation.getMaterializedFrame().getArguments()).getName();
+
+            try {
+                reportedName = RubyArguments.getMethod(activation.getMaterializedFrame().getArguments()).getName();
+            } catch (Exception e) {
+                reportedName = "???";
+            }
         } else {
             reportedSourceSection = sourceSection;
             reportedName = sourceSection.getIdentifier();
@@ -185,7 +190,7 @@ private SourceSection nextUserSourceSection(List<Activation> activations, int n)
     }
 
     private boolean isCore(SourceSection sourceSection) {
-        return sourceSection.getSource() == null || sourceSection.getSource().getPath().startsWith("core:");
+        return sourceSection == null || sourceSection.getSource() == null || sourceSection.getSource().getPath().startsWith("core:");
     }
 
 }
diff --git a/truffle/src/test/java/org/jruby/truffle/tck/RubyTckTest.java b/truffle/src/test/java/org/jruby/truffle/tck/RubyTckTest.java
@@ -12,6 +12,7 @@
 import com.oracle.truffle.api.vm.TruffleVM;
 import com.oracle.truffle.tck.TruffleTCK;
 
+import org.jruby.truffle.runtime.RubyLanguage;
 import org.junit.Ignore;
 import org.junit.Test;
 import static org.junit.Assert.*;
@@ -70,7 +71,7 @@ protected String fourtyTwo() {
 
     @Override
     protected String mimeType() {
-        return "application/x-ruby";
+        return RubyLanguage.MIME_TYPE;
     }
 
     @Override