From e86c68dffaffee6ba44d98ba06761245f6d5b670 Mon Sep 17 00:00:00 2001 From: Kai Stevenson Date: Tue, 4 Nov 2025 20:53:37 -0800 Subject: add branching --- src/lang/js-lang/builtin/builtin.ts | 15 +++++++++++++++ src/lang/ts-lang/builtin/builtin.ts | 15 +++++++++++++++ src/lang/ts-lang/core/eval.ts | 3 +++ 3 files changed, 33 insertions(+) (limited to 'src/lang') diff --git a/src/lang/js-lang/builtin/builtin.ts b/src/lang/js-lang/builtin/builtin.ts index dde91b6..d54c439 100644 --- a/src/lang/js-lang/builtin/builtin.ts +++ b/src/lang/js-lang/builtin/builtin.ts @@ -31,9 +31,24 @@ export const V_BUILTIN_Mul: BUILTIN = (args) => { ); }; +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 = { arr: V_BUILTIN_Arr, tostring: V_BUILTIN_ToString, add: V_BUILTIN_Add, mul: V_BUILTIN_Mul, + "?": V_BUILTIN_IfElse, }; diff --git a/src/lang/ts-lang/builtin/builtin.ts b/src/lang/ts-lang/builtin/builtin.ts index a289867..ed6b0a3 100644 --- a/src/lang/ts-lang/builtin/builtin.ts +++ b/src/lang/ts-lang/builtin/builtin.ts @@ -31,3 +31,18 @@ export type BUILTIN_Mul = Args extends [ : Args extends [infer M extends number, infer N extends number] ? Multiply : FnError<`Can only multiply [number, number], but got ${ToString}`>; + +export type BUILTIN_IfElse = Args extends [ + infer A, + infer B, + infer C, + infer D +] + ? FnError<`Invalid args for "if": ${ToString}`> + : Args extends [infer Cond, infer TrueVal, infer FalseVal] + ? Cond extends true + ? TrueVal + : Cond extends false + ? FalseVal + : FnError<`Condition value ${ToString} is not a boolean`> + : FnError<`Invalid args for "if": ${ToString}`>; diff --git a/src/lang/ts-lang/core/eval.ts b/src/lang/ts-lang/core/eval.ts index 5f22299..b2fecaa 100644 --- a/src/lang/ts-lang/core/eval.ts +++ b/src/lang/ts-lang/core/eval.ts @@ -1,6 +1,7 @@ import { BUILTIN_Add, BUILTIN_Arr, + BUILTIN_IfElse, BUILTIN_Mul, BUILTIN_ToString, SBUILTIN_Call, @@ -26,6 +27,8 @@ export type MapBuiltins< ? BUILTIN_Add : Node["name"] extends "mul" ? BUILTIN_Mul + : Node["name"] extends "?" + ? BUILTIN_IfElse : SENTINEL_NO_BUILTIN : never; -- cgit v1.2.3-70-g09d2