Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f08edcab6018
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6218a4dd7395
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jan 13, 2015

  1. Fix error message for arity fail with opt args.

    @headius
    headius committed Jan 13, 2015
    Copy the full SHA
    7cc1afc View commit details

  2. Remove some now-passing excludes for block behaviors.

    @headius
    headius committed Jan 13, 2015
    Copy the full SHA
    6218a4d View commit details
Showing with 1 addition and 6 deletions.
  1. +1 −1 core/src/main/java/org/jruby/runtime/Signature.java
  2. +0 −3 test/mri/excludes/TestIterator.rb
  3. +0 −2 test/mri/excludes/TestLambdaParameters.rb
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/runtime/Signature.java
View file
Original file line number Diff line number Diff line change
@@ -183,7 +183,7 @@ public void checkArity(Ruby runtime, IRubyObject[] args) {
if (rest == Rest.NONE || rest == Rest.ANON) {
// no rest, so we have a maximum
if (args.length > required() + opt()) {
throw runtime.newArgumentError("wrong number of arguments (" + args.length + " for " + required() + opt + ")");
throw runtime.newArgumentError("wrong number of arguments (" + args.length + " for " + (required() + opt) + ")");
}
}
}
3 changes: 0 additions & 3 deletions test/mri/excludes/TestIterator.rb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
exclude :test_argument, "needs investigation"
exclude :test_get_block, "needs investigation"
exclude :test_ljump, "needs investigation"
exclude :test_itertest, "needs investigation"
2 changes: 0 additions & 2 deletions test/mri/excludes/TestLambdaParameters.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
exclude :test_brace_lambda_source_location, "broken in compiler (#458)"
exclude :test_do_lambda_source_location, "broken in compiler (#458)"
exclude :test_exact_parameter, "broken in compiler (#458)"
exclude :test_location_on_error, "broken in compiler (#458)"
exclude :test_call_opt_args, "broken in IR"