test/filter: Test &${ ... } rather better

[subdirmk.git] / generate

diff --git a/generate b/generate
index 4014471a43019cec4e683d1d3ab60e4b82e6edc8..f5c416db226dd22b1c2b7e434c09f3516fc1b2b2 100755 (executable)
--- a/generate
+++ b/generate
@@ -216,6 +216,7 @@ sub process_input_mk ($$$$) {
 
     local $ddbl;
     my @nest = (['']);
+    my $evalcall_brackets;
 
     my $push_nest = sub {
        my ($nk, $nndbl, $what) = @_;
@@ -255,12 +256,14 @@ sub process_input_mk ($$$$) {
                    : s{^(.*?)($esc)}{}) { od $_; last; }
            od $1;
            if ($2 eq '{') {
-               $ddbl++;
+               od $2;
+               $evalcall_brackets++;
                next;
            } elsif ($2 eq '}') {
-               next if --$ddbl;
+               od $2;
+               next if --$evalcall_brackets;
                $pop_nest->('eval');
-               od '}}';
+               od '}';
                next;
            }
            if (s{^\\$esc}{}) { od "$$esclitr" }
@@ -282,6 +285,7 @@ sub process_input_mk ($$$$) {
            elsif (s{^\$\{}{}) {
                err 'macro invocation cannot be re-$-doubled' if $ddbl;
                od '${eval ${call ';
+               $evalcall_brackets = 1;
                $push_nest->('eval',1, '&${...}');
            } elsif (s{^([~^]?)(?=[ \t])}{}) {
                my $prefix = $pfxmap{$1} // die "internal error ($1?)";