Fix evalCond in HTML/DOM renderers: handle scheme-style cond clauses
The platform evalCond helper (used by render-to-html and render-to-dom) only handled clojure-style (test body test body ...) but components use scheme-style ((test body) (test body) ...). This caused "Not callable: true" errors when rendering cond with nested clause pairs, breaking the test dashboard and any page using scheme-style cond. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -506,11 +506,23 @@
|
||||
return local;
|
||||
}
|
||||
function evalCond(clauses, env) {
|
||||
for (var i = 0; i < clauses.length; i += 2) {
|
||||
var test = clauses[i];
|
||||
if (isSym(test) && test.name === ":else") return clauses[i + 1];
|
||||
if (isKw(test) && test.name === "else") return clauses[i + 1];
|
||||
if (isSxTruthy(trampoline(evalExpr(test, env)))) return clauses[i + 1];
|
||||
// Detect scheme-style ((test body) ...) vs clojure-style (test body test body ...)
|
||||
var scheme = clauses.length > 0 && Array.isArray(clauses[0]) && clauses[0].length === 2;
|
||||
if (scheme) {
|
||||
for (var i = 0; i < clauses.length; i++) {
|
||||
var clause = clauses[i];
|
||||
var test = clause[0], body = clause[1];
|
||||
if (isSym(test) && (test.name === "else" || test.name === ":else")) return body;
|
||||
if (isKw(test) && test.name === "else") return body;
|
||||
if (isSxTruthy(trampoline(evalExpr(test, env)))) return body;
|
||||
}
|
||||
} else {
|
||||
for (var i = 0; i < clauses.length; i += 2) {
|
||||
var test = clauses[i];
|
||||
if (isSym(test) && test.name === ":else") return clauses[i + 1];
|
||||
if (isKw(test) && test.name === "else") return clauses[i + 1];
|
||||
if (isSxTruthy(trampoline(evalExpr(test, env)))) return clauses[i + 1];
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user