Skip to content

Commit

Permalink
[Truffle] Only keep a single specialization for the time_s_from_array…
Browse files Browse the repository at this point in the history 
… primitive.
@eregon
eregon committed May 25, 2015
1 parent 0a256b2 commit 3ad03a5
Showing 1 changed file with 12 additions and 57 deletions.
69 changes: 12 additions & 57 deletions truffle/src/main/java/org/jruby/truffle/nodes/rubinius/TimePrimitiveNodes.java
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;

import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.jruby.truffle.nodes.time.ReadTimeZoneNode;
@@ -212,42 +213,29 @@ public RubyString timeStrftime(RubyTime time, RubyString format) {

}

@RubiniusPrimitive(name = "time_s_from_array", needsSelf = true)
@RubiniusPrimitive(name = "time_s_from_array", needsSelf = true, lowerFixnumParameters = { 0 /*sec*/, 6 /*nsec*/, 7 /*isdst*/})
public static abstract class TimeSFromArrayPrimitiveNode extends RubiniusPrimitiveNode {

public TimeSFromArrayPrimitiveNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
}

@Specialization(guards = {"isNil(sec)", "isNil(nsec)"})
public RubyTime timeSFromArray(VirtualFrame frame, RubyClass timeClass, Object sec, int min, int hour, int mday, int month, int year,
Object nsec, int isdst, boolean fromutc, Object utcoffset) {
return timeSFromArray(frame, timeClass, 0, min, hour, mday, month, year, nsec, isdst, fromutc, utcoffset);
@Specialization
public RubyTime timeSFromArray(VirtualFrame frame, RubyClass timeClass, int sec, int min, int hour, int mday, int month, int year,
int nsec, int isdst, boolean fromutc, Object utcoffset) {
return buildTime(frame, timeClass, sec, min, hour, mday, month, year, nsec, isdst, fromutc, utcoffset);
}

@Specialization(guards = "isNil(nsec)")
public RubyTime timeSFromArray(VirtualFrame frame, RubyClass timeClass, int sec, int min, int hour, int mday, int month, int year,
@Specialization(guards = "!isInteger(sec) || !isInteger(nsec)")
public RubyTime timeSFromArrayFallback(VirtualFrame frame, RubyClass timeClass, Object sec, int min, int hour, int mday, int month, int year,
Object nsec, int isdst, boolean fromutc, Object utcoffset) {
return buildTime(frame, timeClass, sec, min, hour, mday, month, year, 0, isdst, fromutc, utcoffset);
return null; // Primitive failure
}

@Specialization
public RubyTime timeSFromArray(VirtualFrame frame, RubyClass timeClass, long sec, int min, int hour, int mday, int month, int year,
private RubyTime buildTime(VirtualFrame frame, RubyClass timeClass, int sec, int min, int hour, int mday, int month, int year,
int nsec, int isdst, boolean fromutc, Object utcoffset) {
// TODO CS 15-Feb-15 that cast
return buildTime(frame, timeClass, (int) sec, min, hour, mday, month, year, nsec, isdst, fromutc, utcoffset);
}
CompilerDirectives.transferToInterpreter();

@Specialization
public RubyTime timeSFromArray(VirtualFrame frame, RubyClass timeClass, int sec, int min, int hour, int mday, int month, int year,
long nsec, int isdst, boolean fromutc, Object utcoffset) {
// TODO CS 15-Feb-15 that cast
return buildTime(frame, timeClass, sec, min, hour, mday, month, year, (int) nsec, isdst, fromutc, utcoffset);
}

@Specialization
public RubyTime buildTime(VirtualFrame frame, RubyClass timeClass, int sec, int min, int hour, int mday, int month, int year,
int nsec, int isdst, boolean fromutc, Object utcoffset) {
if (sec < 0 || sec > 59 ||
min < 0 || min > 59 ||
hour < 0 || hour > 23 ||
@@ -281,40 +269,7 @@ public RubyTime buildTime(VirtualFrame frame, RubyClass timeClass, int sec, int
}
}

@Specialization(guards = "isNil(nsec)")
public RubyTime timeSFromArray(RubyClass timeClass, RubyBasicObject sec, int min, int hour, int mday, int month, int year,
Object nsec, int isdst, boolean fromutc, Object utcoffset) {
return null;
}

@Specialization
public RubyTime timeSFromArray(VirtualFrame frame, RubyClass timeClass, double sec, int min, int hour, int mday, int month, int year,
long nsec, int isdst, boolean fromutc, Object utcoffset) {
return timeSFromArray(frame, timeClass, sec, min, hour, mday, month, year, (int) nsec, isdst, fromutc, utcoffset);
}

@Specialization
public RubyTime timeSFromArray(VirtualFrame frame, RubyClass timeClass, double sec, int min, int hour, int mday, int month, int year,
int nsec, long isdst, boolean fromutc, Object utcoffset) {
return timeSFromArray(frame, timeClass, sec, min, hour, mday, month, year, nsec, (int) isdst, fromutc, utcoffset);
}

@Specialization(guards = "isNil(nsec)")
public RubyTime timeSFromArray(VirtualFrame frame, RubyClass timeClass, double sec, int min, int hour, int mday, int month, int year,
Object nsec, int isdst, boolean fromutc, Object utcoffset) {
final int secondsWhole = (int) sec;
final int nanosecondsFractional = (int) ((sec * 1_000_000_000) - (secondsWhole * 1_000_000_000));
return buildTime(frame, timeClass, secondsWhole, min, hour, mday, month, year, nanosecondsFractional, isdst, fromutc, utcoffset);
}

@Specialization
public RubyTime timeSFromArray(VirtualFrame frame, RubyClass timeClass, double sec, int min, int hour, int mday, int month, int year,
int nsec, int isdst, boolean fromutc, Object utcoffset) {
final int secondsWhole = (int) sec;
return buildTime(frame, timeClass, secondsWhole, min, hour, mday, month, year, nsec, isdst, fromutc, utcoffset);
}

private int cast(Object value) {
private static int cast(Object value) {
if (value instanceof Integer) {
return (int) value;
} else if (value instanceof Long) {

0 comments on commit 3ad03a5

Please sign in to comment.