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: 975f5fc0f9ce
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8c8be19f3b57
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 19, 2016

  1. [noci] Document UNRESCUED_REGION_LABEL

    @enebo
    enebo committed Apr 19, 2016
    Copy the full SHA
    76a4d5d View commit details

  2. Fixes #3811. Time.parse should coerce argument into a String

    @enebo
    enebo committed Apr 19, 2016
    Copy the full SHA
    8c8be19 View commit details
Showing with 4 additions and 0 deletions.
  1. +1 −0 core/src/main/java/org/jruby/ir/operands/Label.java
  2. +3 −0 lib/ruby/stdlib/date/format.rb
1 change: 1 addition & 0 deletions core/src/main/java/org/jruby/ir/operands/Label.java
View file
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@
// SSS FIXME: Should we try to enforce the canonical property that within a method,
// there is exactly one label object with the same label string?
public class Label extends Operand {
// This is for 'ensure's at the end of top-level constructs ('def foo; ensure; end' or 'class Foo; ensure; end')
public static final Label UNRESCUED_REGION_LABEL = new Label("UNRESCUED_REGION", 0);
private static final Label GLOBAL_ENSURE_BLOCK_LABEL = new Label("_GLOBAL_ENSURE_BLOCK_", 0);

3 changes: 3 additions & 0 deletions lib/ruby/stdlib/date/format.rb
View file
Original file line number Diff line number Diff line change
@@ -832,6 +832,9 @@ def self._parse_ddd(str, e) # :nodoc:
:_parse_year, :_parse_mon, :_parse_mday, :_parse_ddd

def self._parse(str, comp=true)
# Newer MRI version (written in C converts non-strings to strings
# and also has other checks like all ascii.
str = str.to_str if !str.kind_of?(::String) && str.respond_to?(:to_str)
str = str.dup

e = Format::Bag.new