Support 1-byte metavariables

1 files changed, 11 insertions, 6 deletions

diff --git a/lib/Core/ExecutionState.cpp b/lib/Core/ExecutionState.cpp
index 9a39d2dc..270a3e16 100644
--- a/lib/Core/ExecutionState.cpp
+++ b/lib/Core/ExecutionState.cpp
@@ -402,13 +402,18 @@ std::string extractMetaEnvVar(ref<Expr> e) {
   if (constant->isFalse()) // the else branch
     return extractMetaEnvVar(eq->right);
 
-  if (eq->right.get()->getKind() != Expr::Concat)
-    return "";
-  const auto concat = dyn_cast<ConcatExpr>(eq->right.get());
-  if (concat->getLeft().get()->getKind() != Expr::Read)
-    return "";
+  ReadExpr* read;
+  if (eq->right.get()->getKind() == Expr::Read) {
+    read = dyn_cast<ReadExpr>(eq->right.get());
+  } else {
+    if (eq->right.get()->getKind() != Expr::Concat)
+      return "";
+    const auto concat = dyn_cast<ConcatExpr>(eq->right.get());
+    if (concat->getLeft().get()->getKind() != Expr::Read)
+      return "";
+    read = dyn_cast<ReadExpr>(concat->getLeft().get());
+  }
 
-  const auto read = dyn_cast<ReadExpr>(concat->getLeft().get());
   const auto& name = read->updates.root->name;
   // string::starts_with requires C++20
   if (name.substr(0, 8) != "__choose")