jruby · Sep 23, 2015 · Sep 23, 2015 · Sep 23, 2015 · Sep 23, 2015 · Sep 23, 2015
diff --git a/core/src/main/java/org/jruby/RubyObject.java b/core/src/main/java/org/jruby/RubyObject.java
@@ -55,6 +55,7 @@
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.runtime.marshal.DataType;
 
+import static org.jruby.runtime.Helpers.invoke;
 import static org.jruby.runtime.Helpers.invokedynamic;
 import static org.jruby.runtime.invokedynamic.MethodNames.EQL;
 import static org.jruby.runtime.invokedynamic.MethodNames.OP_EQUAL;

diff --git a/core/src/main/java/org/jruby/runtime/ClassIndex.java b/core/src/main/java/org/jruby/runtime/ClassIndex.java
@@ -71,5 +71,5 @@ public enum ClassIndex {
     CONTINUATION,
     BASICOBJECT,
     // insert new values here
-    MAX_CLASSES;
+    MAX_CLASSES, Layouts;
 }
diff --git a/lib/ruby/truffle/mri/psych.rb b/lib/ruby/truffle/mri/psych.rb
@@ -0,0 +1 @@
+require_relative '../../stdlib/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/class_loader.rb b/lib/ruby/truffle/mri/psych/class_loader.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/psych/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/coder.rb b/lib/ruby/truffle/mri/psych/coder.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/psych/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/core_ext.rb b/lib/ruby/truffle/mri/psych/core_ext.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/psych/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/deprecated.rb b/lib/ruby/truffle/mri/psych/deprecated.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/psych/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/exception.rb b/lib/ruby/truffle/mri/psych/exception.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/psych/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/handler.rb b/lib/ruby/truffle/mri/psych/handler.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/psych/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/handlers/document_stream.rb b/lib/ruby/truffle/mri/psych/handlers/document_stream.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/psych/handlers/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/handlers/recorder.rb b/lib/ruby/truffle/mri/psych/handlers/recorder.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/psych/handlers/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/json/ruby_events.rb b/lib/ruby/truffle/mri/psych/json/ruby_events.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/psych/json/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/json/stream.rb b/lib/ruby/truffle/mri/psych/json/stream.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/psych/json/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/json/tree_builder.rb b/lib/ruby/truffle/mri/psych/json/tree_builder.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/psych/json/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/json/yaml_events.rb b/lib/ruby/truffle/mri/psych/json/yaml_events.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/psych/json/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/nodes.rb b/lib/ruby/truffle/mri/psych/nodes.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/psych/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/nodes/alias.rb b/lib/ruby/truffle/mri/psych/nodes/alias.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/psych/nodes/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/nodes/document.rb b/lib/ruby/truffle/mri/psych/nodes/document.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/psych/nodes/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/nodes/mapping.rb b/lib/ruby/truffle/mri/psych/nodes/mapping.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/psych/nodes/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/nodes/node.rb b/lib/ruby/truffle/mri/psych/nodes/node.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/psych/nodes/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/nodes/scalar.rb b/lib/ruby/truffle/mri/psych/nodes/scalar.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/psych/nodes/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/nodes/sequence.rb b/lib/ruby/truffle/mri/psych/nodes/sequence.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/psych/nodes/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/nodes/stream.rb b/lib/ruby/truffle/mri/psych/nodes/stream.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/psych/nodes/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/omap.rb b/lib/ruby/truffle/mri/psych/omap.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/psych/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/parser.rb b/lib/ruby/truffle/mri/psych/parser.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/psych/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/scalar_scanner.rb b/lib/ruby/truffle/mri/psych/scalar_scanner.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/psych/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/set.rb b/lib/ruby/truffle/mri/psych/set.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/psych/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/stream.rb b/lib/ruby/truffle/mri/psych/stream.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/psych/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/streaming.rb b/lib/ruby/truffle/mri/psych/streaming.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/psych/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/syntax_error.rb b/lib/ruby/truffle/mri/psych/syntax_error.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/psych/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/tree_builder.rb b/lib/ruby/truffle/mri/psych/tree_builder.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/psych/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/versions.rb b/lib/ruby/truffle/mri/psych/versions.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/psych/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/visitors.rb b/lib/ruby/truffle/mri/psych/visitors.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/psych/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/visitors/depth_first.rb b/lib/ruby/truffle/mri/psych/visitors/depth_first.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/psych/visitors/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/visitors/emitter.rb b/lib/ruby/truffle/mri/psych/visitors/emitter.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/psych/visitors/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/visitors/json_tree.rb b/lib/ruby/truffle/mri/psych/visitors/json_tree.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/psych/visitors/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/visitors/to_ruby.rb b/lib/ruby/truffle/mri/psych/visitors/to_ruby.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/psych/visitors/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/visitors/visitor.rb b/lib/ruby/truffle/mri/psych/visitors/visitor.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/psych/visitors/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/visitors/yaml_tree.rb b/lib/ruby/truffle/mri/psych/visitors/yaml_tree.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/psych/visitors/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/psych/y.rb b/lib/ruby/truffle/mri/psych/y.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/psych/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/yaml.rb b/lib/ruby/truffle/mri/yaml.rb
@@ -0,0 +1 @@
+require_relative '../../stdlib/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/shims/yaml.rb → lib/ruby/truffle/truffle/truffle/psych.rb b/lib/ruby/truffle/shims/yaml.rb → lib/ruby/truffle/truffle/truffle/psych.rb
@@ -6,24 +6,13 @@
 # GNU General Public License version 2
 # GNU Lesser General Public License version 2.1
 
-module YAML
-
-  def load(string)
-    raise "YAML.load not implemented"
-  end
-  module_function :load
-
-  def dump(object)
-    raise "YAML.dump not implemented"
+module Truffle::Psych
+
+  def self.libyaml_version
+    # TODO CS 23-Sep-15 hardcoded this for now - use resources to read
+    [1, 14, 0]
   end
-  module_function :dump
 
 end
 
-class Object
-
-  def to_yaml
-    raise "Object#to_yaml not implemented"
-  end
-
-end
+Psych = Truffle::Psych
diff --git a/truffle/pom.rb b/truffle/pom.rb
@@ -10,6 +10,7 @@
 
               'jruby.basedir' => '${basedir}/..' )
 
+  jar 'org.yaml:snakeyaml:1.14'
   jar 'org.jruby:jruby-core', '${project.version}', :scope => 'provided'
 
   jar 'com.oracle:truffle:0.7'

diff --git a/truffle/pom.xml b/truffle/pom.xml
@@ -22,6 +22,11 @@ DO NOT MODIFIY - GENERATED CODE
     <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
   </properties>
   <dependencies>
+    <dependency>
+      <groupId>org.yaml</groupId>
+      <artifactId>snakeyaml</artifactId>
+      <version>1.14</version>
+    </dependency>
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-core</artifactId>

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/RubyNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/RubyNode.java
@@ -9,13 +9,12 @@
  */
 package org.jruby.truffle.nodes;
 
+import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
-import com.oracle.truffle.api.frame.FrameDescriptor;
-import com.oracle.truffle.api.frame.MaterializedFrame;
-import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.frame.*;
 import com.oracle.truffle.api.instrument.ProbeNode;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
@@ -214,13 +213,19 @@ public MemoryManager getMemoryManager() {
 
     // ruby() helper
 
-    protected Object ruby(VirtualFrame frame, String expression, Object... arguments) {
+    protected Object ruby(String expression, Object... arguments) {
+        CompilerAsserts.neverPartOfCompilation();
+        return ruby(Truffle.getRuntime().getCurrentFrame().getFrame(FrameInstance.FrameAccess.MATERIALIZE, true),
+                expression, arguments);
+    }
+
+    protected Object ruby(Frame frame, String expression, Object... arguments) {
         final MaterializedFrame evalFrame = setupFrame(frame, arguments);
         final DynamicObject binding = Layouts.BINDING.createBinding(getContext().getCoreLibrary().getBindingFactory(), evalFrame);
         return getContext().eval(expression, binding, true, "inline-ruby", this);
     }
 
-    private MaterializedFrame setupFrame(VirtualFrame frame, Object... arguments) {
+    private MaterializedFrame setupFrame(Frame frame, Object... arguments) {
         CompilerDirectives.transferToInterpreter();
         final MaterializedFrame evalFrame = Truffle.getRuntime().createMaterializedFrame(
                 RubyArguments.pack(

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/control/ReturnNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/control/ReturnNode.java
@@ -33,6 +33,8 @@ public ReturnNode(RubyContext context, SourceSection sourceSection, ReturnID ret
 
     @Override
     public Object execute(VirtualFrame frame) {
+        //ruby(frame, "Truffle::Primitive.debug_print 'HERE!!'; Truffle::Primitive.print_interleaved_backtrace");
+        //System.err.println(getEncapsulatingSourceSection().getShortDescription());
         throw new ReturnException(returnID, value.execute(frame));
     }
 

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
@@ -1553,9 +1553,21 @@ public RubyNode coerceFeatureToPath(RubyNode feature) {
 
         @Specialization(guards = "isRubyString(featureString)")
         public boolean require(DynamicObject featureString) {
-            CompilerDirectives.transferToInterpreter();
             final String feature = featureString.toString();
 
+            // Pysch loads either the jar or the so - we need to intercept
+
+            if (feature.equals("psych.so") && RubyCallStack.getCallerFrame(getContext()).getCallNode()
+                    .getEncapsulatingSourceSection().getSource().getName().endsWith("psych.rb")) {
+                try {
+                    getContext().getFeatureLoader().require("truffle/psych.rb", this);
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+
+                return true;
+            }
+
             // TODO CS 1-Mar-15 ERB will use strscan if it's there, but strscan is not yet complete, so we need to hide it
 
             if (feature.equals("strscan") && RubyCallStack.getCallerFrame(getContext()).getCallNode()

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/TrufflePrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/TrufflePrimitiveNodes.java
@@ -542,6 +542,28 @@ public Object synchronize(VirtualFrame frame, DynamicObject self, DynamicObject
         }
     }
 
+    @CoreMethod(names = "print_backtrace", onSingleton = true)
+    public abstract static class PrintBacktraceNode extends CoreMethodNode {
+
+        public PrintBacktraceNode(RubyContext context, SourceSection sourceSection) {
+            super(context, sourceSection);
+        }
+
+        @TruffleBoundary
+        @Specialization
+        public DynamicObject printBacktrace() {
+            final List<String> rubyBacktrace = BacktraceFormatter.createDefaultFormatter(getContext())
+                    .formatBacktrace(null, RubyCallStack.getBacktrace(this));
+
+            for (String line : rubyBacktrace) {
+                System.err.println(line);
+            }
+
+            return nil();
+        }
+
+    }
+
     @CoreMethod(names = "print_interleaved_backtrace", onSingleton = true)
     public abstract static class PrintInterleavedBacktraceNode extends CoreMethodNode {
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/ext/psych/PsychEmitterNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/ext/psych/PsychEmitterNodes.java
@@ -0,0 +1,36 @@
+/*
+ * 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.nodes.ext.psych;
+
+import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.source.SourceSection;
+import org.jruby.truffle.nodes.core.CoreClass;
+import org.jruby.truffle.nodes.core.CoreMethod;
+import org.jruby.truffle.nodes.core.CoreMethodArrayArgumentsNode;
+import org.jruby.truffle.runtime.RubyContext;
+
+@CoreClass(name = "Truffle::Psych::Emitter")
+public abstract class PsychEmitterNodes {
+
+    @CoreMethod(names = "line_width", needsSelf = false)
+    public abstract static class LineWidthNode extends CoreMethodArrayArgumentsNode {
+
+        public LineWidthNode(RubyContext context, SourceSection sourceSection) {
+            super(context, sourceSection);
+        }
+
+        @Specialization
+        public int lineWidth(Object yaml) {
+            return 0;
+        }
+
+    }
+
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		require_relative '../../stdlib/' + File.basename(__FILE__)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		require_relative '../../../stdlib/psych/' + File.basename(__FILE__)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		require_relative '../../../../stdlib/psych/handlers/' + File.basename(__FILE__)