From 0777d0bc51fcf7ecff67521cfde1448cf08947b2 Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Wed, 13 Jan 2021 16:50:59 -0500
Subject: Try to return make substitutions as single tokens

---
 bin/make.l | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/make.l b/bin/make.l
index eee150b9..a2d63e5b 100644
--- a/bin/make.l
+++ b/bin/make.l
@@ -78,6 +78,11 @@ operator [:!]|::
 "#"([^\\\n]|"\\"[^\n]|"\\\n")* { return Comment; }
 
 <*>{
+	"$"("{"|"(")/[^$] {
+		depth++;
+		BEGIN(Variable);
+		yymore();
+	}
 	"$"("{"|"(") {
 		depth++;
 		BEGIN(Variable);
@@ -86,7 +91,7 @@ operator [:!]|::
 	"$". { return Subst; }
 }
 <Variable>{
-	"}"|")" {
+	[^${}()]*"}"|")" {
 		if (!--depth) BEGIN(pop);
 		return Subst;
 	}
-- 
cgit 1.4.1

lect> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>dontfiles
</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/src/'>summary</a> <a href='/src/refs/?id=c18ac6145b77f55ff6c9d5877f0a74f62cff4a3a'>refs</a> <a class='active' href='/src/log/bin/fbatt.1?follow=1'>log</a> <a href='/src/tree/bin/fbatt.1?id=c18ac6145b77f55ff6c9d5877f0a74f62cff4a3a'>tree</a> <a href='/src/commit/bin/fbatt.1?id=c18ac6145b77f55ff6c9d5877f0a74f62cff4a3a&amp;follow=1'>commit</a> <a href='/src/diff/bin/fbatt.1?id=c18ac6145b77f55ff6c9d5877f0a74f62cff4a3a&amp;follow=1'>diff</a></td><td class='form'><form class='right' method='get' action='/src/log/bin/fbatt.1'>
<input type='hidden' name='id' value='c18ac6145b77f55ff6c9d5877f0a74f62cff4a3a'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/src/log/?id=c18ac6145b77f55ff6c9d5877f0a74f62cff4a3a&amp;follow=1'>root</a>/<a href='/src/log/bin?id=c18ac6145b77f55ff6c9d5877f0a74f62cff4a3a&amp;follow=1'>bin</a>/<a href='/src/log/bin/fbatt.1?id=c18ac6145b77f55ff6c9d5877f0a74f62cff4a3a&amp;follow=1'>fbatt.1</a> (<a href='/src/log/bin/fbatt.1?id=c18ac6145b77f55ff6c9d5877f0a74f62cff4a3a'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/src/log/bin/fbatt.1?id=c18ac6145b77f55ff6c9d5877f0a74f62cff4a3a&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-09-07 18:53:32 -0400'>2018-09-07</span></td><td><a href='/src/commit/bin/dtch.1?id=05fce0f84a9e837c16c18b6b1b7d288a66720cab&amp;follow=1'>Pass "command ..." as one string to Ar</a></td><td>June McEnroe