2 files changed, 20 insertions, 16 deletions
diff --git a/src/lang/js-lang/builtin/builtin.ts b/src/lang/js-lang/builtin/builtin.ts
index ed279f6..bc40794 100644
--- a/src/lang/js-lang/builtin/builtin.ts
+++ b/src/lang/js-lang/builtin/builtin.ts
@@ -61,10 +61,12 @@ export const V_BUILTIN_Eq: BUILTIN = (args) => {
     }
 
     if (last === firstLast) {
+      last = arg;
       continue;
     }
 
     if (arg === last) {
+      last = arg;
       continue;
     }
 
@@ -74,20 +76,6 @@ export const V_BUILTIN_Eq: BUILTIN = (args) => {
   return true;
 };
 
-export const V_BUILTIN_IfElse: BUILTIN = (args) => {
-  if (args.length !== 3) {
-    throw new Error(`Invalid args for "if": ${JSON.stringify(args)}`);
-  }
-
-  const [cond, trueVal, falseVal] = args;
-
-  if (typeof cond !== "boolean") {
-    throw new Error(`Condition value ${JSON.stringify(cond)} is not a boolean`);
-  }
-
-  return cond ? trueVal : falseVal;
-};
-
 export const nameToBUILTIN: Record<string, BUILTIN> = {
   arr: V_BUILTIN_Arr,
   tostring: V_BUILTIN_ToString,
@@ -95,5 +83,4 @@ export const nameToBUILTIN: Record<string, BUILTIN> = {
   sub: V_BUILTIN_Sub,
   mul: V_BUILTIN_Mul,
   eq: V_BUILTIN_Eq,
-  "?": V_BUILTIN_IfElse,
 };
diff --git a/src/lang/js-lang/builtin/sbuiltin.ts b/src/lang/js-lang/builtin/sbuiltin.ts
index e5bc6ab..663c2f9 100644
--- a/src/lang/js-lang/builtin/sbuiltin.ts
+++ b/src/lang/js-lang/builtin/sbuiltin.ts
@@ -1,4 +1,4 @@
-import { callFn, getEvaluatedChildren } from "../core/eval";
+import { _evaluate, callFn, getEvaluatedChildren } from "../core/eval";
 import { ASTNode, FnPrim, StackFrame } from "../../ts-lang";
 
 type SBUILTIN = (node: ASTNode, frame: StackFrame) => any;
@@ -40,7 +40,24 @@ export const V_SBUILTIN_Map: SBUILTIN = (node, frame) => {
   return values.map((v, i) => callFn(fn, [v, i], frame));
 };
 
+export const V_SBUILTIN_IfElse: SBUILTIN = (node, frame) => {
+  const children = node.children;
+
+  if (children.length !== 3) {
+    throw new Error(`Invalid args for "if": ${JSON.stringify(children)}`);
+  }
+
+  const cond = _evaluate(children[0], frame);
+
+  if (typeof cond !== "boolean") {
+    throw new Error(`Condition value ${JSON.stringify(cond)} is not a boolean`);
+  }
+
+  return cond ? _evaluate(children[1], frame) : _evaluate(children[2], frame);
+};
+
 export const nameToSBUILTIN: Record<string, SBUILTIN> = {
   call: V_SBUILTIN_Call,
   map: V_SBUILTIN_Map,
+  "?": V_SBUILTIN_IfElse,
 };