i18n: i18n-diff-auditor: Print deleted text

[dgit.git] / i18n-diff-auditor

diff --git a/i18n-diff-auditor b/i18n-diff-auditor
index a32b554d90c53ca70d3dbffd513362e94bdc6e2d..beb3a9ab10a00e25732ca50dd43bfe9261995fef 100755 (executable)
--- a/i18n-diff-auditor
+++ b/i18n-diff-auditor
@@ -110,6 +110,15 @@ our ($before, $after);
 sub is_string ($) { $_[0]{T} =~ m/heredoc|string/; }
 sub is_trans ($) { grep { $_[0]{E} eq $_ } qw(__ f_ i_); }
 
+sub qp ($) {
+    my ($p) = @_;
+    $p =~ s{\\}{\\\\}g;
+    $p =~ s{\'}{\\'}g;
+    $p =~ s{\n}{\\n}g;
+    $p =~ s{\t}{\\t}g;
+    return "'$p'";
+};
+
 sub semiparse ($) {
     ($_) = @_;
     my @o;
@@ -132,7 +141,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 +186,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 +274,8 @@ 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";
+                   debug $ichunkstart, "not exactly x: ..".qp($xs);
+                   debug $ichunkstart, "not exactly y:   ".qp($lit);
                    my $next = @ys ? $ys[0]{P} : '(end)';
                    die "string contents mismatch near $what before $next\n";
                }
@@ -275,6 +285,8 @@ sub analyse_chunk_core () {
                if ($fmt !~ m{\%[^\%]}) {
                    $exactly->($fmt, '(tail)');
                    $fmt = '';
+                   die "text deleted from end of string: ".qp($xs)."\n"
+                       if length $xs;
                    last;
                }
                $exactly->($`, '(literal)');