i18n: i18n-diff-auditor: Print deleted text

[dgit.git] / i18n-diff-auditor

diff --git a/i18n-diff-auditor b/i18n-diff-auditor
index a92db5e1172ed3822210351bfdf3d9863fa86b7c..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;
@@ -265,10 +274,8 @@ sub analyse_chunk_core () {
                my ($lit, $what) = @_;
                my $xl = substr($xs, 0, length($lit));
                if ($xl ne $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'";
+                   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";
                }
@@ -278,7 +285,8 @@ sub analyse_chunk_core () {
                if ($fmt !~ m{\%[^\%]}) {
                    $exactly->($fmt, '(tail)');
                    $fmt = '';
-                   die "text deleted from end of string\n" if length $xs;
+                   die "text deleted from end of string: ".qp($xs)."\n"
+                       if length $xs;
                    last;
                }
                $exactly->($`, '(literal)');