From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 9 Dec 2019 16:31:59 +0000 (+0000)
Subject: Syntax: Provide &$VARIABLE
X-Git-Tag: subdirmk/0.3~99
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=commitdiff_plain;h=f99c7def1e8afb27b0df6c605ff6847f676d6bfe;hp=703f1daa1f296a5fad36d96db2de631cd7a4d50e

Syntax: Provide &$VARIABLE

Testing is done by the doctests.

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

diff --git a/README b/README
index 4da4091..6bc8e82 100644
--- a/README
+++ b/README
@@ -251,6 +251,9 @@ So pathname syntax is a subset of:
 &\&		=>	&		general escaping mechanism
 &\$		=>	$
 
+&$VARIABLE	=>	$(sub_dir_VARIABLE)	or $(TOP_VARIABLE)
+	VARIABLE is ASCII starting with a letter and matching \w+
+
 & thing thing... &
 &^ thing thing... &
 &~ thing thing... &
diff --git a/generate b/generate
index dd6df29..e7da435 100755
--- a/generate
+++ b/generate
@@ -162,6 +162,7 @@ sub process_input_mk ($$$$$$$$$) {
 		$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_name }