i18n: i18n-diff-auditor: fix `on was non-string' message

[dgit.git] / i18n-diff-auditor

diff --git a/i18n-diff-auditor b/i18n-diff-auditor
index 73c77eca50db5055eb095eb33e187c6d30fbc645..ce2034f600c64edc6716422f1058e12ca001946e 100755 (executable)
--- a/i18n-diff-auditor
+++ b/i18n-diff-auditor
@@ -144,9 +144,9 @@ sub semiparse ($) {
                       Q => $q, V => $v};
        } elsif (s{^$perlop_re|^\;}{}) {
            push @o, { T => 'op', E => $&, P => $& };
-       } elsif (s/[[{(]//) {
+       } elsif (s/^[[{(]//) {
            push @o, { T => 'bra', E => $&, P => $& };
-       } elsif (s/[]})]//) {
+       } elsif (s/^[]})]//) {
            push @o, { T => 'ket', E => $&, P => $& };
        } elsif (s/^( [\$\@\%] )( \{ )//x) {
            push @o, { T => 'deref', E => $1, P => $1 },
@@ -210,6 +210,8 @@ sub analyse_chunk_core () {
        $next_x->();
        $next_y->();
        next if $x->{E} eq $y->{E};
+       next if $x->{E} eq 'sprintf' and $y->{E} eq 'f_';
+       next if $x->{E} eq 'die'     and $y->{E} eq 'confess';
        if ($y->{E} eq '+'
            and @ys >= 3
            and $ys[0]{E} eq '('
@@ -223,7 +225,7 @@ sub analyse_chunk_core () {
        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);
+           die "__ on was non-string $x->{P}\n" unless is_string($x);
            if ($y->{Q} ne "'") {
                die "var subst in new string\n"
                    if $y->{V} =~ m{(?<!\\) [\$\@]};
@@ -273,6 +275,15 @@ sub analyse_chunk_core () {
                elsif ($& ne '%s') { die "unhandled %-subst $&\n"; }
                $next_y->();
                die "expected comma, got $y->{P}\n" unless $y->{E} eq ',';
+               if (!length $fmt and
+                   !length $xs and
+                   @xs and
+                   $xs[0]{E} eq '.') {
+                   # X has   "<earlier>" .                <something>
+                   # Y has   "<earlier>%s" [other args] , <something>
+                   $next_x->(); # eat the '.'
+                   next;
+               }
                if ($xs =~ m{^\@}) {
                    $next_y->();
                    die "\@... => not string" unless is_string($y);
@@ -298,7 +309,11 @@ sub analyse_chunk_core () {
                        pop @analysed_y;
                        last;
                    }
-                   $xs =~ s{^\s+}{};
+                   $xs =~ s{^\s+}{} if $bras;
+                   if (is_string($y) and $y->{Q} eq '"') {
+                       $exactly->($y->{V}, $y->{P});
+                       next;
+                   }
                    $exactly->($y->{E}, $y->{P});
                    if ($y->{T} eq 'bra' or $y->{E} eq '?') {
                        $bras++;