Changeset 24482

Timestamp:

11/20/08 18:27:46 (5 years ago)

Author:

daisuke

Message:

parameter check

Files:

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

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

@@ -110 +110 @@
     # give default values, first...
     {
-        my %defaults = (
-            day => 1,
-            month => 1,
-            year => 1,
-            hour => 0,
-            minute => 0,
-            second => 0,
-            nanosecond => 0
+        my %spec = (
+            day => { default => 1, range => [1, 31] },
+            month => { default => 1, range => [1, 12] },
+            year => {default => 1},
+            hour => {default => 0, range => [0, 23]},
+            minute => {default => 0, range => [0, 59]},
+            second => {default => 0, range => [0, 61]},
+            nanosecond => {default => 0, range => [0,undef]}
         );
-        while (my ($key, $value) = each %defaults) {
-            $p{$key} = $value unless defined $p{$key};
+
+        while (my ($key, $spec) = each %spec) {
+            my $default = $spec->{default};
+            $p{$key} = $default unless defined $p{$key};
+
+            if (my $range = $spec->{range}) {
+                my $v = $p{$key};
+                if ( (defined $range->[0] && $v < $range->[0]) ||
+                     (defined $range->[1] && $v > $range->[1]) ) {
+                    Carp::croak(qq|The '$key' parameter ("$p{$key}") to DateTime::Lite::new did not pass the range test|); # hmm, almost
+                }
+            }
         }
     }
@@ -347 +357 @@
 sub last_day_of_month {
     my ($class, %p) = @_;
+    if ($p{month} > 12 || $p{month} < 1) {
+        Carp::croak(qq|The 'month' parameter ("$p{month}") to DateTime::Lite::last_day_of_month did not pass the 'is between 1 and 12' callback|);
+    }
+
     return $class->new(%p, day => DateTime::Lite::Util::month_length($p{year}, $p{month}));
 }
@@ -630 +644 @@
 {
     my ($self, %p) = @_;
-#    my %p = validate( @_, $SetValidate );
+
 
     my $new_dt = $self->_new_from_self(%p);