From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 30 Sep 2018 22:35:31 +0000 (+0100)
Subject: i18n: i18n-diff-auditor: improve debug output
X-Git-Tag: archive/debian/7.0_pre1~59
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=45017d1dec0c2cc436c3a20156473154908572e0

i18n: i18n-diff-auditor: improve debug output

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/i18n-diff-auditor b/i18n-diff-auditor
index b4fc5968..6f9dab51 100755
--- a/i18n-diff-auditor
+++ b/i18n-diff-auditor
@@ -248,8 +248,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: ..\"$xs\"";
+		    debug $ichunkstart, "not exactly y:    $lit";
 		    my $next = @ys ? $ys[0]{P} : '(end)';
 		    die "string contents mismatch near $what before $next\n";
 		}
@@ -289,6 +289,7 @@ sub analyse_chunk_core () {
 			# lookahead shows close of containing scope
 			# or lower precedence operator
 			unshift @ys, $y;
+			pop @analysed_y;
 			last;
 		    }
 		    $xs =~ s{^\s+}{};