From 9298fe810211ea3cd5bf6fdbb76b115f28ae2491 Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Fri, 10 Jun 2022 21:54:10 -0400
Subject: Handle subshells (and functions) inside substitutions
---
bin/sh.l | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
(limited to 'bin')
diff --git a/bin/sh.l b/bin/sh.l
index f26e3feb..8f0f7723 100644
--- a/bin/sh.l
+++ b/bin/sh.l
@@ -36,7 +36,7 @@ static int pop(void) {
}
%}
-%s Param Command Arith Backtick
+%s Param Command Arith Backtick Subshell
%x DQuote HereDocDel HereDoc HereDocLit
word [[:alnum:]_.-]+
@@ -51,7 +51,7 @@ reserved [!{}]|else|do|elif|for|done|fi|then|until|while|if|case|esac
"\\". { return Escape; }
-<INITIAL,DQuote,HereDoc,Param,Command,Arith>{
+<INITIAL,DQuote,HereDoc,Param,Command,Arith,Subshell>{
"$"[*@#?$!0-9-] |
"$"[_[:alpha:][_[:alnum:]]* |
"${"[#]?{param}"}" {
@@ -73,6 +73,10 @@ reserved [!{}]|else|do|elif|for|done|fi|then|until|while|if|case|esac
BEGIN(push(Backtick));
return Subst;
}
+ "(" {
+ BEGIN(push(Subshell));
+ return Normal;
+ }
}
<Param>"}" |
<Command>")" |
@@ -81,6 +85,10 @@ reserved [!{}]|else|do|elif|for|done|fi|then|until|while|if|case|esac
BEGIN(pop());
return Subst;
}
+<Subshell>")" {
+ BEGIN(pop());
+ return Normal;
+}
"\n" {
first = true;
--
cgit 1.4.1