porffor 0.19.13 → 0.19.14

package/compiler/2c.js

@@ -628,8 +628,8 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
           }
 
           if (!cified.has(func.name) && func.name !== f.name) {
-            cify(func);
             cified.add(func.name);
+            cify(func);
           }
 
           let args = [];

package/compiler/allocators.js

@@ -35,7 +35,9 @@ export class StaticAllocator {
   }
 
   alloc({ scope, pages }, name, { itemType }) {
-    const reason = `${this.allocType(itemType)}: ${Prefs.scopedPageNames ? (scope.name + '/') : ''}${name}`;
+    let scopeName = scope.name;
+    if (globalThis.precompile && scopeName === 'main') scopeName = globalThis.precompile;
+    const reason = `${this.allocType(itemType)}: ${Prefs.scopedPageNames ? (scopeName + '/') : ''}${name}`;
 
     if (pages.has(reason)) return number(this.ptr(pages.get(reason).ind), Valtype.i32);
 

package/compiler/builtins/annexb_string.js

@@ -137,5 +137,16 @@ ${[...s1].map((x, i) => `  Porffor.wasm.i32.store16(outPtr, ${x.charCodeAt(0)},
   arg('anchor', 'a', 'name');
   arg('link', 'a', 'href');
 
+  const prototypeAlias = (regular, annex) => `export const __String_prototype_${annex} = (_this: string) => {
+  return __String_prototype_${regular}(_this);
+};
+export const __ByteString_prototype_${annex} = (_this: bytestring) => {
+  return __ByteString_prototype_${regular}(_this);
+};
+`;
+
+  prototypeAlias('trimStart', 'trimLeft');
+  prototypeAlias('trimEnd', 'trimRight');
+
   return out;
 };

package/compiler/builtins/console.ts

@@ -62,15 +62,17 @@ export const __Porffor_print = (arg: any, colors: boolean = true) => {
       return;
 
     case Porffor.TYPES.array:
-      printStatic('[ ');
-
       const arrLen: i32 = arg.length - 1;
-      for (let i: i32 = 0; i <= arrLen; i++) {
-        __Porffor_print(arg[i], colors);
-        if (i != arrLen) printStatic(', ');
+      if (arrLen == -1) {
+        printStatic('[]');
+      } else {
+        printStatic('[ ');
+        for (let i: i32 = 0; i <= arrLen; i++) {
+          __Porffor_print(arg[i], colors);
+          if (i != arrLen) printStatic(', ');
+        }
+        printStatic(' ]');
       }
-
-      printStatic(' ]');
       return;
 
     case Porffor.TYPES.empty:
@@ -341,16 +343,17 @@ export const __Porffor_consolePrint = (arg: any) => {
 };
 
 export const __console_group = (label: bytestring) => {
-  if (Porffor.rawType(label) != Porffor.TYPES.undefined) __Porffor_consolePrint(label);
+  if (Porffor.rawType(label) != Porffor.TYPES.undefined) {
+    __Porffor_consoleIndent();
+    __Porffor_consolePrint(label);
+  }
 
   tabLevel++;
 };
 
 export const __console_groupCollapsed = (label: bytestring) => __console_group(label);
 
-export const __console_groupEnd = (label: bytestring) => {
-  if (Porffor.rawType(label) != Porffor.TYPES.undefined) __Porffor_consolePrint(label);
-
+export const __console_groupEnd = () => {
   tabLevel--;
   if (tabLevel < 0) tabLevel = 0;
 };

package/compiler/builtins/symbol.ts

@@ -1,30 +1,33 @@
 import type {} from './porffor.d.ts';
 
-export const __Porffor_symbol_descStore = (op: boolean, value: any): any => {
-  const ptr: bytestring = '';
-
-  if (op) { // write
-    const size: number = Porffor.wasm.i32.load(ptr, 0, 0);
-    Porffor.wasm.i32.store(ptr, size + 1, 0, 0)
-
-    // reuse set internals to store description
-    Porffor.set.write(ptr, size, value);
-    return size;
-  } else { // read
-    return Porffor.set.read(ptr, value);
-  }
-};
+const descStore: any[] = new Array(0);
 
+// 20.4.1.1 Symbol ([ description ])
+// https://tc39.es/ecma262/#sec-symbol-description
 export const Symbol = (description: any): Symbol => {
+  // 1. If NewTarget is not undefined, throw a TypeError exception.
+  // This is an arrow function so happens implicitly
+
+  // 2. If description is undefined, let descString be undefined.
+  let descString: any = undefined;
+
+  // 3. Else, let descString be ? ToString(description).
+  if (Porffor.rawType(description) != Porffor.TYPES.undefined) {
+    descString = ecma262.ToString(description);
+  }
+
+  // 4. Return a new Symbol whose [[Description]] is descString.
+  let len: i32 = descStore.length;
+  descStore[len] = descString;
+  descStore.length = ++len;
+
   // 1-based so always truthy as numeric value
-  const ptr: Symbol = __Porffor_symbol_descStore(true, description) + 1;
-  return ptr;
+  const sym: Symbol = len;
+  return sym;
 };
 
 export const __Symbol_prototype_description$get = (_this: Symbol) => {
-  const description: bytestring =
-    __Porffor_symbol_descStore(false, Porffor.wasm`local.get ${_this}` - 1);
-  return description;
+  return descStore[Porffor.wasm`local.get ${_this}` - 1];
 };
 
 export const __Symbol_prototype_toString = (_this: Symbol) => {
@@ -39,15 +42,20 @@ export const __Symbol_prototype_toString = (_this: Symbol) => {
   Porffor.wasm.i32.store8(out, 108, 0, 9);
   Porffor.wasm.i32.store8(out, 40, 0, 10);
 
-  const description: bytestring =
-    __Porffor_symbol_descStore(false, Porffor.wasm`local.get ${_this}` - 1);
+  const description: any = descStore[Porffor.wasm`local.get ${_this}` - 1];
+  let descLen: i32 = 0;
+  if (description !== undefined) {
+    descLen = description.length;
+
+    print(descLen);
 
-  const descLen: i32 = description.length;
-  let outPtr: i32 = Porffor.wasm`local.get ${out}` + 7;
-  let descPtr: i32 = Porffor.wasm`local.get ${description}`;
-  const descPtrEnd: i32 = descPtr + descLen;
-  while (descPtr < descPtrEnd) {
-    Porffor.wasm.i32.store8(outPtr++, Porffor.wasm.i32.load8_u(descPtr++, 0, 4), 0, 4);
+    // todo: support regular string
+    let outPtr: i32 = Porffor.wasm`local.get ${out}` + 7;
+    let descPtr: i32 = Porffor.wasm`local.get ${description}`;
+    const descPtrEnd: i32 = descPtr + descLen;
+    while (descPtr < descPtrEnd) {
+      Porffor.wasm.i32.store8(outPtr++, Porffor.wasm.i32.load8_u(descPtr++, 0, 4), 0, 4);
+    }
   }
 
   // )
@@ -64,7 +72,7 @@ export const __Symbol_prototype_valueOf = (_this: Symbol) => {
   return _this;
 };
 
-const forStore = new Map();
+const forStore: Map = new Map();
 export const __Symbol_for = (key: any): Symbol => {
   if (forStore.has(key)) return forStore.get(key);
 

package/compiler/builtins/z_ecma262.ts

@@ -38,7 +38,9 @@ export const __ecma262_ToString = (argument: unknown): bytestring => {
   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';
+  if (Porffor.fastOr(
+    type == Porffor.TYPES.undefined,
+    type == Porffor.TYPES.empty)) return out = 'undefined';
 
   // 4. If argument is null, return "null".
   if (Porffor.fastAnd(

package/compiler/builtins.js

@@ -261,170 +261,6 @@ export const BuiltinFuncs = function() {
     constr: true
   };
 
-
-  this.__Porffor_print = {
-    params: [ globalThis.precompile ? Valtype.f64 : valtypeBinary, Valtype.i32 ],
-    typedParams: true,
-    locals: [ Valtype.i32, Valtype.i32 ],
-    returns: [],
-    wasm: (scope, { typeSwitch, builtin }) => [
-      ...typeSwitch(scope, [ [ Opcodes.local_get, 1 ] ], {
-        [TYPES.number]: [
-          [ Opcodes.local_get, 0 ],
-          [ Opcodes.call, importedFuncs.print ],
-        ],
-        [TYPES.boolean]: [
-          [ Opcodes.local_get, 0 ],
-          Opcodes.i32_to_u,
-          [ Opcodes.if, Blocktype.void ],
-          ...printStaticStr('true'),
-          [ Opcodes.else ],
-          ...printStaticStr('false'),
-          [ Opcodes.end ]
-        ],
-        [TYPES.string]: [
-          // simply print a string :))
-          // cache input pointer as i32
-          [ Opcodes.local_get, 0 ],
-          Opcodes.i32_to_u,
-          [ Opcodes.local_tee, 2 ],
-
-          // make end pointer
-          [ Opcodes.i32_load, Math.log2(ValtypeSize.i32) - 1, 0 ],
-          ...number(ValtypeSize.i16, Valtype.i32),
-          [ Opcodes.i32_mul ],
-
-          [ Opcodes.local_get, 2 ],
-          [ Opcodes.i32_add ],
-          [ Opcodes.local_set, 3 ],
-
-          [ Opcodes.loop, Blocktype.void ],
-
-          // print current char
-          [ Opcodes.local_get, 2 ],
-          [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
-          Opcodes.i32_from_u,
-          [ Opcodes.call, importedFuncs.printChar ],
-
-          // increment pointer by sizeof i16
-          [ Opcodes.local_get, 2 ],
-          ...number(ValtypeSize.i16, Valtype.i32),
-          [ Opcodes.i32_add ],
-          [ Opcodes.local_tee, 2 ],
-
-          // if pointer != end pointer, loop
-          [ Opcodes.local_get, 3 ],
-          [ Opcodes.i32_ne ],
-          [ Opcodes.br_if, 0 ],
-
-          [ Opcodes.end ]
-        ],
-        [TYPES.bytestring]: [
-          // simply print a (byte)string :))
-          // cache input pointer as i32
-          [ Opcodes.local_get, 0 ],
-          Opcodes.i32_to_u,
-          [ Opcodes.local_tee, 2 ],
-
-          // make end pointer
-          [ Opcodes.i32_load, Math.log2(ValtypeSize.i32) - 1, 0 ],
-          [ Opcodes.local_get, 2 ],
-          [ Opcodes.i32_add ],
-          [ Opcodes.local_set, 3 ],
-
-          [ Opcodes.loop, Blocktype.void ],
-
-          // print current char
-          [ Opcodes.local_get, 2 ],
-          [ Opcodes.i32_load8_u, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
-          Opcodes.i32_from_u,
-          [ Opcodes.call, importedFuncs.printChar ],
-
-          // increment pointer
-          [ Opcodes.local_get, 2 ],
-          [ Opcodes.i32_const, 1 ],
-          [ Opcodes.i32_add ],
-          [ Opcodes.local_tee, 2 ],
-
-          // if pointer != end pointer, loop
-          [ Opcodes.local_get, 3 ],
-          [ Opcodes.i32_ne ],
-          [ Opcodes.br_if, 0 ],
-
-          [ Opcodes.end ]
-        ],
-        [TYPES.array]: [
-          ...printStaticStr('[ '),
-
-          // cache input pointer as i32
-          [ Opcodes.local_get, 0 ],
-          Opcodes.i32_to_u,
-          [ Opcodes.local_tee, 2 ],
-
-          // make end pointer
-          [ Opcodes.i32_load, Math.log2(ValtypeSize.i32) - 1, 0 ],
-          ...number(ValtypeSize[valtype] + 1, Valtype.i32),
-          [ Opcodes.i32_mul ],
-
-          [ Opcodes.local_get, 2 ],
-          [ Opcodes.i32_add ],
-          [ Opcodes.local_set, 3 ],
-
-          [ Opcodes.loop, Blocktype.void ],
-
-          // print current array element
-          [ Opcodes.local_get, 2 ],
-          [ Opcodes.load, 0, ValtypeSize.i32 ],
-
-          [ Opcodes.local_get, 2 ],
-          [ Opcodes.i32_load8_u, 0, ValtypeSize.i32 + ValtypeSize[valtype] ],
-
-          [ Opcodes.call, builtin('__Porffor_print') ],
-
-          // increment pointer by sizeof valtype
-          [ Opcodes.local_get, 2 ],
-          ...number(ValtypeSize[valtype] + 1, Valtype.i32),
-          [ Opcodes.i32_add ],
-          [ Opcodes.local_tee, 2 ],
-
-          // if pointer != end pointer, print separator and loop
-          [ Opcodes.local_get, 3 ],
-          [ Opcodes.i32_ne ],
-          [ Opcodes.if, Blocktype.void ],
-          ...printStaticStr(', '),
-          [ Opcodes.br, 1 ],
-          [ Opcodes.end ],
-
-          [ Opcodes.end ],
-
-          ...printStaticStr(' ]'),
-        ],
-        [TYPES.undefined]: [
-          ...printStaticStr('undefined')
-        ],
-        [TYPES.function]: [
-          ...printStaticStr('function () {}')
-        ],
-        [TYPES.object]: [
-          [ Opcodes.local_get, 0 ],
-          Opcodes.i32_to_u,
-          [ Opcodes.if, Blocktype.void ],
-          ...printStaticStr('{}'),
-          [ Opcodes.else ],
-          ...printStaticStr('null'),
-          [ Opcodes.end ]
-        ],
-        default: [
-          [ Opcodes.local_get, 0 ],
-          [ Opcodes.call, importedFuncs.print ],
-        ]
-      }, Blocktype.void)
-    ]
-  };
-
-  // todo: add more console funcs
-
-
   this.isNaN = {
     floatOnly: true,
     params: [ valtypeBinary ],