i18n: i18n-diff-auditor: fix here doc regexp

[dgit.git] / i18n-diff-auditor

diff --git a/i18n-diff-auditor b/i18n-diff-auditor
index 8ec5e9f436ab3b5831d376096b76e49f6adccc8e..116b0f82fd314fe005ef3de278ba39bbeae922c5 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;
@@ -129,10 +138,10 @@ sub semiparse ($) {
            push @o, { T => 'heredoc', Q => $q, Delim => $d,
                       E => $&, P => "<<$q$d$q" };
            s{^
-                (             .* \n    )
-                ( (?: (?! $d) .* \n )* )
-                          $d     \n
-              }{ $1 }x or die "missing end of here doc $d\n";
+                (                 .* \n     )
+                ( (?: (?! $d \n ) .* \n )*? )
+                          $d         \n
+              }{ $1 }xe or die "missing end of here doc $d\n";
            $o[$#o]{V} = $2;
        } elsif (s{^ (["'])( (?: [^\\'"]
                                | \\ [^"']
@@ -144,9 +153,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 },
@@ -177,6 +186,7 @@ sub semiparse ($) {
        $i--; # counteracts $i++
     }
     debug $ichunkstart, "semiparsed: ".join ' ', map { $_->{P} } @o;
+    # debug $ichunkstart, "semiparsed V: ".join ' ', map { defined $_->{V} ? ">$_->{V}<" : '-' } @o;
     return @o;
 }          
 
@@ -210,12 +220,22 @@ 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 '('
            and is_trans($ys[1])) {
            $next_y->(); # (
-           $next_y->(); # __ f_
+           $next_y->(); # __ f_ i_
+           @y_expect_suffix = ')';
+       } elsif ($y->{E} eq '('
+           and @ys > 2
+           and is_trans($ys[0])
+           and @analysed_y
+           and (grep { $_ eq $analysed_y[-1] } (qw( => [ { ? : . ),
+                                                '(', ',') )) {
+           $next_y->(); # __ f_ i_
            @y_expect_suffix = ')';
        }
        my $string_changed;
@@ -223,7 +243,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{(?<!\\) [\$\@]};
@@ -254,8 +274,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: ..".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";
                }
@@ -265,6 +285,8 @@ sub analyse_chunk_core () {
                if ($fmt !~ m{\%[^\%]}) {
                    $exactly->($fmt, '(tail)');
                    $fmt = '';
+                   die "text deleted from end of string: ".qp($xs)."\n"
+                       if length $xs;
                    last;
                }
                $exactly->($`, '(literal)');
@@ -307,7 +329,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++;