Merge branch 'master' into truffle-head

jruby · Dec 28, 2015 · 6206683 · 6206683
2 parents 2fbe3a0 + d26c846
commit 6206683
Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java b/core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java
@@ -2585,8 +2585,8 @@ private int parseNumber(int c) throws IOException {
                     break;
                 default :
                     pushback(c);
-                    yaccValue = new FixnumNode(getPosition(), 0);
-                    return Tokens.tINTEGER;
+                    numberBuffer.append('0');
+                    return getIntegerToken(numberBuffer.toString(), 10, numberLiteralSuffix(SUFFIX_ALL));
             }
         }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/RubyLanguage.java b/truffle/src/main/java/org/jruby/truffle/runtime/RubyLanguage.java
@@ -20,6 +20,7 @@
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.source.Source;
 import org.jruby.Ruby;
+import org.jruby.RubyInstanceConfig;
 import org.jruby.runtime.Constants;
 import org.jruby.truffle.nodes.LazyRubyRootNode;
 import org.jruby.truffle.nodes.RubyGuards;
@@ -63,7 +64,9 @@ public RubyContext createContext(Env env) {
         final Ruby runtime;
 
         if (runtimeWrapper == null) {
-            runtime = Ruby.newInstance();
+            RubyInstanceConfig config = new RubyInstanceConfig();
+            config.setCompileMode(RubyInstanceConfig.CompileMode.TRUFFLE);
+            runtime = Ruby.newInstance(config);
         } else {
             runtime = runtimeWrapper.getRuby();
         }