Syntax: Introduce &:changequote

Incompatible change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/README b/README
index 3390adff9d4e8bca1098b7e88b7f959004a987be..006b57f62eaeacb6cb0927dcfe67b3968121e15b 100644 (file)
--- a/README
+++ b/README
@@ -266,11 +266,11 @@ So pathname syntax is a subset of:
 &#     delete everything to end of line
        (useful if the RHS contains unrecognised & constructions)
 
-&!STUFF
+&:changequote STUFF
        changes the escape sequence from & to literally STUFF
        STUFF may be any series of of non-whitespace characters,
-       and is terminated by EOL or lwsp.  &!STUFF and the lwsp
-       are discarded.
+       and is terminated by EOL or lwsp.  The whole line is
+       discarded.
 
        After this, write STUFF instead of &, everywhere.
        The effect is global and lasts until the next setting.
@@ -278,9 +278,9 @@ So pathname syntax is a subset of:
        it back before using &:include.
 
        Notably
-               STUFFSTUFF      =>      STUFFSTUFF
-               \STUFF          =>      STUFF
-               STUFF!&         set escape back to &
+               STUFFSTUFF              => STUFFSTUFF
+               \STUFF                  => STUFF
+               STUFF:changequote &     => set escape back to &
 
 &TARGETS_things
        Handled specially.  If mentioned, declares that this

diff --git a/generate b/generate
index c17d5f7d70e3ae848b84a6df77498108a4b6e1f0..351926b80751b7f78ba4d95e3dbc7839fa6913ed 100755 (executable)
--- a/generate
+++ b/generate
@@ -176,9 +176,6 @@ sub process_input_mk ($$$$$$$$) {
            } elsif (s{^![ \t]+}{}) {
                o $_;
                $_ = '';
-           } elsif (s{^!(\S+)(?:[ \t]+|$)}{}) {
-               $$esclitr = $1;
-               $set_esc->();
            } else {
                die "bad escape $$esclitr$_ ";
            }
@@ -192,6 +189,9 @@ sub process_input_mk ($$$$$$$$) {
                                 $var_prefix, $targets,
                                 $subf, $esclitr, $1);
                o "\n";
+           } elsif (m#^changequote\s+(\S+)\s+$#) {
+               $$esclitr = $1;
+               $set_esc->();
            } else {
                die "unknown directive $_ ";
            }