3 files changed, 68 insertions, 33 deletions
diff --git a/src/lang/builtin/builtin.ts b/src/lang/builtin/builtin.ts
new file mode 100644
index 0000000..a289867
--- /dev/null
+++ b/src/lang/builtin/builtin.ts
@@ -0,0 +1,33 @@
+import { FnError } from ".";
+import {
+  AddNumbers,
+  AddStrings,
+  Multiply,
+  ToString,
+  UnarrayIfOnlyHead,
+} from "../util";
+
+export type BUILTIN_Arr<Args extends readonly any[]> = Args;
+
+export type BUILTIN_ToString<Args extends readonly any[]> = ToString<
+  UnarrayIfOnlyHead<{
+    [Idx in keyof Args]: ToString<Args[Idx]>;
+  }>
+>;
+
+export type BUILTIN_Add<Args extends readonly any[]> =
+  Args extends readonly string[]
+    ? AddStrings<Args>
+    : Args extends readonly number[]
+    ? AddNumbers<Args>
+    : FnError<`Cannot add operands ${ToString<Args>}`>;
+
+export type BUILTIN_Mul<Args extends readonly any[]> = Args extends [
+  infer A,
+  infer B,
+  infer C
+]
+  ? FnError<`Can only multiply [number, number], but got ${ToString<Args>}`>
+  : Args extends [infer M extends number, infer N extends number]
+  ? Multiply<M, N>
+  : FnError<`Can only multiply [number, number], but got ${ToString<Args>}`>;
diff --git a/src/lang/builtin/index.ts b/src/lang/builtin/index.ts
index 373f54a..de2bee3 100644
--- a/src/lang/builtin/index.ts
+++ b/src/lang/builtin/index.ts
@@ -1,34 +1,3 @@
-import {
-  AddNumbers,
-  AddStrings,
-  Multiply,
-  ToString,
-  UnarrayIfOnlyHead,
-} from "../util";
-
 export type FnError<T extends string> = `Function execution error: ${T}`;
-
-export type BUILTIN_Arr<Args extends readonly any[]> = Args;
-
-export type BUILTIN_ToString<Args extends readonly any[]> = ToString<
-  UnarrayIfOnlyHead<{
-    [Idx in keyof Args]: ToString<Args[Idx]>;
-  }>
->;
-
-export type BUILTIN_Add<Args extends readonly any[]> =
-  Args extends readonly string[]
-    ? AddStrings<Args>
-    : Args extends readonly number[]
-    ? AddNumbers<Args>
-    : FnError<`Cannot add operands ${ToString<Args>}`>;
-
-export type BUILTIN_Mul<Args extends readonly any[]> = Args extends [
-  infer A,
-  infer B,
-  infer C
-]
-  ? FnError<`Can only multiply [number, number], but got ${ToString<Args>}`>
-  : Args extends [infer M extends number, infer N extends number]
-  ? Multiply<M, N>
-  : FnError<`Can only multiply [number, number], but got ${ToString<Args>}`>;
+export * from "./builtin";
+export * from "./sbuiltin";
diff --git a/src/lang/builtin/sbuiltin.ts b/src/lang/builtin/sbuiltin.ts
new file mode 100644
index 0000000..704e688
--- /dev/null
+++ b/src/lang/builtin/sbuiltin.ts
@@ -0,0 +1,33 @@
+import { ASTNode } from "../core/common";
+import {
+  CallFn,
+  FnPrim,
+  GetEvaluatedChildren,
+  StackFrame,
+  EvalError,
+} from "../core/eval";
+import { ToString } from "../util";
+
+export type SBUILTIN_Call<
+  Node extends ASTNode,
+  Frame extends StackFrame
+> = GetEvaluatedChildren<Node, Frame> extends [
+  infer Fn extends FnPrim,
+  ...infer Values extends readonly any[]
+]
+  ? CallFn<Fn, Values, Frame>
+  : EvalError<`Invalid params for function call: ${ToString<
+      GetEvaluatedChildren<Node, Frame>
+    >}`>;
+
+export type SBUILTIN_Map<
+  Node extends ASTNode,
+  Frame extends StackFrame
+> = GetEvaluatedChildren<Node, Frame> extends [
+  infer Arr extends readonly any[],
+  infer Fn extends FnPrim
+]
+  ? { [Idx in keyof Arr]: CallFn<Fn, [Arr[Idx]], Frame> }
+  : EvalError<`Invalid params for map: ${ToString<
+      GetEvaluatedChildren<Node, Frame>
+    >}`>;