Changeset 24215 for lang/perl/DateTime-Lite

Timestamp:

11/19/08 10:35:10 (5 years ago)

Author:

daisuke

Message:

more stuff

Files:

• lang/perl/DateTime-Lite/trunk/lib/DateTime/Lite.pm (modified) (4 diffs)

lang/perl/DateTime-Lite/trunk/lib/DateTime/Lite.pm

@@ -14 +14 @@
 
 {
-    my @local_c_comp = qw(year month day hour minute second nanosecond);
+    my @local_c_comp = qw(year month day hour minute second quarter);
     foreach my $comp (@local_c_comp) {
         no strict 'refs';
@@ -22 +22 @@
 
 *mon = \&month;
+
+sub nanosecond { $_[0]->{rd_nanosecs} }
+
+sub utc_rd_values { @{ $_[0] }{ 'utc_rd_days', 'utc_rd_secs', 'rd_nanosecs' } }
+sub local_rd_values { @{ $_[0] }{ 'local_rd_days', 'local_rd_secs', 'rd_nanosecs' } }
+
+# XXX Prime candidate for SelfLoading
+sub ce_year { 
+    my $year = $_[0]->{local_c}{year};
+    return $year <= 0 ? $year - 1 : $year
+}
+
+sub set_time_zone {
+    my ( $self, $tz ) = @_;
+
+    # This is a bit of a hack but it works because time zone objects
+    # are singletons, and if it doesn't work all we lose is a little
+    # bit of speed.
+    return $self if $self->{tz} eq $tz;
+
+    my $was_floating = $self->{tz}->is_floating;
+
+    $self->{tz} = ref $tz ? $tz : DateTime::Lite::TimeZone->load( name => $tz );
+
+    $self->_handle_offset_modifier( $self->second, 1 );
+
+    # if it either was or now is floating (but not both)
+    if ( $self->{tz}->is_floating xor $was_floating )
+    {
+        $self->_calc_utc_rd;
+    }
+    elsif ( ! $was_floating )
+    {
+        $self->_calc_local_rd;
+    }
+
+    return $self;
+}
+
 
 sub new {
@@ -82 +121 @@
         }
     }
-    
+
 # use Data::Dumper;
 # print STDERR Dumper($self);
@@ -222 +261 @@
 }
 
+sub from_object {
+    my ($class, %p) = @_;
+    my $object = delete $p{object};
+
+    my ( $rd_days, $rd_secs, $rd_nanosecs ) = $object->utc_rd_values;
+
+    # A kludge because until all calendars are updated to return all
+    # three values, $rd_nanosecs could be undef
+    $rd_nanosecs ||= 0;
+
+    # This is a big hack to let _seconds_as_components operate naively
+    # on the given value.  If the object _is_ on a leap second, we'll
+    # add that to the generated seconds value later.
+    my $leap_seconds = 0;
+    if ( $object->can('time_zone') && ! $object->time_zone->is_floating
+         && $rd_secs > 86399 && $rd_secs <= $class->_day_length($rd_days) )
+    {
+        $leap_seconds = $rd_secs - 86399;
+        $rd_secs -= $leap_seconds;
+    }
+
+    my %args;
+    @args{ qw( year month day ) } = DateTime::Lite::Util::rd2ymd($rd_days);
+    @args{ qw( hour minute second ) } =
+        DateTime::Lite::Util::seconds_as_components($rd_secs);
+    $args{nanosecond} = $rd_nanosecs;
+
+    $args{second} += $leap_seconds;
+
+    my $new = $class->new( %p, %args, time_zone => 'UTC' );
+
+    if ( $object->can('time_zone') )
+    {
+        $new->set_time_zone( $object->time_zone );
+    }
+    else
+    {
+        $new->set_time_zone( 'floating' );
+    }
+
+    return $new;
+}
+
 
 sub last_day_of_month {