Skip to content
This repository

Fix #276. For good. #324

Merged
merged 1 commit into from over 1 year ago

2 participants

Sébastien Le Callonnec Charles Oliver Nutter
Sébastien Le Callonnec
Collaborator

RuntimeHelpers.unsplatValue19IfArityOne must be assigned back to argsResult for the refactor to work.

This fixes related tests:

➈❸ greystones:~/dev/jruby (gh276)$ ./bin/jruby -I"lib:test" test/externals/ruby1.9/test_pp.rb -n "test_hash_with_boolean_value"
Run options: -n test_hash_with_boolean_value

# Running tests:

.

Finished tests in 0.086000s, 11.6279 tests/s, 11.6279 assertions/s.

1 tests, 1 assertions, 0 failures, 0 errors, 0 skips
➈❸ greystones:~/dev/jruby (gh276)$ ./bin/jruby -S rspec spec/regression/GH-276_yield_splat_behaviour_causes_pp_to_break.rb 
.....

Finished in 0.022 seconds
5 examples, 0 failures

Charles Oliver Nutter headius merged commit 46399a1 into from September 29, 2012
Charles Oliver Nutter headius closed this September 29, 2012
Charles Oliver Nutter
Owner

I admire your confidence :) Merged the PR in; compiler seems to already be working.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 1 unique commit by 1 author.

Sep 29, 2012
Sébastien Le Callonnec Fix #276. b62b54d
This page is out of date. Refresh to see the latest.

Showing 1 changed file with 1 addition and 1 deletion. Show diff stats Hide diff stats

  1. 2  src/org/jruby/ast/Yield19Node.java
2  src/org/jruby/ast/Yield19Node.java
@@ -30,7 +30,7 @@ public IRubyObject interpret(Ruby runtime, ThreadContext context, IRubyObject se
30 30
             case ARGSPUSHNODE:
31 31
             case ARGSCATNODE:
32 32
             case SPLATNODE: 
33  
-                RuntimeHelpers.unsplatValue19IfArityOne(argsResult, yieldToBlock);
  33
+                argsResult = RuntimeHelpers.unsplatValue19IfArityOne(argsResult, yieldToBlock);
34 34
                 break;
35 35
             case ARRAYNODE:
36 36
                 // Pass-thru
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.