From: Ian Jackson Date: Thu, 26 Dec 2019 01:33:01 +0000 (+0000) Subject: generate: Nested scope: Change `Eval' to `eval' X-Git-Tag: subdirmk/0.3~51 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=commitdiff_plain;h=25f6a903cdc66a97dd3d2092aafe16800c450a53 generate: Nested scope: Change `Eval' to `eval' This is the nesting kind name. But it also appears in error messages where it ought not to be capitalised. Signed-off-by: Ian Jackson --- diff --git a/generate b/generate index 77469ac..747a79b 100755 --- a/generate +++ b/generate @@ -250,7 +250,7 @@ sub process_input_mk ($$$$) { for (;;) { err 'cannot $-double &-processed RHS of directive' if $ddbl && defined $buffering_output; - unless ($nest[0][0] eq 'Eval' + unless ($nest[0][0] eq 'eval' ? s{^(.*?)($esc|[{}])}{} : s{^(.*?)($esc)}{}) { od $_; last; } od $1; @@ -259,7 +259,7 @@ sub process_input_mk ($$$$) { next; } elsif ($2 eq '}') { next if --$ddbl; - $pop_nest->('Eval'); + $pop_nest->('eval'); od '}}'; next; } @@ -282,7 +282,7 @@ sub process_input_mk ($$$$) { elsif (s{^\$\{}{}) { err 'macro invocation cannot be re-$-doubled' if $ddbl; od '${eval ${call '; - $push_nest->('Eval',1, '&${...}'); + $push_nest->('eval',1, '&${...}'); } elsif (s{^([~^]?)(?=[ \t])}{}) { my $prefix = $pfxmap{$1} // die "internal error ($1?)"; my $after='';