From bf1602d0adf9df0f6317faa64a87b282d0725722 Mon Sep 17 00:00:00 2001
From: Karim <k.nassar@lynxtrading.com>
Date: Tue, 6 Jan 2026 18:21:29 +0100
Subject: [PATCH] fix(eval) - Eval symbol as quoted if query context is not
 null

---
 core/eval.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/core/eval.c b/core/eval.c
index c070c073..d102fbdd 100644
--- a/core/eval.c
+++ b/core/eval.c
@@ -825,15 +825,19 @@ static obj_p eval_lambda(obj_p fn, obj_p *args, i64_t len, i64_t id) {
 // Evaluate symbol lookup
 static inline obj_p eval_sym(obj_p sym) {
     obj_p *val;
+    vm_p vm = VM;
 
     if (sym->attrs & ATTR_QUOTED)
         return symboli64(sym->i64);
 
     val = resolve(sym->i64);
-    if (val == NULL)
-        return unwrap(err_value(sym->i64), (i64_t)sym);
+    if (val != NULL)
+        return clone_obj(*val);
+    
+    if (vm != NULL && vm->query_ctx != NULL)
+        return symboli64(sym->i64);
 
-    return clone_obj(*val);
+    return unwrap(err_value(sym->i64), (i64_t)sym);
 }
 
 // Evaluate list (function call)