chiark
/
gitweb
/
~ian
/
subdirmk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
generate: Make @nest always be nonempty
[subdirmk.git]
/
generate
diff --git
a/generate
b/generate
index 52a0ec8262522076de57b00cbe6013dd04a8d59d..4bc1e74eb712a3a799bb9ee19912189d58b91e08 100755
(executable)
--- a/
generate
+++ b/
generate
@@
-180,7
+180,7
@@
sub process_input_mk ($$$$) {
$pfxmap{$_} = $srcdirmap{$_}.'/' foreach keys %srcdirmap;
local $ddbl;
$pfxmap{$_} = $srcdirmap{$_}.'/' foreach keys %srcdirmap;
local $ddbl;
- my @nest;
+ my @nest
= ([''])
;
my $push_nest = sub {
my ($nk, $nndbl) = @_;
my $push_nest = sub {
my ($nk, $nndbl) = @_;
@@
-213,7
+213,7
@@
sub process_input_mk ($$$$) {
}
for (;;) {
die if $ddbl && defined $buffering_output;
}
for (;;) {
die if $ddbl && defined $buffering_output;
- unless (
@nest &&
$nest[0][0] eq 'Eval'
+ unless ($nest[0][0] eq 'Eval'
? s{^(.*?)($esc|[{}])}{}
: s{^(.*?)($esc)}{}) { od $_; last; }
od $1;
? s{^(.*?)($esc|[{}])}{}
: s{^(.*?)($esc)}{}) { od $_; last; }
od $1;
@@
-277,6
+277,7
@@
sub process_input_mk ($$$$) {
}
}
}
}
}
}
+ die "unclosed $nest[0][0]" if $nest[0][0];
$input->error and die "read $f: $!\n";
close $input or die "close $f: $!\n";
}
$input->error and die "read $f: $!\n";
close $input or die "close $f: $!\n";
}