i18n: i18n-diff-auditor: introduce is_trans (nfc)

[dgit.git] / i18n-diff-auditor

diff --git a/i18n-diff-auditor b/i18n-diff-auditor
index b4fc5968ad66bde2bae169b9457c9dc831b4b3bb..80840913235bfe81230a885531651f0340e0a05b 100755 (executable)
--- a/i18n-diff-auditor
+++ b/i18n-diff-auditor
@@ -107,7 +107,8 @@ our ($ihunkhead, $ihunkend);
 our ($ichunkstart, $ichunkend);
 our ($before, $after);
 
-sub is_string ($) { $_[0]{T} =~ m/heredoc|string/; };
+sub is_string ($) { $_[0]{T} =~ m/heredoc|string/; }
+sub is_trans ($) { grep { $_[0]{E} eq $_ } qw(__ f_); }
 
 sub semiparse ($) {
     ($_) = @_;
@@ -172,7 +173,6 @@ sub semiparse ($) {
                    Q => $q,
                  };
        @o = (@o[0..$i-1], $new, @o[$i+3..$#o]);
-       print STDERR Dumper(\@o);
     }
     debug $ichunkstart, "semiparsed: ".join ' ', map { $_->{P} } @o;
     return @o;
@@ -211,14 +211,14 @@ sub analyse_chunk_core () {
        if ($y->{E} eq '+'
            and @ys >= 3
            and $ys[0]{E} eq '('
-           and ($ys[1]{E} eq '__' or $ys[2]{E} eq 'f_')) {
+           and is_trans($ys[1])) {
            $next_y->(); # (
            $next_y->(); # __ f_
            @y_expect_suffix = ')';
        }
        my $string_changed;
        my $ye = $y->{E};
-       if ($ye eq '__' or $ye eq 'f_') {
+       if (is_trans($y)) {
            $next_y->();
            die "__ on non-string $y->{P}\n"     unless is_string($y);
            die "__ on was non-string $y->{P}\n" unless is_string($x);
@@ -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+}{};