Changeset 21926 for lang/perl/String-Diff

Timestamp:

10/23/08 11:15:03 (5 years ago)

Author:

yappo

Message:

r438@haruna (orig r388): ko | 2007-06-10 15:30:59 +0900

r436@haruna: ko | 2007-06-10 15:29:31 +0900
fixed to invalid handling of zeros bug. rt.cpan #26493

Location:

lang/perl/String-Diff/trunk

Files:

• lib/String/Diff.pm (modified) (4 diffs)
• t/02_diff_fully.t (modified) (1 diff)
• t/03_diff.t (modified) (1 diff)
• t/04_diff_merge.t (modified) (1 diff)
• t/05_diff_regexp.t (modified) (1 diff)

lang/perl/String-Diff/trunk/lib/String/Diff.pm

@@ -53 +53 @@
     my @old_diff = ();
     my @new_diff = ();
-    my $old_str = '';
-    my $new_str = '';
+    my $old_str;
+    my $new_str;
 
     my @diff = sdiff( map{[ split //, $_ ]} $old, $new);
@@ -60 +60 @@
     for my $line (@diff) {
         if ($last_mode ne $line->[0]) {
-            push @old_diff, [$last_mode, $old_str] if $old_str;
-            push @new_diff, [$last_mode, $new_str] if $new_str;
+            push @old_diff, [$last_mode, $old_str] if defined $old_str;
+            push @new_diff, [$last_mode, $new_str] if defined $new_str;
 
             # skip concut
-            push @old_diff, ['s', ''] unless $old_str;
-            push @new_diff, ['s', ''] unless $new_str;
-
-            $old_str = $new_str = '';
+            push @old_diff, ['s', ''] unless defined $old_str;
+            push @new_diff, ['s', ''] unless defined $new_str;
+
+            $old_str = $new_str = undef;
         }
  
@@ -74 +74 @@
         $last_mode = $line->[0];
     }
-    push @old_diff, [$last_mode, $old_str] if $old_str;
-    push @new_diff, [$last_mode, $new_str] if $new_str;
+    push @old_diff, [$last_mode, $old_str] if defined $old_str;
+    push @new_diff, [$last_mode, $new_str] if defined $new_str;
 
     @old_diff = _fully_filter('-', @old_diff);
@@ -94 +94 @@
             next;
         }
-        push @filter, $last_line if $last_line->[1];
+        push @filter, $last_line if length $last_line->[1];
         $last_line = $line;
     }
-    push @filter, $last_line if $last_line->[1];
+    push @filter, $last_line if length $last_line->[1];
     
     @filter;

lang/perl/String-Diff/trunk/t/02_diff_fully.t

@@ -277 +277 @@
 options:
   linebreak: 1
+
+===
+--- data1
+-
+  - ['u', '1']
+  - ['-', '0']
+-
+  - ['u', '1']
+  - ['+', '1']
+--- data2
+old: 10
+new: 11
+

lang/perl/String-Diff/trunk/t/03_diff.t

@@ -166 +166 @@
   append_open: <ins>
   append_close: </ins>
+
+===
+--- data1
+- 1[0]
+- 1{1}
+--- data2
+old: 10
+new: 11
+

lang/perl/String-Diff/trunk/t/04_diff_merge.t

@@ -150 +150 @@
   append_open: <ins>
   append_close: </ins>
+
+===
+--- data1
+1[0]{1}
+--- data2
+old: 10
+new: 11

lang/perl/String-Diff/trunk/t/05_diff_regexp.t

@@ -125 +125 @@
 options:
   linebreak: 1
+
+===
+--- data1
+1(?:0|1)
+--- data2
+old: 10
+new: 11