chiark / gitweb /
Warnings: Track basic $-references
[subdirmk.git] / generate
index 03aabb056787e4e98a1d6d6f6167ec32b24620ec..d8183d07dd9356e005d90a8160038dae4b9f3047 100755 (executable)
--- a/generate
+++ b/generate
@@ -245,6 +245,10 @@ sub process_input_mk ($$$$) {
     };
 
     while (<$input>) {
+       if (m#^\s*($esc)?(\w+)\s*(?:=|\+=|\?=|:=)# ||
+           m#^\s*(?:$esc\:macro|define)\s+($esc)?(\S+)\s#) {
+           $note_varref->($2,!!$1);
+       }
        if (s#^\s*$esc\:changequote\s+(\S+)\s+$##) {
            $$esclitr = $1;
            $set_esc->();
@@ -266,8 +270,8 @@ sub process_input_mk ($$$$) {
            err 'cannot $-double &-processed RHS of directive'
                if $ddbl && defined $buffering_output;
            unless ($nest[0][0] eq 'eval'
-                   ? s{^(.*?)($esc|[{}])}{}
-                   : s{^(.*?)($esc)}{}) { od $_; last; }
+                   ? s{^(.*?)($esc|\$|[{}])}{}
+                   : s{^(.*?)($esc|\$)}{}) { od $_; last; }
            od $1;
            if ($2 eq '{') {
                od $2;
@@ -279,6 +283,14 @@ sub process_input_mk ($$$$) {
                $pop_nest->('eval');
                od '}';
                next;
+           } elsif ($2 eq '$') {
+               od $2;
+               if (s{^\$}{}) { od $&; }
+               elsif (m{^\(($esc)?([^()\$]+)\)} ||
+                      m{^\{($esc)?([^{}\$]+)\}}) {
+                   $note_varref->($2,!!$1);
+               }
+               next;
            }
            if (s{^\\$esc}{}) { od "$$esclitr" }
            elsif (s{^\\\$}{}) { oud '$' }