From 4986f63ae1601cce356b2c6223f36a9110b23c34 Mon Sep 17 00:00:00 2001
From: Andy C <andy@oilshell.org>
Date: Mon, 20 Jan 2025 11:54:55 -0500
Subject: [PATCH] As in the unquoted case, we now now parse it and reject it at
 runtime.

This is issue #2234.
---
 doc/htm8.md             |  4 ++++
 osh/word_parse.py       |  3 +++
 spec/zsh-idioms.test.sh | 22 +++++++++++++++++-----
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/doc/htm8.md b/doc/htm8.md
index 924b6b6592..a6418f5099 100644
--- a/doc/htm8.md
+++ b/doc/htm8.md
@@ -144,6 +144,10 @@ This makes lexing the top-level structure easier.
 
 - HTM8 tags must be balanced to convert them to XML
 
+- `<script></SCRIPT>` isn't matched
+  - the begin and end tags must match exactly, like `<SCRipt></SCRipt>`
+  - likewise for `<style>`
+
 - NUL bytes aren't allowed - currently due to re2c sentinel.  Two options:
   1. Make it a syntax error - like JSON8
   1. we could have a reprocessing pass to convert it to the Unicode replacement
diff --git a/osh/word_parse.py b/osh/word_parse.py
index f0f77075e1..29dd012c25 100644
--- a/osh/word_parse.py
+++ b/osh/word_parse.py
@@ -777,6 +777,9 @@ def _ReadDoubleQuotedLeftParts(self):
         if self.token_type == Id.Left_DollarBracket:
             return self._ReadExprSub(lex_mode_e.DQ)
 
+        if self.token_type == Id.Left_DollarBraceZsh:
+            return self._ReadZshVarSub(self.cur_token)
+
         raise AssertionError(self.cur_token)
 
     def _ReadYshSingleQuoted(self, left_id):
diff --git a/spec/zsh-idioms.test.sh b/spec/zsh-idioms.test.sh
index e40f74368b..0b1f1a97d1 100644
--- a/spec/zsh-idioms.test.sh
+++ b/spec/zsh-idioms.test.sh
@@ -26,20 +26,32 @@ fi
 
 #### zsh var sub is rejected at runtime
 
-echo z ${(m)foo} z
+eval 'echo z ${(m)foo} z'
+echo status=$?
+
+eval 'echo ${x:-${(m)foo}}'
+echo status=$?
+
+# double quoted
+eval 'echo "${(m)foo}"'
 echo status=$?
 
-## status: 1
 ## STDOUT:
+status=1
+status=1
+status=1
 ## END
 
 ## OK zsh status: 0
 ## OK zsh STDOUT:
 z z
+status=0
+
+status=0
+
 status=0
 ## END
 
-## OK bash status: 0
-## OK bash STDOUT:
-status=1
+## BUG mksh status: 1
+## BUG mksh STDOUT:
 ## END