builtin function aliases, MID->SUBSTRING

BalaM314 · Aug 13, 2024 · 6aca7e0 · 6aca7e0
1 parent 59c8b50
commit 6aca7e0
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 16 deletions.
diff --git a/build/builtin_functions.d.ts b/build/builtin_functions.d.ts
@@ -14,6 +14,7 @@ type PreprocesssedBuiltinFunctionData<TArgs extends BuiltinFunctionArg[], TRetur
     args: TArgs;
     returnType: TReturn;
     impl(this: Runtime, ...args: FunctionArgs<TArgs>): PrimitiveVariableTypeMapping<TReturn>;
+    aliases?: string[];
 };
 export declare const getBuiltinFunctions: () => Record<keyof typeof preprocessedBuiltinFunctions, BuiltinFunctionData> & Partial<Record<string, BuiltinFunctionData>>;
 export declare const preprocessedBuiltinFunctions: {

diff --git a/build/builtin_functions.js b/build/builtin_functions.js
@@ -4,17 +4,24 @@ function fn(data) {
     return data;
 }
 let builtinFunctions;
-export const getBuiltinFunctions = () => builtinFunctions ?? (builtinFunctions = ((d) => Object.fromEntries(Object.entries(d).map(([name, data]) => [name, {
-        args: new Map(data.args.map(([name, type]) => [name, {
-                passMode: "reference",
-                type: (Array.isArray(type) ? type : [type]).map(t => Array.isArray(t)
-                    ? new ArrayVariableType(null, null, t[0] == "ANY" ? null : PrimitiveVariableType.get(t[0]), [-1, -1])
-                    : PrimitiveVariableType.get(t))
-            }])),
-        name,
-        impl: data.impl,
-        returnType: PrimitiveVariableType.get(data.returnType)
-    }])))(preprocessedBuiltinFunctions));
+export const getBuiltinFunctions = () => builtinFunctions ?? (builtinFunctions = ((d) => {
+    const obj = Object.fromEntries(Object.entries(d).map(([name, data]) => [name, {
+            args: new Map(data.args.map(([name, type]) => [name, {
+                    passMode: "reference",
+                    type: (Array.isArray(type) ? type : [type]).map(t => Array.isArray(t)
+                        ? new ArrayVariableType(null, null, t[0] == "ANY" ? null : PrimitiveVariableType.get(t[0]), [-1, -1])
+                        : PrimitiveVariableType.get(t)),
+                }])),
+            aliases: data.aliases ?? [],
+            name,
+            impl: data.impl,
+            returnType: PrimitiveVariableType.get(data.returnType)
+        }]));
+    Object.values(obj).filter(v => v.aliases && v.aliases.length > 0).forEach(v => {
+        v.aliases.forEach(alias => obj[alias] = v);
+    });
+    return obj;
+})(preprocessedBuiltinFunctions));
 export const preprocessedBuiltinFunctions = ({
     LEFT: fn({
         args: [
@@ -63,6 +70,7 @@ export const preprocessedBuiltinFunctions = ({
                 fail(`End of slice (${length} + ${start}) is greater than the length of the string (${chars.length})`, str);
             return chars.slice(start - 1, start + length - 1).join("");
         },
+        aliases: ["SUBSTRING"]
     }),
     LENGTH: fn({
         args: [

diff --git a/build/runtime-types.d.ts b/build/runtime-types.d.ts
@@ -259,6 +259,7 @@ export type BuiltinFunctionData = {
     returnType: VariableType | null;
     name: string;
     impl: (this: Runtime, ...args: (RangeAttached<BoxPrimitive<VariableValue>>)[]) => VariableValue;
+    aliases: string[];
 };
 export type ClassMethodStatement = ClassFunctionStatement | ClassProcedureStatement;
 export type ClassMethodData = ProgramASTBranchNode & {

diff --git a/src/builtin_functions.ts b/src/builtin_functions.ts
@@ -67,6 +67,7 @@ type PreprocesssedBuiltinFunctionData<TArgs extends BuiltinFunctionArg[], TRetur
 	args: TArgs;
 	returnType: TReturn;
 	impl(this:Runtime, ...args:FunctionArgs<TArgs>):PrimitiveVariableTypeMapping<TReturn>;
+	aliases?: string[];
 };
 /** Wrapper function used to get the correct type definitions */
 function fn<const T extends BuiltinFunctionArg[], const S extends PrimitiveVariableTypeName>(data:PreprocesssedBuiltinFunctionData<T, S>){
@@ -75,23 +76,29 @@ function fn<const T extends BuiltinFunctionArg[], const S extends PrimitiveVaria
 
 let builtinFunctions; //cache
 export const getBuiltinFunctions = ():Record<keyof typeof preprocessedBuiltinFunctions, BuiltinFunctionData> & Partial<Record<string, BuiltinFunctionData>> => builtinFunctions ??= ( // eslint-disable-line @typescript-eslint/no-unsafe-return
-	<T extends string>(d:Record<T, PreprocesssedBuiltinFunctionData<any, any>>):Record<T, BuiltinFunctionData> & Partial<Record<string, BuiltinFunctionData>> =>
-		Object.fromEntries(Object.entries(d).map(([name, data]) =>
+	<T extends string>(d:Record<T, PreprocesssedBuiltinFunctionData<any, any>>) => {
+		const obj:Record<string, BuiltinFunctionData> = Object.fromEntries(Object.entries(d).map(([name, data]) =>
 			[name, {
 				args: new Map((data.args as BuiltinFunctionArg[]).map(([name, type]) => [name, {
 					passMode: "reference",
 					type: (Array.isArray(type) ? type : [type]).map(t =>
 						Array.isArray(t)
 							? new ArrayVariableType(null, null, t[0] == "ANY" ? null : PrimitiveVariableType.get(t[0]), [-1, -1])
 							: PrimitiveVariableType.get(t)
-					)
-				}])),
+					),
+				}] as const)),
+				aliases: data.aliases ?? [],
 				name,
 				//Unsound cast
 				impl: data.impl as never as ((this:Runtime, ...args:RangeAttached<BoxPrimitive<VariableValue>>[]) => VariableTypeMapping<PrimitiveVariableType>),
 				returnType: PrimitiveVariableType.get(data.returnType as PrimitiveVariableTypeName)
 			}]
-		))
+		));
+		Object.values(obj).filter(v => v.aliases && v.aliases.length > 0).forEach(v => {
+			v.aliases.forEach(alias => obj[alias] = v);
+		});
+		return obj;
+	}
 )(preprocessedBuiltinFunctions);
 export const preprocessedBuiltinFunctions = ({
 	//Source: s23 P22 insert
@@ -138,6 +145,7 @@ export const preprocessedBuiltinFunctions = ({
 			if(length + start - 1 > chars.length) fail(`End of slice (${length} + ${start}) is greater than the length of the string (${chars.length})`, str);
 			return chars.slice(start - 1, start + length - 1).join("");
 		},
+		aliases: ["SUBSTRING"]
 	}),
 	//source: spec 5.5
 	LENGTH: fn({

diff --git a/src/runtime-types.ts b/src/runtime-types.ts
@@ -830,6 +830,7 @@ export type BuiltinFunctionData = {
 	returnType:VariableType | null;
 	name:string;
 	impl: (this:Runtime, ...args:(RangeAttached<BoxPrimitive<VariableValue>>)[]) => VariableValue;
+	aliases: string[];
 };
 export type ClassMethodStatement = ClassFunctionStatement | ClassProcedureStatement;
 export type ClassMethodData = ProgramASTBranchNode & {