Refactor Truffle::TimeOperations.compose to move out handling of two method signatures

Author: andrykonchin

spec/ruby/core/time/shared/time_params.rb

@@ -179,6 +179,10 @@
     }.should raise_error(ArgumentError, "argument out of range")
   end
 
+  it "raises ArgumentError when given 8 arguments" do
+    -> { Time.send(@method, *[0]*8) }.should raise_error(ArgumentError)
+  end
+
   it "raises ArgumentError when given 9 arguments" do
     -> { Time.send(@method, *[0]*9) }.should raise_error(ArgumentError)
   end

src/main/ruby/truffleruby/core/time.rb

@@ -421,11 +421,11 @@ def new(year = undefined, month = undefined, day = nil, hour = nil, minute = nil
       elsif Primitive.is_a?(year, String) && month_undefined
         Truffle::TimeOperations.new_from_string(self, year, **options)
       elsif Primitive.nil? utc_offset
-        Truffle::TimeOperations.compose(self, :local, year, month, day, hour, minute, second)
+        Truffle::TimeOperations.compose(self, :local, year, month, day, hour, minute, second, nil, nil)
       elsif utc_offset == :std
-        Truffle::TimeOperations.compose(self, :local, second, minute, hour, day, month, year, nil, nil, false, nil)
+        Truffle::TimeOperations.compose(self, :local, year, month, day, hour, minute, second, nil, false)
       elsif utc_offset == :dst
-        Truffle::TimeOperations.compose(self, :local, second, minute, hour, day, month, year, nil, nil, true, nil)
+        Truffle::TimeOperations.compose(self, :local, year, month, day, hour, minute, second, nil, true)
       else
         if utc_offset_in_utc?(utc_offset)
           utc_offset = :utc
@@ -435,7 +435,7 @@ def new(year = undefined, month = undefined, day = nil, hour = nil, minute = nil
           utc_offset = Truffle::TimeOperations.calculate_utc_offset_with_timezone_object(utc_offset, :local_to_utc, as_utc) ||
             Truffle::TimeOperations.coerce_to_utc_offset(utc_offset)
         end
-        result = Truffle::TimeOperations.compose(self, utc_offset, year, month, day, hour, minute, second)
+        result = Truffle::TimeOperations.compose(self, utc_offset, year, month, day, hour, minute, second, nil, nil)
         Truffle::TimeOperations.set_zone_if_object(result, zone)
         result
       end
@@ -464,12 +464,12 @@ def now(**options)
     end
 
     def local(*args)
-      Truffle::TimeOperations.compose(self, :local, *args)
+      Truffle::TimeOperations.compose_dual_signature(self, :local, *args)
     end
     alias_method :mktime, :local
 
     def gm(*args)
-      Truffle::TimeOperations.compose(self, :utc, *args)
+      Truffle::TimeOperations.compose_dual_signature(self, :utc, *args)
     end
     alias_method :utc, :gm
   end

src/main/ruby/truffleruby/core/truffle/time_operations.rb

@@ -17,19 +17,23 @@ module TimeOperations
 
     # Handles Time methods .utc, .gm. .local, .mktime dual signature:
     # - year, month, day, hour, min, sec, usec
-    # - sec, min, hour, day, month, year
-    def self.compose(time_class, utc_offset, p1, p2 = nil, p3 = nil, p4 = nil, p5 = nil, p6 = nil, p7 = nil,
-                yday = undefined, is_dst = undefined, tz = undefined)
+    # - sec, min, hour, day, month, year, dummy, dummy, dummy, dummy
+    def self.compose_dual_signature(time_class, utc_offset, p1, p2 = nil, p3 = nil, p4 = nil, p5 = nil, p6 = nil, p7 = nil,
+                     yday = undefined, is_dst = undefined, tz = undefined)
       if Primitive.undefined?(tz)
         unless Primitive.undefined?(is_dst)
           raise ArgumentError, 'wrong number of arguments (9 for 1..8)'
         end
 
-        year, month, mday, hour, min, sec, usec, is_dst = p1, p2, p3, p4, p5, p6, p7, -1
+        year, month, mday, hour, min, sec, usec, is_dst = p1, p2, p3, p4, p5, p6, p7, nil
       else
-        year, month, mday, hour, min, sec, usec, is_dst = p6, p5, p4, p3, p2, p1, 0, is_dst ? 1 : 0
+        year, month, mday, hour, min, sec, usec, is_dst = p6, p5, p4, p3, p2, p1, 0, is_dst
       end
 
+      compose(time_class, utc_offset, year, month, mday, hour, min, sec, usec, is_dst)
+    end
+
+    def self.compose(time_class, utc_offset, year, month, mday, hour, min, sec, usec, is_dst)
       if Primitive.is_a?(month, String) or month.respond_to?(:to_str)
         month = StringValue(month)
         month = MonthValue[month.upcase] || month.to_i
@@ -59,14 +63,14 @@ def self.compose(time_class, utc_offset, p1, p2 = nil, p3 = nil, p4 = nil, p5 =
 
       case utc_offset
       when :utc
-        is_dst = -1
+        is_dst = nil
         is_utc = true
         utc_offset = nil
       when :local
         is_utc = false
         utc_offset = nil
       else
-        is_dst = -1
+        is_dst = nil
         is_utc = false
       end
 
@@ -88,8 +92,9 @@ def self.compose(time_class, utc_offset, p1, p2 = nil, p3 = nil, p4 = nil, p5 =
       end
 
       nsec ||= 0
+      dst_code = is_dst ? 1 : (Primitive.nil?(is_dst) ? -1 : 0)
 
-      Primitive.time_s_from_array(time_class, sec, min, hour, mday, month, year, nsec, is_dst, is_utc, utc_offset)
+      Primitive.time_s_from_array(time_class, sec, min, hour, mday, month, year, nsec, dst_code, is_utc, utc_offset)
     end
 
     # MRI: time_init_parse()
@@ -108,7 +113,7 @@ def self.new_from_string(time_class, str, **options)
               (?:\s* (?<offset>\S+))?
              )?\z/x =~ str
 
-        # convert seconds fraction to milliseconds
+        # convert seconds fraction to microseconds
         usec = if subsec
                  ndigits = subsec.length
 
@@ -121,7 +126,8 @@ def self.new_from_string(time_class, str, **options)
                  nil
                end
 
-        return self.compose(time_class, self.utc_offset_for_compose(offset || options[:in]), year, month, mday, hour, min, sec, usec)
+        utc_offset = self.utc_offset_for_compose(offset || options[:in])
+        return self.compose(time_class, utc_offset, year, month, mday, hour, min, sec, usec, nil)
       end
 
       raise ArgumentError, "can't parse: #{str.inspect}"