From f65d18f4f06e08cd2caa7743d2220e07f794cd79 Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Wed, 13 Jan 2021 16:42:30 -0500
Subject: Shorten hilex class names

---
 bin/make.l | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'bin/make.l')

diff --git a/bin/make.l b/bin/make.l
index 952c589d..eee150b9 100644
--- a/bin/make.l
+++ b/bin/make.l
@@ -22,7 +22,7 @@
 %}
 
 %s Assign
-%x Interp Shell
+%x Variable Shell
 
 ident [._[:alnum:]]+
 assign [+?:!]?=
@@ -55,7 +55,7 @@ operator [:!]|::
 }
 
 ^{ident}/[[:blank:]]*{assign} {
-	return Identifier;
+	return Ident;
 }
 
 {assign} {
@@ -73,24 +73,24 @@ operator [:!]|::
 
 ^"-"?include { return Macro; }
 
-{target} { return Identifier; }
+{target} { return Ident; }
 
 "#"([^\\\n]|"\\"[^\n]|"\\\n")* { return Comment; }
 
 <*>{
 	"$"("{"|"(") {
 		depth++;
-		BEGIN(Interp);
-		return Interpolation;
+		BEGIN(Variable);
+		return Subst;
 	}
-	"$". { return Interpolation; }
+	"$". { return Subst; }
 }
-<Interp>{
+<Variable>{
 	"}"|")" {
 		if (!--depth) BEGIN(pop);
-		return Interpolation;
+		return Subst;
 	}
-	[^${}()]+ { return Interpolation; }
+	[^${}()]+ { return Subst; }
 }
 
 .|\n { return Normal; }
-- 
cgit 1.4.1