Commits on Nov 28, 2013
  1. @BanzaiMan

    Undo fast_finish

    BanzaiMan committed Nov 28, 2013
  2. @BanzaiMan
Commits on Nov 27, 2013
  1. @enebo

    Merge with 1.7

    enebo committed Nov 27, 2013
  2. @enebo

    Trivial de-yellow on nb

    enebo committed Nov 27, 2013
  3. @enebo

    Merge with 1.7

    enebo committed Nov 27, 2013
  4. @enebo

    Classpath urls should still use expand_path to properly canonicalize …

    …the path. This fixes no reported issue
    enebo committed Nov 27, 2013
  5. @headius

    Merge branch 'jruby-1_7'

    headius committed Nov 27, 2013
  6. @headius
  7. @headius

    Merge pull request #1276 from dmarcotte/hash-enum-size

    Enumerator#size support for hashes
    headius committed Nov 27, 2013
  8. @headius

    Merge branch 'jruby-1_7'

    headius committed Nov 27, 2013
  9. @headius

    Bail out of reification if a class would collide with another.

    For this bug, we had the unusual case where a child class had the
    same name as its parent. This caused the class reification to fail
    since the parent class had to be reified first, and then the child
    conflicted with that name.
    
    A reproduction case looks like this:
    
    module Bar
      class Foo; end
    end
    
    foo = Bar::Foo
    Bar.send :remove_const, :Foo
    Bar.const_set :Foo, Class.new(foo)
    
    Bar::Foo.new
    
    Here, the new Bar::Foo extends the old Bar::Foo, but takes on its
    name when assigned to the Foo constant. As a result, we have two
    classes in the same class hierarchy with the same fully-qualified
    name.
    
    A few options were considered to fix this:
    
    * Bail out when there's such a conflict, since they should be rare
      occurences. That's this commit.
    * Attach the class's ID to all reified class names. That also
      fixes this issue, but make all reified classes suddenly have a
      potentially unpredictable ID number attached.
    * Only attach the class's ID to the reified class name in the case
      of this unusual collision. The ID would still be unpredictable,
      but under most normal circumstances it would not be used.
    
    I opted for the first case, since these peculiar child classes
    will still use their reified parent (of the same name) and this
    change does not introduce any unpredictable aspect to the reified
    class names. We may revisit this in the future.
    headius committed Nov 27, 2013
  10. @enebo

    Merge branch 'jruby-1_7'

    enebo committed Nov 27, 2013
  11. @enebo

    Fixes #1272 and hopefully #770

    enebo committed Nov 27, 2013
  12. @dmarcotte
  13. @headius

    Merge branch 'jruby-1_7'

    headius committed Nov 26, 2013
  14. @headius

    Merge pull request #1275 from nirvdrum/fix_json_profile_printer

    Quote a JSON key so it's valid JSON.
    headius committed Nov 26, 2013
  15. @headius

    Merge branch 'jruby-1_7'

    Conflicts:
    	core/src/main/java/org/jruby/RubyString.java
    	test/externals/ruby1.8/ruby/test_string.rb
    	test/externals/ruby1.9/ruby/test_string.rb
    headius committed Nov 26, 2013
  16. @nirvdrum
  17. @headius

    Merge branch 'issue-1177-string-concat' of github.com:lucasallan/jrub…

    …y into lucasallan-issue-1177-string-concat
    headius committed Nov 26, 2013
Commits on Nov 26, 2013
  1. @headius

    Merge branch 'jruby-1_7'

    headius committed Nov 26, 2013
  2. @headius
  3. @headius
  4. @enebo

    Merge jruby-1_7 to master

    enebo committed Nov 26, 2013
  5. @enebo

    Merge pull request #1271 from dmarcotte/array-each

    Fix arrays with overridden each
    enebo committed Nov 26, 2013
  6. @headius

    Update to joni 2.1.1-SNAPSHOT.

    headius committed Nov 26, 2013
  7. @dmarcotte

    Fix arrays with overridden each

    Fix a stack overflow in Array#all (#1265)
    and restore the correct behavior for Array#any (the needed isBuiltn
    check was incorrectly removed in #1234)
    
    Also add a spec to ensure this remains stable going forward.
    dmarcotte committed Nov 26, 2013
  8. @headius

    Merge branch 'jruby-1_7'

    headius committed Nov 26, 2013
  9. @headius
Commits on Nov 25, 2013
  1. @headius
  2. @headius

    Merge branch 'jruby-1_7'

    Conflicts:
    	core/src/main/java/org/jruby/RubyEnumerable.java
    	spec/regression/GH-744_GH-264_enum_args_using_call_spec.rb
    	test/pom.xml
    headius committed Nov 25, 2013
  3. @headius

    Merge pull request #1264 from dmarcotte/chunk-args

    Fix Enumerable#chunk arg handling
    headius committed Nov 24, 2013
  4. @headius

    Merge pull request #1263 from dmarcotte/take-while-args

    Fix Enumerable#take_while arg handling
    headius committed Nov 24, 2013
  5. @headius

    Merge pull request #1262 from dmarcotte/slice_before_args

    Fix Enumerable#slice_before arg handling
    headius committed Nov 24, 2013
  6. @subbuss

    [IR] Clear IR state correctly after running some passes.

    * LVA information is invalid after most passes that modifies the
      instruction list of a scope.
    * This fix eliminates crashers when passes are run in
      non-default orders.
    subbuss committed Nov 24, 2013
Commits on Nov 24, 2013
  1. @dmarcotte