porffor 0.61.2 → 0.61.4

package/compiler/2c.js

@@ -2,7 +2,6 @@ import { read_unsignedLEB128 } from './encoding.js';
 import { Blocktype, Opcodes, Valtype, PageSize } from './wasmSpec.js';
 import { operatorOpcode } from './expression.js';
 import { log } from './log.js';
-import './prefs.js';
 
 const CValtype = {
   i8: 'u8',
@@ -209,7 +208,7 @@ export default ({ funcs, globals, data, pages }) => {
 
   includes.set('stdint.h', true);
 
-  globalThis.out = ``;
+  let out = '';
 
   for (const x in globals) {
     const g = globals[x];
@@ -281,6 +280,7 @@ export default ({ funcs, globals, data, pages }) => {
     if (cified.has(f.name)) return '';
     cified.add(f.name);
 
+    let topOfOut = '';
     let out = '';
 
     let depth = 1;
@@ -358,8 +358,7 @@ export default ({ funcs, globals, data, pages }) => {
 
     if (f.name === '__Porffor_promise_runJobs') {
       out += '}';
-      globalThis.out = globalThis.out + out;
-      return;
+      return topOfOut + out;
     }
 
     if (f.name === '#main') {
@@ -661,66 +660,6 @@ f64 _time_out${id} = (f64)_ts${id}.tv_sec * 1000.0 + (f64)_ts${id}.tv_nsec / 1.0
                 break;
               }
 
-              case '__Porffor_readArgv': {
-                prepend.set('__Porffor_readArgv',
-`i32 __Porffor_readArgv(u32 index, u32 outPtr) {
-  if (index >= _argc) {
-    return -1;
-  }
-
-  char* arg = _argv[index];
-
-  u32 read = 0;
-  char* out = _memory + outPtr + 4;
-  char ch;
-  while ((ch = *(arg++)) != 0) {
-    out[read++] = ch;
-  }
-
-  *((i32*)(_memory + outPtr)) = (i32)read;
-  return read;
-}`);
-
-                const outPtr = vals.pop();
-                const index = vals.pop();
-                vals.push(`(f64)__Porffor_readArgv((u32)(${index}), (u32)(${outPtr}))`);
-                break;
-              }
-
-              case '__Porffor_readFile': {
-                includes.set('stdio.h', true);
-
-                prepend.set('__Porffor_readFile',
-`i32 __Porffor_readFile(u32 pathPtr, u32 outPtr) {
-  FILE* fp;
-  if (pathPtr == 0) {
-    fp = stdin;
-  } else {
-    char* path = _memory + pathPtr + 4;
-    fp = fopen(path, "r");
-    if (fp == NULL) {
-      return -1;
-    }
-  }
-
-  u32 read = 0;
-  char* out = _memory + outPtr + 4;
-  char ch;
-  while ((ch = fgetc(fp)) != EOF) {
-    out[read++] = ch;
-  }
-
-  fclose(fp);
-
-  *((i32*)(_memory + outPtr)) = (i32)read;
-  return read;
-}`);
-                const outPtr = vals.pop();
-                const pathPtr = vals.pop();
-                vals.push(`(f64)__Porffor_readFile((u32)(${pathPtr}), (u32)(${outPtr}))`);
-                break;
-              }
-
               default:
                 log.warning('2c', `unimplemented import: ${importFunc.name}`);
                 break;
@@ -730,7 +669,7 @@ f64 _time_out${id} = (f64)_ts${id}.tv_sec * 1000.0 + (f64)_ts${id}.tv_nsec / 1.0
           }
 
           if (!cified.has(func.name) && !ffiFuncs[func.name]) {
-            cify(func);
+            topOfOut += cify(func);
           }
 
           let args = [];
@@ -951,12 +890,11 @@ f64 _time_out${id} = (f64)_ts${id}.tv_sec * 1000.0 + (f64)_ts${id}.tv_nsec / 1.0
     }
 
     out += '}\n\n';
-
-    globalThis.out = globalThis.out + out;
+    return topOfOut + out;
   };
 
   for (const x of funcs) {
-    if (x.export || x.name === '#main') cify(x);
+    if (x.export || x.name === '#main') out += cify(x);
   }
 
   const rawParams = f => {

package/compiler/assemble.js

@@ -25,14 +25,12 @@ export default (funcs, globals, tags, pages, data, noTreeshake = false) => {
       if (f.usesImports) for (let j = 0; j < f.wasm.length; j++) {
         const x = f.wasm[j];
         if (x[0] === Opcodes.call && x[1] < importedFuncs.length) {
-          const idx = x[1];
-          const func = importedFuncs[idx];
-
+          const func = importedFuncs[x[1]];
           if (!remap.has(func)) {
             remap.set(func, importFuncs.length);
             importFuncs.push(func);
           }
-          x[1] = remap.get(func);
+          f.wasm[j] = [ x[0], remap.get(func) ];
         }
       }
     }

package/compiler/builtins/annexb_string.js

@@ -22,7 +22,7 @@ export const __ByteString_prototype_${a0} = (_this: bytestring) =>
 export const __String_prototype_${name} = (_this: string, arg: any) => {
   arg = ecma262.ToString(arg);
   const len: i32 = arg.length;
-  const escaped: bytestring = Porffor.malloc(4 + len * 6); // overallocate in case of "s
+  const escaped: bytestring = Porffor.malloc(6 + len * 6); // overallocate in case of "s
   for (let i: i32 = 0; i < len; i++) {
     const c: i32 = arg.charCodeAt(i);
     if (c != 34) {

package/compiler/builtins/array.ts

@@ -371,6 +371,8 @@ export const __Array_prototype_fill = (_this: any[], value: any, _start: any, _e
 // @porf-typed-array
 export const __Array_prototype_indexOf = (_this: any[], searchElement: any, _position: any) => {
   const len: i32 = _this.length;
+  if (len == 0) return -1;
+
   let position: i32 = ecma262.ToIntegerOrInfinity(_position);
   if (position >= 0) {
     if (position > len) position = len;
@@ -389,6 +391,8 @@ export const __Array_prototype_indexOf = (_this: any[], searchElement: any, _pos
 // @porf-typed-array
 export const __Array_prototype_lastIndexOf = (_this: any[], searchElement: any, _position: any) => {
   const len: i32 = _this.length;
+  if (len == 0) return -1;
+
   let position: i32 = _position == null ? len - 1 : ecma262.ToIntegerOrInfinity(_position);
   if (position >= 0) {
     if (position > len - 1) position = len - 1;
@@ -406,6 +410,8 @@ export const __Array_prototype_lastIndexOf = (_this: any[], searchElement: any,
 // @porf-typed-array
 export const __Array_prototype_includes = (_this: any[], searchElement: any, _position: any) => {
   const len: i32 = _this.length;
+  if (len == 0) return false;
+
   let position: i32 = ecma262.ToIntegerOrInfinity(_position);
   if (position >= 0) {
     if (position > len) position = len;
@@ -415,7 +421,7 @@ export const __Array_prototype_includes = (_this: any[], searchElement: any, _po
   }
 
   for (let i: i32 = position; i < len; i++) {
-    if (_this[i] === searchElement) return true;
+    if (__ecma262_SameValueZero(_this[i], searchElement)) return true;
   }
 
   return false;
@@ -612,6 +618,7 @@ export const __Array_prototype_findIndex = (_this: any[], callbackFn: any, thisA
     if (!!callbackFn.call(thisArg, _this[i], i, _this)) return i;
     i++;
   }
+  return -1;
 };
 
 // @porf-typed-array
@@ -621,6 +628,7 @@ export const __Array_prototype_findLastIndex = (_this: any[], callbackFn: any, t
   while (i > 0) {
     if (!!callbackFn.call(thisArg, _this[--i], i, _this)) return i;
   }
+  return -1;
 };
 
 // @porf-typed-array

package/compiler/builtins/console.ts

@@ -59,6 +59,7 @@ export const __Porffor_print = (arg: any, colors: boolean = true, depth: number
       return;
 
     case Porffor.TYPES.boolean:
+    case Porffor.TYPES.booleanobject:
       if (colors) Porffor.printStatic('\x1b[33m'); // yellow
       if (arg) {
         Porffor.printStatic('true');

package/compiler/builtins/function.ts

@@ -21,8 +21,7 @@ export const __Function_prototype_toString = (_this: Function) => {
 export const __Function_prototype_toLocaleString = (_this: Function) => __Function_prototype_toString(_this);
 
 export const __Function_prototype_apply = (_this: Function, thisArg: any, argsArray: any) => {
-  argsArray = Array.from(argsArray ?? []);
-  return Porffor.call(_this, argsArray, thisArg, null);
+  return Porffor.call(_this, Array.from(argsArray ?? []) as any[], thisArg, null);
 };
 
 export const __Function_prototype_bind = (_this: Function, thisArg: any, argsArray: any) => {

package/compiler/builtins/json.ts

@@ -39,6 +39,7 @@ export const __Porffor_json_canSerialize = (value: any): boolean => {
     Porffor.type(value) == Porffor.TYPES.stringobject,
     Porffor.type(value) == Porffor.TYPES.number,
     Porffor.type(value) == Porffor.TYPES.numberobject,
+    Porffor.type(value) == Porffor.TYPES.booleanobject,
     Porffor.type(value) == Porffor.TYPES.array,
     Porffor.type(value) > Porffor.TYPES.function
   )) return true;
@@ -57,6 +58,12 @@ export const __Porffor_json_serialize = (_buffer: i32, value: any, depth: i32, s
   if (value === true) return __Porffor_bytestring_bufferStr(buffer, 'true');
   if (value === false) return __Porffor_bytestring_bufferStr(buffer, 'false');
 
+  // Handle Boolean objects by extracting [[BooleanData]]
+  if (Porffor.type(value) == Porffor.TYPES.booleanobject) {
+    if (value.valueOf()) return __Porffor_bytestring_bufferStr(buffer, 'true');
+    return __Porffor_bytestring_bufferStr(buffer, 'false');
+  }
+
   if (Porffor.fastOr(
     (Porffor.type(value) | 0b10000000) == Porffor.TYPES.bytestring,
     Porffor.type(value) == Porffor.TYPES.stringobject
@@ -240,7 +247,7 @@ export const __JSON_stringify = (value: any, replacer: any, space: any) => {
       if (space < 1) {
         space = undefined;
       } else {
-        const spaceStr: bytestring = Porffor.malloc(4 + space);
+        const spaceStr: bytestring = Porffor.malloc(6 + space);
         for (let i: i32 = 0; i < space; i++) Porffor.bytestring.appendChar(spaceStr, 32);
 
         space = spaceStr;

package/compiler/builtins/map.ts

@@ -72,7 +72,9 @@ export const __Map_prototype_clear = (_this: Map) => {
   vals.length = 0;
 };
 
-export const __Map_prototype_forEach = (_this: Map, callbackFn: any) => {
+export const __Map_prototype_forEach = (_this: Map, callbackFn: any, thisArg: any = undefined) => {
+  if (Porffor.type(callbackFn) != Porffor.TYPES.function) throw new TypeError('callbackFn is not a function');
+
   const keys: any[] = Porffor.wasm.i32.load(_this, 0, 0);
   const vals: any[] = Porffor.wasm.i32.load(_this, 0, 4);
 
@@ -80,7 +82,7 @@ export const __Map_prototype_forEach = (_this: Map, callbackFn: any) => {
 
   let i: i32 = 0;
   while (i < size) {
-    callbackFn(vals[i], keys[i++], _this);
+    callbackFn.call(thisArg, vals[i], keys[i++], _this);
   }
 };
 

package/compiler/builtins/math.ts

@@ -154,7 +154,7 @@ export const __Math_pow = (base: number, exponent: number): number => {
     }
 
     // 5. If base is -∞𝔽, then
-    const isOdd = exponent % 2 == 1;
+    const isOdd = Math.abs(exponent) % 2 == 1;
 
     // a. If exponent > +0𝔽, then
     if (exponent > 0) {
@@ -178,7 +178,7 @@ export const __Math_pow = (base: number, exponent: number): number => {
     }
 
     // 7. If base is -0𝔽, then
-    const isOdd = exponent % 2 == 1;
+    const isOdd = Math.abs(exponent) % 2 == 1;
 
     // a. If exponent > +0𝔽, then
     if (exponent > 0) {
@@ -246,7 +246,7 @@ export const __Math_pow = (base: number, exponent: number): number => {
       }
 
       currentBase *= currentBase;
-      currentExponent >>= 1;
+      currentExponent = Math.trunc(currentExponent / 2);
     } else {
       // Handle fractional part
       result *= Math.exp(currentExponent * Math.log(Math.abs(currentBase)));
@@ -282,7 +282,10 @@ export const __Math_expm1 = (x: number): number => {
 };
 
 export const __Math_log1p = (x: number): number => {
+  // log1p(0) = 0 (preserve sign)
+  if (x == 0) return x;
   if (x == -1) return -Infinity; // log(0) = -inf
+  if (x < -1) return NaN; // log of negative is NaN
   if (!Number.isFinite(x)) return x;
 
   // opt: use exp(x) - 1 for large x
@@ -305,7 +308,7 @@ export const __Math_log1p = (x: number): number => {
 
 export const __Math_sqrt = (y: number): number => {
   if (y <= 0) {
-    if (y == 0) return 0;
+    if (y == 0) return y; // sqrt(0) = 0 (preserve sign)
     return NaN;
   }
   if (!Number.isFinite(y)) return y;
@@ -323,7 +326,7 @@ export const __Math_sqrt = (y: number): number => {
 };
 
 export const __Math_cbrt = (y: number): number => {
-  if (y == 0) return 0; // cbrt(0) = 0
+  if (y == 0) return y; // cbrt(0) = 0 (preserves sign)
   if (!Number.isFinite(y)) return y;
 
   // Babylonian method
@@ -341,9 +344,16 @@ export const __Math_cbrt = (y: number): number => {
 
 
 // todo: varargs
-export const __Math_hypot = (x: number, y: number): number => Math.sqrt(x * x + y * y);
+export const __Math_hypot = (x: number, y: number): number => {
+  // If any argument is ±Infinity, return +Infinity (even if other args are NaN)
+  if (x == Infinity || x == -Infinity || y == Infinity || y == -Infinity) return Infinity;
+  return Math.sqrt(x * x + y * y);
+};
 
 export const __Math_sin = (x: number): number => {
+  // sin(0) = 0 (preserve sign)
+  if (x == 0) return x;
+
   // -inf <= x <= inf -> 0 <= x <= 2pi
   const piX2: number = Math.PI * 2;
   x %= piX2;
@@ -381,21 +391,47 @@ export const __Math_sin = (x: number): number => {
   // );
 };
 
-export const __Math_cos = (x: number): number => Math.sin(x - Math.PI / 2);
-export const __Math_tan = (x: number): number => Math.sin(x) / Math.cos(x);
+export const __Math_cos = (x: number): number => {
+  if (x == 0) return 1;
+  return Math.sin(x + Math.PI / 2);
+};
+export const __Math_tan = (x: number): number => {
+  // tan(0) = 0 (preserve sign)
+  if (x == 0) return x;
+  return Math.sin(x) / Math.cos(x);
+};
 
-export const __Math_sinh = (x: number): number => (Math.exp(x) - Math.exp(-x)) / 2;
+export const __Math_sinh = (x: number): number => {
+  // sinh(0) = 0 (preserve sign)
+  if (x == 0) return x;
+  return (Math.exp(x) - Math.exp(-x)) / 2;
+};
 export const __Math_cosh = (x: number): number => (Math.exp(x) + Math.exp(-x)) / 2;
-export const __Math_tanh = (x: number): number => Math.sinh(x) / Math.cosh(x);
+export const __Math_tanh = (x: number): number => {
+  // tanh(0) = 0 (preserve sign)
+  if (x == 0) return x;
+  if (x == Infinity) return 1;
+  if (x == -Infinity) return -1;
+  return Math.sinh(x) / Math.cosh(x);
+};
 
 
-export const __Math_asinh = (x: number): number => Math.log(x + Math.sqrt(x * x + 1));
+export const __Math_asinh = (x: number): number => {
+  // asinh(0) = 0 (preserve sign)
+  if (x == 0) return x;
+  if (!Number.isFinite(x)) return x;
+  return Math.log(x + Math.sqrt(x * x + 1));
+};
 export const __Math_acosh = (x: number): number => {
   if (x < 1) return NaN;
   return Math.log(x + Math.sqrt(x * x - 1));
 };
 export const __Math_atanh = (x: number): number => {
-  if (Math.abs(x) >= 1) return NaN;
+  // atanh(0) = 0 (preserve sign)
+  if (x == 0) return x;
+  if (x == 1) return Infinity;
+  if (x == -1) return -Infinity;
+  if (Math.abs(x) > 1) return NaN;
   return 0.5 * Math.log((1 + x) / (1 - x));
 };
 
@@ -424,7 +460,7 @@ export const __Math_asin = (x: number): number => {
   return sum;
 };
 
-export const __Math_acos = (x: number): number => Math.asin(x) - Math.PI / 2;
+export const __Math_acos = (x: number): number => Math.PI / 2 - Math.asin(x);
 
 export const __Math_atan = (x: number): number => {
   if (x == Infinity) return Math.PI / 2;

package/compiler/builtins/number.ts

@@ -40,7 +40,7 @@ export const __Number_prototype_toString = (_this: number, radix: number|any) =>
     radix = 10;
   }
 
-  radix |= 0;
+  radix = Math.trunc(radix);
   if (radix < 2 || radix > 36) {
     throw new RangeError('toString() radix argument must be between 2 and 36');
   }
@@ -268,7 +268,7 @@ export const __Number_prototype_toString = (_this: number, radix: number|any) =>
 };
 
 export const __Number_prototype_toFixed = (_this: number, fractionDigits: number) => {
-  fractionDigits |= 0;
+  fractionDigits = Math.trunc(fractionDigits);
   if (fractionDigits < 0 || fractionDigits > 100) {
     throw new RangeError('toFixed() fractionDigits argument must be between 0 and 100');
   }
@@ -367,7 +367,7 @@ export const __Number_prototype_toExponential = (_this: number, fractionDigits:
     // todo: string to number
     fractionDigits = undefined;
   } else {
-    fractionDigits |= 0;
+    fractionDigits = Math.trunc(fractionDigits);
     if (fractionDigits < 0 || fractionDigits > 100) {
       throw new RangeError('toExponential() fractionDigits argument must be between 0 and 100');
     }
@@ -695,6 +695,10 @@ export const parseFloat = (input: any): f64 => {
   let negative: boolean = false;
 
   let i: i32 = 0;
+  const len: i32 = input.length;
+
+  if (len == 0) return NaN;
+
   const start: i32 = input.charCodeAt(0);
 
   // +, ignore
@@ -708,7 +712,22 @@ export const parseFloat = (input: any): f64 => {
     negative = true;
   }
 
-  const len: i32 = input.length;
+  // Check for "Infinity"
+  if (len - i >= 8) {
+    // Check if remaining string starts with "Infinity"
+    if (input.charCodeAt(i) == 73 &&      // I
+        input.charCodeAt(i + 1) == 110 && // n
+        input.charCodeAt(i + 2) == 102 && // f
+        input.charCodeAt(i + 3) == 105 && // i
+        input.charCodeAt(i + 4) == 110 && // n
+        input.charCodeAt(i + 5) == 105 && // i
+        input.charCodeAt(i + 6) == 116 && // t
+        input.charCodeAt(i + 7) == 121) { // y
+      if (negative) return -Infinity;
+      return Infinity;
+    }
+  }
+
   while (i < len) {
     const chr: i32 = input.charCodeAt(i++);
 

package/compiler/builtins/object.ts

@@ -643,7 +643,11 @@ export const __Object_setPrototypeOf = (obj: any, proto: any): any => {
   if (obj == null) throw new TypeError('Object is nullish, expected object');
   if (!Porffor.object.isObjectOrNull(proto)) throw new TypeError('Prototype should be an object or null');
 
-  // todo: if inextensible, throw if proto != current prototype
+  // If object is inextensible, throw if new proto is different from current
+  if (Porffor.object.isObject(obj) && Porffor.object.isInextensible(obj)) {
+    const currentProto: any = Porffor.object.getPrototypeWithHidden(obj, Porffor.type(obj));
+    if (proto !== currentProto) throw new TypeError('Cannot set prototype of non-extensible object');
+  }
 
   Porffor.object.setPrototype(obj, proto);
   return obj;

package/compiler/builtins/porffor.d.ts

@@ -96,6 +96,7 @@ type PorfforGlobal = {
   }
 
   print(x: any): i32;
+  printStatic(str: string): void;
 
   randomByte(): i32;
 
@@ -127,10 +128,6 @@ type PorfforGlobal = {
 
   s(...args: any): string;
   bs(...args: any): bytestring;
-
-  printStatic(str: string): void;
-  readArgv(index: i32, out: bytestring): i32;
-  readFile(path: bytestring, out: bytestring): i32;
 };
 
 declare global {