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: Nested scope: Change `Eval' to `eval'
[subdirmk.git]
/
generate
diff --git
a/generate
b/generate
index 62e915fb35df1065f466a1c25b5f4312b52bc726..747a79b8441a740dedeb641886849111c5077c27 100755
(executable)
--- a/
generate
+++ b/
generate
@@
-235,7
+235,7
@@
sub process_input_mk ($$$$) {
$set_esc->();
next;
} elsif (s#^\s*$esc\:endm\s+$##) {
$set_esc->();
next;
} elsif (s#^\s*$esc\:endm\s+$##) {
- $pop_nest->('
M
acro');
+ $pop_nest->('
m
acro');
od "endef\n";
next;
} elsif (s#^\s*$esc\:(?=(-?)include|macro)##) {
od "endef\n";
next;
} elsif (s#^\s*$esc\:(?=(-?)include|macro)##) {
@@
-250,7
+250,7
@@
sub process_input_mk ($$$$) {
for (;;) {
err 'cannot $-double &-processed RHS of directive'
if $ddbl && defined $buffering_output;
for (;;) {
err 'cannot $-double &-processed RHS of directive'
if $ddbl && defined $buffering_output;
- unless ($nest[0][0] eq '
E
val'
+ unless ($nest[0][0] eq '
e
val'
? s{^(.*?)($esc|[{}])}{}
: s{^(.*?)($esc)}{}) { od $_; last; }
od $1;
? s{^(.*?)($esc|[{}])}{}
: s{^(.*?)($esc)}{}) { od $_; last; }
od $1;
@@
-259,7
+259,7
@@
sub process_input_mk ($$$$) {
next;
} elsif ($2 eq '}') {
next if --$ddbl;
next;
} elsif ($2 eq '}') {
next if --$ddbl;
- $pop_nest->('
E
val');
+ $pop_nest->('
e
val');
od '}}';
next;
}
od '}}';
next;
}
@@
-282,7
+282,7
@@
sub process_input_mk ($$$$) {
elsif (s{^\$\{}{}) {
err 'macro invocation cannot be re-$-doubled' if $ddbl;
od '${eval ${call ';
elsif (s{^\$\{}{}) {
err 'macro invocation cannot be re-$-doubled' if $ddbl;
od '${eval ${call ';
- $push_nest->('
E
val',1, '&${...}');
+ $push_nest->('
e
val',1, '&${...}');
} elsif (s{^([~^]?)(?=[ \t])}{}) {
my $prefix = $pfxmap{$1} // die "internal error ($1?)";
my $after='';
} elsif (s{^([~^]?)(?=[ \t])}{}) {
my $prefix = $pfxmap{$1} // die "internal error ($1?)";
my $after='';
@@
-309,7
+309,7
@@
sub process_input_mk ($$$$) {
od "\n";
} elsif (m#^macro\s+(\S+)\s+$#) {
od "define $1\n";
od "\n";
} elsif (m#^macro\s+(\S+)\s+$#) {
od "define $1\n";
- $push_nest->('
Macro', 1
);
+ $push_nest->('
macro', 1, '&:macro'
);
} else {
die "internal error ($_?)";
}
} else {
die "internal error ($_?)";
}