i18n: i18n-diff-auditor: more debugging improvement

[dgit.git] / i18n-diff-auditor

diff --git a/i18n-diff-auditor b/i18n-diff-auditor
index a32b554d90c53ca70d3dbffd513362e94bdc6e2d..a92db5e1172ed3822210351bfdf3d9863fa86b7c 100755 (executable)
--- a/i18n-diff-auditor
+++ b/i18n-diff-auditor
@@ -132,7 +132,7 @@ sub semiparse ($) {
                 (             .* \n    )
                 ( (?: (?! $d) .* \n )* )
                           $d     \n
-              }{ $1 }x or die "missing end of here doc $d\n";
+              }{ $1 }xe or die "missing end of here doc $d\n";
            $o[$#o]{V} = $2;
        } elsif (s{^ (["'])( (?: [^\\'"]
                                | \\ [^"']
@@ -177,6 +177,7 @@ sub semiparse ($) {
        $i--; # counteracts $i++
     }
     debug $ichunkstart, "semiparsed: ".join ' ', map { $_->{P} } @o;
+    # debug $ichunkstart, "semiparsed V: ".join ' ', map { defined $_->{V} ? ">$_->{V}<" : '-' } @o;
     return @o;
 }          
 
@@ -264,8 +265,10 @@ sub analyse_chunk_core () {
                my ($lit, $what) = @_;
                my $xl = substr($xs, 0, length($lit));
                if ($xl ne $lit) {
-                   debug $ichunkstart, "not exactly x: \"..$xs\"";
-                   debug $ichunkstart, "not exactly y:   $lit";
+                   my $xsp  = $xs;  $xsp  =~ s/\n/\\n/g;
+                   my $litp = $lit; $litp =~ s/\n/\\n/g;
+                   debug $ichunkstart, "not exactly x: ..\"$xsp\"";
+                   debug $ichunkstart, "not exactly y:  '$litp'";
                    my $next = @ys ? $ys[0]{P} : '(end)';
                    die "string contents mismatch near $what before $next\n";
                }
@@ -275,6 +278,7 @@ sub analyse_chunk_core () {
                if ($fmt !~ m{\%[^\%]}) {
                    $exactly->($fmt, '(tail)');
                    $fmt = '';
+                   die "text deleted from end of string\n" if length $xs;
                    last;
                }
                $exactly->($`, '(literal)');