chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i18n: i18n-diff-auditor: more debugging improvement
[dgit.git]
/
i18n-diff-auditor
diff --git
a/i18n-diff-auditor
b/i18n-diff-auditor
index b85b853687e3ad95065615bc8f702d49f3ddab2b..a92db5e1172ed3822210351bfdf3d9863fa86b7c 100755
(executable)
--- a/
i18n-diff-auditor
+++ b/
i18n-diff-auditor
@@
-132,7
+132,7
@@
sub semiparse ($) {
( .* \n )
( (?: (?! $d) .* \n )* )
$d \n
( .* \n )
( (?: (?! $d) .* \n )* )
$d \n
- }{ $1 }x or die "missing end of here doc $d\n";
+ }{ $1 }x
e
or die "missing end of here doc $d\n";
$o[$#o]{V} = $2;
} elsif (s{^ (["'])( (?: [^\\'"]
| \\ [^"']
$o[$#o]{V} = $2;
} elsif (s{^ (["'])( (?: [^\\'"]
| \\ [^"']
@@
-177,6
+177,7
@@
sub semiparse ($) {
$i--; # counteracts $i++
}
debug $ichunkstart, "semiparsed: ".join ' ', map { $_->{P} } @o;
$i--; # counteracts $i++
}
debug $ichunkstart, "semiparsed: ".join ' ', map { $_->{P} } @o;
+ # debug $ichunkstart, "semiparsed V: ".join ' ', map { defined $_->{V} ? ">$_->{V}<" : '-' } @o;
return @o;
}
return @o;
}
@@
-217,7
+218,15
@@
sub analyse_chunk_core () {
and $ys[0]{E} eq '('
and is_trans($ys[1])) {
$next_y->(); # (
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;
@y_expect_suffix = ')';
}
my $string_changed;
@@
-225,7
+234,7
@@
sub analyse_chunk_core () {
if (is_trans($y)) {
$next_y->();
die "__ on non-string $y->{P}\n" unless is_string($y);
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{(?<!\\) [\$\@]};
if ($y->{Q} ne "'") {
die "var subst in new string\n"
if $y->{V} =~ m{(?<!\\) [\$\@]};
@@
-256,8
+265,10
@@
sub analyse_chunk_core () {
my ($lit, $what) = @_;
my $xl = substr($xs, 0, length($lit));
if ($xl ne $lit) {
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";
+ my $xsp = $xs; $xsp =~ s/\n/\\n/g;
+ my $litp = $lit; $litp =~ s/\n/\\n/g;
+ debug $ichunkstart, "not exactly x: ..\"$xsp\"";
+ debug $ichunkstart, "not exactly y: '$litp'";
my $next = @ys ? $ys[0]{P} : '(end)';
die "string contents mismatch near $what before $next\n";
}
my $next = @ys ? $ys[0]{P} : '(end)';
die "string contents mismatch near $what before $next\n";
}
@@
-267,6
+278,7
@@
sub analyse_chunk_core () {
if ($fmt !~ m{\%[^\%]}) {
$exactly->($fmt, '(tail)');
$fmt = '';
if ($fmt !~ m{\%[^\%]}) {
$exactly->($fmt, '(tail)');
$fmt = '';
+ die "text deleted from end of string\n" if length $xs;
last;
}
$exactly->($`, '(literal)');
last;
}
$exactly->($`, '(literal)');