i18n: i18n-diff-auditor: fix striang (de)concatenation

[dgit.git] / i18n-diff-auditor

diff --git a/i18n-diff-auditor b/i18n-diff-auditor
index e8c86fec55426a63c3d784eafa8a3c4cf84e4fc2..e8914c004e0d20e0de81675d913430d2ac0d924f 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_ i_); }
 
 sub semiparse ($) {
     ($_) = @_;
@@ -139,7 +140,7 @@ sub semiparse ($) {
                               )*
                        ) \1 }{}x) {
            my ($q,$v) = ($1,$2);
-           push @o, { T => 'string', E => $&, P => "$q-string",
+           push @o, { T => 'string', E => $&, P => "$q$q",
                       Q => $q, V => $v};
        } elsif (s{^$perlop_re|^\;}{}) {
            push @o, { T => 'op', E => $&, P => $& };
@@ -159,9 +160,10 @@ sub semiparse ($) {
            die "cannot tokenise \`$&'";
        }
     }
-    for (my $i=@o-2; $i>0; --$i) {
+    for (my $i=0; $i+2 < @o; $i++) {
        next unless $o[$i+1]{E} eq '.';
        my @inputs = @o[$i, $i+2];
+       #print STDERR Dumper(\@inputs);
        next if grep { !is_string($_) } @inputs;
        my $q = $inputs[0]{Q};
        next if grep { $_->{Q} ne $q } @inputs;
@@ -172,7 +174,7 @@ sub semiparse ($) {
                    Q => $q,
                  };
        @o = (@o[0..$i-1], $new, @o[$i+3..$#o]);
-       print STDERR Dumper(\@o);
+       $i--; # counteracts $i++
     }
     debug $ichunkstart, "semiparsed: ".join ' ', map { $_->{P} } @o;
     return @o;
@@ -197,14 +199,28 @@ sub analyse_chunk_core () {
     my ($x,$y);
     my $next_x = sub { $next_something->(\@xs, \@analysed_x, \$x, 'before'); };
     my $next_y = sub { $next_something->(\@ys, \@analysed_y, \$y, 'after' ); };
+    our @y_expect_suffix = ();
     for (;;) {
+       while (my $e = shift @y_expect_suffix) {
+           $next_y->();
+           $y->{E} eq $e
+               or die "suffix mismatch, expected $e got $y->{E}\n";
+       }
        last unless @xs or @ys;
        $next_x->();
        $next_y->();
        next if $x->{E} eq $y->{E};
+       if ($y->{E} eq '+'
+           and @ys >= 3
+           and $ys[0]{E} eq '('
+           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);
@@ -224,6 +240,10 @@ sub analyse_chunk_core () {
            die $string_changed if length $string_changed;
            next;
        }
+       if ($ye eq 'i_') {
+           die $string_changed if length $string_changed;
+           next;
+       }
        if ($ye eq 'f_') {
            my $fmt = $y->{V};
            die "no percent in _f string\n" unless $fmt =~ m{\%};
@@ -234,8 +254,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";
                }
@@ -267,14 +287,18 @@ sub analyse_chunk_core () {
                    }
                    $next_y->();
                    if (!$bras and
-                       (grep { $y->{E} eq $_ } qw( or xor and not ; : )
+                       (grep { $y->{E} eq $_ } qw( or xor and not ; :
+                                                   if unless while when )
+                        or $y->{E} eq ','
                         or $y->{T} eq 'ket'
                        )) {
+                       # lookahead shows close of containing scope
+                       # or lower precedence operator
                        unshift @ys, $y;
+                       pop @analysed_y;
                        last;
                    }
                    $xs =~ s{^\s+}{};
-                   #debug $ichunkstart, "TOKEN $y->{P}\n";
                    $exactly->($y->{E}, $y->{P});
                    if ($y->{T} eq 'bra' or $y->{E} eq '?') {
                        $bras++;