-
-
Notifications
You must be signed in to change notification settings - Fork 925
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- 9.4.12.0
- 9.4.11.0
- 9.4.10.0
- 9.4.9.0
- 9.4.8.0
- 9.4.7.0
- 9.4.6.0
- 9.4.5.0
- 9.4.4.0
- 9.4.3.0
- 9.4.2.0
- 9.4.1.0
- 9.4.0.0
- 9.3.15.0
- 9.3.14.0
- 9.3.13.0
- 9.3.12.0
- 9.3.11.0
- 9.3.10.0
- 9.3.9.0
- 9.3.8.0
- 9.3.7.0
- 9.3.6.0
- 9.3.5.0
- 9.3.4.0
- 9.3.3.0
- 9.3.2.0
- 9.3.1.0
- 9.3.0.0
- 9.2.21.0
- 9.2.20.1
- 9.2.20.0
- 9.2.19.0
- 9.2.18.0
- 9.2.17.0
- 9.2.16.0
- 9.2.15.0
- 9.2.14.0
- 9.2.13.0
- 9.2.12.0
- 9.2.11.1
- 9.2.11.0
- 9.2.10.0
- 9.2.9.0
- 9.2.8.0
- 9.2.7.0
- 9.2.6.0
- 9.2.5.0
- 9.2.4.1
- 9.2.4.0
- 9.2.3.0
- 9.2.2.0
- 9.2.1.0
- 9.2.0.0
- 9.1.17.0
- 9.1.16.0
- 9.1.15.0
- 9.1.14.0
- 9.1.13.0
- 9.1.12.0
- 9.1.11.0
- 9.1.10.0
- 9.1.9.0
- 9.1.8.0
- 9.1.7.0
- 9.1.6.0
- 9.1.5.0
- 9.1.4.0
- 9.1.3.0
- 9.1.2.0
- 9.1.1.0
- 9.1.0.0
- 9.0.5.0
- 9.0.4.0
- 9.0.3.0
- 9.0.1.0
- 9.0.0.0
- 9.0.0.0.rc2
- 9.0.0.0.rc1
- 9.0.0.0.pre2
1 parent
30ac04b
commit 88ae22c
Showing
1 changed file
with
11 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -66,8 +66,14 @@ public InternalOffsetNode(InternalOffsetNode prev) { | |
} | ||
|
||
@Specialization | ||
public RubyNilClass internalOffset(RubyTime time) { | ||
return getContext().getCoreLibrary().getNilObject(); | ||
public Object internalOffset(RubyTime time) { | ||
final Object offset = time.getOffset(); | ||
|
||
if (offset == null) { | ||
return getContext().getCoreLibrary().getNilObject(); | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
chrisseaton
Author
Contributor
|
||
} else { | ||
return offset; | ||
} | ||
} | ||
} | ||
|
||
|
@@ -83,8 +89,9 @@ public InternalSetOffsetNode(InternalSetOffsetNode prev) { | |
} | ||
|
||
@Specialization | ||
public boolean internalSetGMT(RubyTime time, Object setOffset) { | ||
throw new UnsupportedOperationException("_set_offset " + setOffset.getClass()); | ||
public Object internalSetOffset(RubyTime time, Object offset) { | ||
time.setOffset(offset); | ||
return offset; | ||
} | ||
} | ||
|
||
|
I've asked this before and don't recall the answer, but can't we just enforce that the offset is always
nil
whennull
, either by never passingnull
into the constructor or by moving this conditional to the constructor itself?