Changeset 36290

Timestamp:

12/28/09 15:16:55 (3 years ago)

Author:

ktat

Message:

fix bug: returns string "undef" by mistake when deleted hash value is undef.

Location:

lang/perl/Tie-Trace/trunk

Files:

• Makefile.PL (modified) (1 diff)
• lib/Tie/Trace.pm (modified) (1 diff)
• t/tie-trace-watch.t (modified) (3 diffs)

lang/perl/Tie-Trace/trunk/Makefile.PL

@@ -10 +10 @@
     PL_FILES            => {},
     PREREQ_PM => {
-        'Test::More' => 0,
+        'Test::More' => '0.88',
         'Test::Base' => 0,
         'PadWalker'  => 0,

lang/perl/Tie-Trace/trunk/lib/Tie/Trace.pm

@@ -326 +326 @@
   my($self, $key) = @_;
   my $deleted = delete $self->{storage}->{$key};
-  $deleted = 'undef' if not defined $deleted;
-  $self->_carpit(key => $key, value => sprintf("DELETED(%s)", $self->_dumper($deleted)), filter => sub{$_[0] =~ s/^\'(.+)\'$/$1/; $_[0] =~s /\\'/'/g})  unless $QUIET;
+  $self->_carpit(key => $key,
+                 value => sprintf("DELETED(%s)", $self->_dumper(defined $deleted? $deleted : 'undef')),
+                 filter => sub{$_[0] =~ s/^\'(.+)\'$/$1/; $_[0] =~s /\\'/'/g}
+                )  unless $QUIET;
   return $deleted;
 }

lang/perl/Tie-Trace/trunk/t/tie-trace-watch.t

@@ -1 @@
-use Test::More tests => 24;
+use Test::More;
 
 local $SIG{__DIE__} = sub {print "ERROR: ", @_;};
@@ -94 +94 @@
   $hash4{xxx}->{xxx} = 'var';
   unlike($err, qr/^\s*\{xxx\} => 'var'/m, q{$hash{xxx}->{xxx} = 'var'});
+  $hash4{xxx} = undef;
+  my $del = delete $hash4{xxx};
+  is($del, undef);
  
 =iranai
@@ -120 +123 @@
 }
 
-
+done_testing;