[Truffle] YAML complete #3349
[Truffle] YAML complete #3349
Conversation
Conflicts: truffle/src/main/java/org/jruby/truffle/nodes/RubyNode.java
| @@ -71,5 +71,5 @@ | |||
| CONTINUATION, | |||
| BASICOBJECT, | |||
| // insert new values here | |||
| MAX_CLASSES; | |||
| MAX_CLASSES, Layouts; | |||
There was a problem hiding this comment.
No idea about this or the change to RubyObject. Must be some refactoring mess up. I reverted it.
| class ClassLoader | ||
|
|
||
| def path2class(path) | ||
| eval("::#{path}") |
There was a problem hiding this comment.
Could also be Object.const_get(path) normally.
There was a problem hiding this comment.
Will that work with Foo::Bar for example?
|
Looks good to merge for me. |
| @@ -211,6 +224,10 @@ public MemoryManager getMemoryManager() { | |||
|
|
|||
| // ruby() helper | |||
|
|
|||
| protected Object ruby(String expression, Object... arguments) { | |||
| return getContext().inlineRubyHelper(this, expression, arguments); | |||
| } | |||
There was a problem hiding this comment.
Minor: I would get the frame here and make this one @TruffleBoundary, rather than adding another version in RubyContext.
| Object[] tagsTuple = ArrayOperations.toObjectArray((DynamicObject) tagsAry[i]); | ||
| if (tagsTuple.length != 2) { | ||
| throw new UnsupportedOperationException(); | ||
| //throw context.runtime.newRuntimeError("tags tuple must be of length 2"); |
Conflicts: truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java truffle/src/main/java/org/jruby/truffle/runtime/layouts/Layouts.java
|
|
||
| for (String line : rubyBacktrace) { | ||
| System.err.println(line); | ||
| } |
There was a problem hiding this comment.
What's the motivation for this method? Could it return array instead printing, then it can be added to watches in debugger.
There was a problem hiding this comment.
It's a debug method - if you are debugging you may not want to start running arbitrary, complex code like puts, so this does it for you. We do have debug_print though.
|
Trying to get this merged but keep running into failures and conflicts... |
Remaining handful of specs are unrelated problems in time, regexps, and a bizarre dependency on Syck that I will investigate slow-time. Same number of failures as JRuby, but different ones, strangely.
One of @nirvdrum, @pitr-ch or @eregon please review. @thomaswue for information.