porffor 0.16.0-fe07da0f4 → 0.17.0-93ba20045

package/compiler/builtins/array.ts

@@ -54,7 +54,7 @@ export const __Array_prototype_indexOf = (_this: any[], searchElement: any, posi
   } else position = 0;
 
   for (let i: i32 = position; i < len; i++) {
-    if (_this[i] == searchElement) return i;
+    if (_this[i] === searchElement) return i;
   }
 
   return -1;
@@ -68,7 +68,7 @@ export const __Array_prototype_lastIndexOf = (_this: any[], searchElement: any,
   } else position = 0;
 
   for (let i: i32 = len - 1; i >= position; i--) {
-    if (_this[i] == searchElement) return i;
+    if (_this[i] === searchElement) return i;
   }
 
   return -1;
@@ -82,7 +82,7 @@ export const __Array_prototype_includes = (_this: any[], searchElement: any, pos
   } else position = 0;
 
   for (let i: i32 = position; i < len; i++) {
-    if (_this[i] == searchElement) return true;
+    if (_this[i] === searchElement) return true;
   }
 
   return false;
@@ -171,12 +171,13 @@ export const __Array_prototype_filter = (_this: any[], callbackFn: any) => {
 };
 
 export const __Array_prototype_map = (_this: any[], callbackFn: any) => {
+  const len: i32 = _this.length;
   const out: any[] = [];
+  out.length = len;
 
-  const len: i32 = _this.length;
   let i: i32 = 0;
   while (i < len) {
-    out.push(callbackFn(_this[i], i++, _this));
+    out[i] = callbackFn(_this[i], i++, _this);
   }
 
   return out;
@@ -222,4 +223,70 @@ export const __Array_prototype_every = (_this: any[], callbackFn: any) => {
   }
 
   return true;
+};
+
+export const __Array_prototype_reduce = (_this: any[], callbackFn: any, initialValue: any) => {
+  let acc: any = initialValue ?? _this[0];
+
+  const len: i32 = _this.length;
+  let i: i32 = 0;
+  while (i < len) {
+    acc = callbackFn(acc, _this[i], i++, _this);
+  }
+
+  return acc;
+};
+
+export const __Array_prototype_toString = (_this: any[]) => {
+  // todo: this is bytestring only!
+
+  let out: bytestring = '';
+  out.length = 0;
+
+  const len: i32 = _this.length;
+  let i: i32 = 0;
+  while (i < len) {
+    if (i > 0) Porffor.bytestring.appendChar(out, 44);
+
+    const element: any = _this[i++];
+    const type: i32 = Porffor.rawType(element);
+    if (element != 0 || Porffor.fastAnd(
+      type != Porffor.TYPES.undefined, // undefined
+      type != Porffor.TYPES.object // null
+    )) {
+      Porffor.bytestring.appendStr(out, ecma262.ToString(element));
+    }
+  }
+
+  return out;
+};
+
+export const __Array_prototype_join = (_this: any[], _separator: any) => {
+  // todo: this is bytestring only!
+  // todo/perf: optimize single char separators
+  // todo/perf: optimize default separator (?)
+
+  let separator: bytestring = ',';
+  if (Porffor.rawType(_separator) != Porffor.TYPES.undefined)
+    separator = ecma262.ToString(_separator);
+
+  let out: bytestring = '';
+  out.length = 0;
+
+  const len: i32 = _this.length;
+  let i: i32 = 0;
+  while (i < len) {
+    if (i > 0) Porffor.bytestring.appendStr(out, separator);
+
+    const element: any = _this[i++];
+    const type: i32 = Porffor.rawType(element);
+    if (element != 0 || Porffor.fastAnd(
+      type != Porffor.TYPES.undefined, // undefined
+      type != Porffor.TYPES.object // null
+    )) {
+      Porffor.bytestring.appendStr(out, ecma262.ToString(element));
+    }
+  }
+
+  return out;
 };

package/compiler/builtins/date.ts

@@ -253,29 +253,6 @@ export const __ecma262_UTC = (t: number): number => {
   return t;
 };
 
-
-// todo: move this somewhere generic?
-// 7.1.5 ToIntegerOrInfinity (argument)
-// https://tc39.es/ecma262/multipage/abstract-operations.html#sec-tointegerorinfinity
-export const __ecma262_ToIntegerOrInfinity = (argument: unknown): number => {
-  // 1. Let number be ? ToNumber(argument).
-  let number: number = Number(argument);
-
-  // 2. If number is one of NaN, +0𝔽, or -0𝔽, return 0.
-  if (Number.isNaN(number)) return 0;
-
-  // 3. If number is +∞𝔽, return +∞.
-  // 4. If number is -∞𝔽, return -∞.
-  if (!Number.isFinite(number)) return number;
-
-  // 5. Return truncate(ℝ(number)).
-  number = Math.trunc(number);
-
-  // return 0 for -0
-  if (number == 0) return 0;
-  return number;
-};
-
 // 21.4.1.27 MakeTime (hour, min, sec, ms)
 // https://tc39.es/ecma262/multipage/numbers-and-dates.html#sec-maketime
 export const __ecma262_MakeTime = (hour: number, min: number, sec: number, ms: number): number => {
@@ -722,12 +699,9 @@ export const __Porffor_date_allocate = (): Date => {
   const hack: bytestring = '';
 
   if (hack.length == 0) {
-    hack.length = Porffor.wasm`i32.const 1
-memory.grow 0
-drop
-memory.size 0
+    hack.length = Porffor.wasm`
 i32.const 1
-i32.sub
+memory.grow 0
 i32.const 65536
 i32.mul
 i32.from_u`;
@@ -1894,8 +1868,7 @@ export const __ecma262_ToDateString = (tv: number) => {
 
   // 1. If tv is NaN, return "Invalid Date".
   if (Number.isNaN(tv)) {
-    out = 'Invalid Date';
-    return out;
+    return out = 'Invalid Date';
   }
 
   // 2. Let t be LocalTime(tv).

package/compiler/builtins/number.ts

@@ -6,11 +6,9 @@ export const __Number_prototype_toString = (_this: number, radix: number|any) =>
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
 
   if (!Number.isFinite(_this)) {
-    if (Number.isNaN(_this)) out = 'NaN';
-      else if (_this == Infinity) out = 'Infinity';
-      else out = '-Infinity';
-
-    return out;
+    if (Number.isNaN(_this)) return out = 'NaN';
+    if (_this == Infinity) return out = 'Infinity';
+    return out = '-Infinity';
   }
 
   if (Porffor.rawType(radix) != Porffor.TYPES.number) {
@@ -24,8 +22,7 @@ export const __Number_prototype_toString = (_this: number, radix: number|any) =>
   }
 
   if (_this == 0) {
-    out = '0';
-    return out;
+    return out = '0';
   }
 
   // if negative value
@@ -99,7 +96,6 @@ export const __Number_prototype_toString = (_this: number, radix: number|any) =>
       }
 
       out.length = outPtr - Porffor.wasm`local.get ${out}`;
-
       return out;
     }
 
@@ -235,7 +231,6 @@ export const __Number_prototype_toString = (_this: number, radix: number|any) =>
   }
 
   out.length = outPtr - Porffor.wasm`local.get ${out}`;
-
   return out;
 };
 
@@ -244,11 +239,9 @@ export const __Number_prototype_toFixed = (_this: number, fractionDigits: number
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
 
   if (!Number.isFinite(_this)) {
-    if (Number.isNaN(_this)) out = 'NaN';
-      else if (_this == Infinity) out = 'Infinity';
-      else out = '-Infinity';
-
-    return out;
+    if (Number.isNaN(_this)) return out = 'NaN';
+    if (_this == Infinity) return out = 'Infinity';
+    return out = '-Infinity';
   }
 
   fractionDigits |= 0;
@@ -324,7 +317,6 @@ export const __Number_prototype_toFixed = (_this: number, fractionDigits: number
   }
 
   out.length = outPtr - Porffor.wasm`local.get ${out}`;
-
   return out;
 };
 
@@ -334,11 +326,9 @@ export const __Number_prototype_toExponential = (_this: number, fractionDigits:
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
 
   if (!Number.isFinite(_this)) {
-    if (Number.isNaN(_this)) out = 'NaN';
-      else if (_this == Infinity) out = 'Infinity';
-      else out = '-Infinity';
-
-    return out;
+    if (Number.isNaN(_this)) return out = 'NaN';
+    if (_this == Infinity) return out = 'Infinity';
+    return out = '-Infinity';
   }
 
   if (Porffor.rawType(fractionDigits) != Porffor.TYPES.number) {
@@ -519,7 +509,6 @@ export const __Number_prototype_toExponential = (_this: number, fractionDigits:
   }
 
   out.length = outPtr - Porffor.wasm`local.get ${out}`;
-
   return out;
 };
 

package/compiler/builtins/porffor.d.ts

@@ -28,6 +28,13 @@ type PorfforGlobal = {
     write(_this: any, index: number, value: any): boolean;
   }
 
+  bytestring: {
+    // defined in date.ts
+    appendStr(str: bytestring, appendage: bytestring): i32;
+    appendChar(str: bytestring, char: i32): i32;
+    appendPadNum(str: bytestring, num: number, len: number): i32;
+  }
+
   print(x: any): i32;
 
   randomByte(): i32;
@@ -56,6 +63,9 @@ type PorfforGlobal = {
 
   s(...args: any): string;
   bs(...args: any): bytestring;
+
+  readArgv(index: i32, out: bytestring): i32;
+  readFile(path: bytestring, out: bytestring): i32;
 };
 
 declare global {

package/compiler/builtins/set.ts

@@ -2,12 +2,9 @@ import type {} from './porffor.d.ts';
 
 // dark wasm magic for dealing with memory, sorry.
 export const __Porffor_allocate = (): number => {
-  Porffor.wasm`i32.const 1
-memory.grow 0
-drop
-memory.size 0
+  Porffor.wasm`
 i32.const 1
-i32.sub
+memory.grow 0
 i32.const 65536
 i32.mul
 i32.from_u

package/compiler/builtins/string_f64.ts

@@ -0,0 +1,10 @@
+// todo: support non-bytestring properly
+export const String = (value: any): bytestring => {
+  if (Porffor.rawType(value) == Porffor.TYPES.symbol) return __Symbol_prototype_toString(value);
+  return __ecma262_ToString(value);
+};
+
+// todo: support constructor/string objects properly
+export const String$constructor = (value: any): bytestring => {
+  return __ecma262_ToString(value);
+};

package/compiler/builtins/z_ecma262.ts

@@ -0,0 +1,62 @@
+// general widely used ecma262/spec functions
+
+// 7.1.5 ToIntegerOrInfinity (argument)
+// https://tc39.es/ecma262/#sec-tointegerorinfinity
+export const __ecma262_ToIntegerOrInfinity = (argument: unknown): number => {
+  // 1. Let number be ? ToNumber(argument).
+  let number: number = Number(argument);
+
+  // 2. If number is one of NaN, +0𝔽, or -0𝔽, return 0.
+  if (Number.isNaN(number)) return 0;
+
+  // 3. If number is +∞𝔽, return +∞.
+  // 4. If number is -∞𝔽, return -∞.
+  if (!Number.isFinite(number)) return number;
+
+  // 5. Return truncate(ℝ(number)).
+  number = Math.trunc(number);
+
+  // return 0 for -0
+  if (number == 0) return 0;
+  return number;
+};
+
+// todo: support non-bytestring properly
+// 7.1.17 ToString (argument)
+// https://tc39.es/ecma262/#sec-tostring
+export const __ecma262_ToString = (argument: unknown): bytestring => {
+  let out: bytestring = '';
+  const type: i32 = Porffor.rawType(argument);
+
+  // 1. If argument is a String, return argument.
+  if (Porffor.fastOr(
+    type == Porffor.TYPES.string,
+    type == Porffor.TYPES.bytestring)) return argument;
+
+  // 2. If argument is a Symbol, throw a TypeError exception.
+  if (type == Porffor.TYPES.symbol) throw new TypeError('Cannot convert a Symbol value to a string');
+
+  // 3. If argument is undefined, return "undefined".
+  if (type == Porffor.TYPES.undefined) return out = 'undefined';
+
+  // 4. If argument is null, return "null".
+  if (Porffor.fastAnd(
+    type == Porffor.TYPES.object,
+    argument == 0)) return out = 'null';
+
+  if (type == Porffor.TYPES.boolean) {
+    // 5. If argument is true, return "true".
+    if (argument == true) return out = 'true';
+
+    // 6. If argument is false, return "false".
+    return out = 'false';
+  }
+
+  // 7. If argument is a Number, return Number::toString(argument, 10).
+  // 8. If argument is a BigInt, return BigInt::toString(argument, 10).
+  // 9. Assert: argument is an Object.
+  // 10. Let primValue be ? ToPrimitive(argument, string).
+  // 11. Assert: primValue is not an Object.
+  // 12. Return ? ToString(primValue).
+  return argument.toString();
+};

package/compiler/builtins.js

@@ -32,26 +32,26 @@ export const importedFuncs = [
   {
     name: 'profile1',
     import: 'y',
-    params: 1,
+    params: [ Valtype.i32 ],
     returns: 0
   },
   {
     name: 'profile2',
     import: 'z',
-    params: 1,
+    params: [ Valtype.i32 ],
     returns: 0
   },
   {
     name: '__Porffor_readArgv',
     import: 'w',
     params: 2,
-    returns: 0
+    returns: 1
   },
   {
     name: '__Porffor_readFile',
     import: 'q',
     params: 2,
-    returns: 0
+    returns: 1
   }
 ];
 
@@ -150,7 +150,7 @@ export const BuiltinVars = function() {
   this.Math = number(1);
 
   // wintercg(tm)
-  this.__navigator_userAgent = (scope, { makeString }) => makeString(scope, `Porffor/0.16.0`, false, '__navigator_userAgent');
+  this.__navigator_userAgent = (scope, { makeString }) => makeString(scope, `Porffor/0.17.0`, false, '__navigator_userAgent');
   this.__navigator_userAgent.type = Prefs.bytestring ? TYPES.bytestring : TYPES.string;
 
   for (const x in TYPES) {
@@ -167,6 +167,7 @@ export const BuiltinFuncs = function() {
     params: [ valtypeBinary, valtypeBinary ],
     locals: [],
     returns: [ valtypeBinary ],
+    returnType: TYPES.number,
     wasm: [ // x - truncf(x / y) * y
       [ Opcodes.local_get, 0 ], // x
 
@@ -189,6 +190,7 @@ export const BuiltinFuncs = function() {
       params: [ valtypeBinary, valtypeBinary ],
       locals: [],
       returns: [ valtypeBinary ],
+      returnType: TYPES.number,
       wasm: [
         [ Opcodes.local_get, 0 ],
         Opcodes.i32_to,
@@ -208,6 +210,7 @@ export const BuiltinFuncs = function() {
     params: [ valtypeBinary ],
     locals: [],
     returns: [ valtypeBinary ],
+    returnType: TYPES.number,
     wasm: [
       [ Opcodes.local_get, 0 ]
     ],
@@ -469,6 +472,7 @@ export const BuiltinFuncs = function() {
     params: [ valtypeBinary ],
     locals: [],
     returns: [ valtypeBinary ],
+    returnType: TYPES.number,
     wasm: [
       [ Opcodes.local_get, 0 ],
       [ Opcodes.f64_sqrt ]
@@ -480,6 +484,7 @@ export const BuiltinFuncs = function() {
     params: [ valtypeBinary ],
     locals: [],
     returns: [ valtypeBinary ],
+    returnType: TYPES.number,
     wasm: [
       [ Opcodes.local_get, 0 ],
       [ Opcodes.f64_abs ]
@@ -491,6 +496,7 @@ export const BuiltinFuncs = function() {
     params: [ valtypeBinary ],
     locals: [],
     returns: [ valtypeBinary ],
+    returnType: TYPES.number,
     wasm: [
       ...number(1),
       [ Opcodes.local_get, 0 ],
@@ -503,6 +509,7 @@ export const BuiltinFuncs = function() {
     params: [ valtypeBinary ],
     locals: [],
     returns: [ valtypeBinary ],
+    returnType: TYPES.number,
     wasm: [
       [ Opcodes.local_get, 0 ],
       [ Opcodes.f64_floor ]
@@ -514,6 +521,7 @@ export const BuiltinFuncs = function() {
     params: [ valtypeBinary ],
     locals: [],
     returns: [ valtypeBinary ],
+    returnType: TYPES.number,
     wasm: [
       [ Opcodes.local_get, 0 ],
       [ Opcodes.f64_ceil ]
@@ -525,6 +533,7 @@ export const BuiltinFuncs = function() {
     params: [ valtypeBinary ],
     locals: [],
     returns: [ valtypeBinary ],
+    returnType: TYPES.number,
     wasm: [
       [ Opcodes.local_get, 0 ],
       [ Opcodes.f64_nearest ]
@@ -536,6 +545,7 @@ export const BuiltinFuncs = function() {
     params: [ valtypeBinary ],
     locals: [],
     returns: [ valtypeBinary ],
+    returnType: TYPES.number,
     wasm: [
       [ Opcodes.local_get, 0 ],
       [ Opcodes.f64_trunc ]
@@ -547,6 +557,7 @@ export const BuiltinFuncs = function() {
     params: [ valtypeBinary ],
     locals: [],
     returns: [ valtypeBinary ],
+    returnType: TYPES.number,
     wasm: [
       [ Opcodes.local_get, 0 ],
       Opcodes.i32_trunc_sat_f64_u,
@@ -560,6 +571,7 @@ export const BuiltinFuncs = function() {
     params: [ valtypeBinary ],
     locals: [],
     returns: [ valtypeBinary ],
+    returnType: TYPES.number,
     wasm: [
       [ Opcodes.local_get, 0 ],
       [ Opcodes.f32_demote_f64 ],
@@ -573,6 +585,7 @@ export const BuiltinFuncs = function() {
     params: [ valtypeBinary, valtypeBinary ],
     locals: [],
     returns: [ valtypeBinary ],
+    returnType: TYPES.number,
     wasm: [
       [ Opcodes.local_get, 0 ],
       Opcodes.i32_trunc_sat_f64_s,
@@ -887,6 +900,7 @@ export const BuiltinFuncs = function() {
     globalNames: [ 'state0', 'state1' ],
     globalInits: [ prngSeed0, prngSeed1 ],
     returns: [ Valtype.f64 ],
+    returnType: TYPES.number,
     wasm: [
       ...prng.wasm,
 
@@ -938,6 +952,7 @@ export const BuiltinFuncs = function() {
     globalNames: [ 'state0', 'state1' ],
     globalInits: [ prngSeed0, prngSeed1 ],
     returns: [ Valtype.i32 ],
+    returnType: TYPES.number,
     wasm: [
       ...prng.wasm,
 
@@ -959,6 +974,7 @@ export const BuiltinFuncs = function() {
     params: [ valtypeBinary ],
     locals: [],
     returns: [ valtypeBinary ],
+    returnType: TYPES.number,
     wasm: [
       [ Opcodes.local_get, 0 ],
       ...number(Math.PI / 180),
@@ -971,6 +987,7 @@ export const BuiltinFuncs = function() {
     params: [ valtypeBinary ],
     locals: [],
     returns: [ valtypeBinary ],
+    returnType: TYPES.number,
     wasm: [
       [ Opcodes.local_get, 0 ],
       ...number(180 / Math.PI),
@@ -984,6 +1001,7 @@ export const BuiltinFuncs = function() {
     locals: [],
     localNames: [ 'x', 'lower', 'upper' ],
     returns: [ valtypeBinary ],
+    returnType: TYPES.number,
     wasm: [
       [ Opcodes.local_get, 0 ],
       [ Opcodes.local_get, 1 ],
@@ -999,9 +1017,9 @@ export const BuiltinFuncs = function() {
     locals: [],
     localNames: [ 'x', 'inLow', 'inHigh', 'outLow', 'outHigh' ],
     returns: [ valtypeBinary ],
+    returnType: TYPES.number,
     wasm: [
       // (x − inLow) * (outHigh − outLow) / (inHigh - inLow) + outLow
-
       [ Opcodes.local_get, 0 ],
       [ Opcodes.local_get, 1 ],
       [ Opcodes.f64_sub ],
@@ -1043,6 +1061,7 @@ export const BuiltinFuncs = function() {
     params: [],
     locals: [],
     returns: [ valtypeBinary ],
+    returnType: TYPES.number,
     wasm: [
       [ Opcodes.call, importedFuncs.time ]
     ]
@@ -1070,6 +1089,7 @@ export const BuiltinFuncs = function() {
     typedParams: true,
     locals: [],
     returns: [ valtypeBinary ],
+    returnType: TYPES.number,
     wasm: [
       [ Opcodes.local_get, 1 ],
       Opcodes.i32_from_u