X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=generate;h=77469ac9ec6e883a6a8233963e158e0a246fb096;hb=579c775ab875b89de0ecebad4eab8d8987e11a24;hp=209a1f3e6a1f19f04593cf46ff60bab84172d23e;hpb=20e5ccd063565c2207066d4ed3b48be49143194b;p=secnet.git

diff --git a/generate b/generate
index 209a1f3..77469ac 100755
--- a/generate
+++ b/generate
@@ -235,7 +235,7 @@ sub process_input_mk ($$$$) {
 	    $set_esc->();
 	    next;
 	} elsif (s#^\s*$esc\:endm\s+$##) {
-	    $pop_nest->('Macro');
+	    $pop_nest->('macro');
 	    od "endef\n";
 	    next;
 	} elsif (s#^\s*$esc\:(?=(-?)include|macro)##) {
@@ -296,7 +296,8 @@ sub process_input_mk ($$$$) {
 		od $_;
 		$_ = '';
 	    } else {
-		err "bad &-escape \`$$esclitr$_'";
+		m{^.{0,5}};
+		err "bad &-escape \`$$esclitr$&'";
 	    }
 	}
 	if (defined $buffering_output) {
@@ -308,7 +309,7 @@ sub process_input_mk ($$$$) {
 		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 ($_?)";
 	    }