Syntax: only some directives' RHS should be &-expanded

[subdirmk.git] / generate

diff --git a/generate b/generate
index ca54f944d13cf5011df25c77e4ca86f3c5af5821..e1efc06a95bf11186df3f92c2d10cabf5d5552d4 100755 (executable)
--- a/generate
+++ b/generate
@@ -137,33 +137,44 @@ sub process_input_mk ($$$$$$$$$) {
     }
     $input_files{$f}++;
 
+    my %srcdirmap = (
+                 '^' => "\$(top_srcdir)${dir_suffix}",
+                 '~' => "\$(top_srcdir)",
+                   );
     my %pfxmap = (
                  ''  => $dir_prefix,
-                 '^' => "\$(top_srcdir)${dir_suffix}/",
-                 '~' => "\$(top_srcdir)/",
                 );
+    $pfxmap{$_} = $srcdirmap{$_}.'/' foreach keys %srcdirmap;
 
     while (<$input>) {
-       if (s#^\s*$esc\:##) {
+       if (s#^\s*$esc\:changequote\s+(\S+)\s+$##) {
+           $$esclitr = $1;
+           $set_esc->();
+           next;
+       } elsif (s#^\s*$esc\:(?=(-?)include)##) {
            $buffering_output='';
+       } elsif (m#^\s*$esc\:([a-z][-0-9a-z_]*)#) {
+           die "unknown directive $1";
        }
        for (;;) {
-           unless (s{^(.*?)(\\)?(?=$esc)}{}) { o $_; last; }
+           unless (s{^(.*?)$esc}{}) { o $_; last; }
            o $1;
-           if ($2) { s#^$esc##; o $$esclitr; next; }
-           s{^$esc}{} or die "$_ ?";
-           if (s{^$esc}{}) { o "$$esclitr$$esclitr" }
+           if (s{^\\$esc}{}) { o "$$esclitr" }
+           elsif (s{^\\\$}{}) { o '$' }
+           elsif (s{^$esc}{}) { o "$$esclitr$$esclitr" }
            elsif (s{^TARGETS(?:_([0-9a-zA-Z_]+))?(?=\W)}{}) {
                my $t = $1 // 'all';
                o target_varname($var_prefix, $t);
                $targets->{$t} //= [ ];
            }
            elsif (m{^(?=$caps_re)}) { o $var_prefix }
+           elsif (s{^\$([A-Za-z]\w+)}{}) { o "\$(${var_prefix}$1)" }
            elsif (s{^([~^]?)(?=$lc_re)}{}) { o $pfxmap{$1} }
            elsif (s{^_}{}) { o $var_prefix }
-           elsif (s{^=_}{}) { o $var_prefix }
+           elsif (s{^=}{}) { o $var_prefix_name }
            elsif (s{^([~^]?)/}{}) { o $pfxmap{$1} }
-           elsif (s{^=/}{}) { o $dir_name }
+           elsif (s{^\.}{}) { o $dir_name }
+           elsif (s{^([~^])\.}{}) { o $srcdirmap{$1} }
            elsif (s{^([~^]?)(?=[ \t])}{}) {
                my $prefix = $pfxmap{$1} // die;
                my $after='';
@@ -189,11 +200,8 @@ sub process_input_mk ($$$$$$$$$) {
                                 $var_prefix, $var_prefix_name, $targets,
                                 $subf, $esclitr, $1);
                o "\n";
-           } elsif (m#^changequote\s+(\S+)\s+$#) {
-               $$esclitr = $1;
-               $set_esc->();
            } else {
-               die "unknown directive $_ ";
+               die "internal error buffering directive $_ ";
            }
        }
     }