porffor 0.19.2 → 0.19.4

package/compiler/types.js

@@ -1,12 +1,13 @@
 export const TYPES = {
-  number: 0x00,
-  boolean: 0x01,
-  string: 0x02,
-  undefined: 0x03,
-  object: 0x04,
-  function: 0x05,
-  symbol: 0x06,
-  bigint: 0x07
+  empty: 0x00,
+  number: 0x01,
+  boolean: 0x02,
+  string: 0x03,
+  undefined: 0x04,
+  object: 0x05,
+  function: 0x06,
+  symbol: 0x07,
+  bigint: 0x08
 };
 
 // flags
@@ -19,7 +20,10 @@ export const TYPE_FLAGS = {
 // TYPES.string |= TYPE_FLAGS.iterable;
 TYPES.string |= TYPE_FLAGS.length;
 
+TYPES.undefined = TYPES.empty | TYPE_FLAGS.parity;
+
 export const TYPE_NAMES = {
+  [TYPES.empty]: 'empty',
   [TYPES.number]: 'Number',
   [TYPES.boolean]: 'Boolean',
   [TYPES.string]: 'String',
@@ -69,4 +73,5 @@ registerInternalType('Float32Array', ['iterable', 'length']);
 registerInternalType('Float64Array', ['iterable', 'length']);
 
 registerInternalType('WeakRef');
-registerInternalType('WeakSet');
+registerInternalType('WeakSet');
+registerInternalType('WeakMap');

package/compiler/wrap.js

@@ -27,8 +27,11 @@ export const writeByteStr = (memory, ptr, str) => {
 
 const porfToJSValue = ({ memory, funcs, pages }, value, type) => {
   switch (type) {
+    case TYPES.empty:
+    case TYPES.undefined:
+      return undefined;
+
     case TYPES.boolean: return Boolean(value);
-    case TYPES.undefined: return undefined;
     case TYPES.object: return value === 0 ? null : {};
 
     case TYPES.function: {
@@ -81,49 +84,6 @@ const porfToJSValue = ({ memory, funcs, pages }, value, type) => {
       return new Date(t);
     }
 
-    case TYPES.set: {
-      const size = (new Uint32Array(memory.buffer, value, 1))[0];
-
-      const out = new Set();
-      for (let i = 0; i < size; i++) {
-        const offset = value + 4 + (i * 9);
-
-        // have to slice because of memory alignment (?)
-        const v = (new Float64Array(memory.buffer.slice(offset, offset + 8), 0, 1))[0];
-        const t = (new Uint8Array(memory.buffer, offset + 8, 1))[0];
-
-        // console.log(`reading value at index ${i}...`)
-        // console.log('  memory:', Array.from(new Uint8Array(memory.buffer, offset, 9)).map(x => x.toString(16).padStart(2, '0')).join(' '));
-        // console.log('  read:', { value: v, type: t }, '\n');
-
-        out.add(porfToJSValue({ memory, funcs, pages }, v, t));
-      }
-
-      return out;
-    }
-
-    case TYPES.map: {
-      const [ keysPtr, valsPtr ] = (new Uint32Array(memory.buffer, value, 2));
-      const size = (new Uint32Array(memory.buffer, keysPtr, 1))[0];
-
-      const out = new Map();
-      for (let i = 0; i < size; i++) {
-        const offset = 4 + (i * 9);
-
-        const kValue = (new Float64Array(memory.buffer.slice(keysPtr + offset, keysPtr + offset + 8), 0, 1))[0];
-        const kType = (new Uint8Array(memory.buffer, keysPtr + offset + 8, 1))[0];
-        const k = porfToJSValue({ memory, funcs, pages }, kValue, kType);
-
-        const vValue = (new Float64Array(memory.buffer.slice(valsPtr + offset, valsPtr + offset + 8), 0, 1))[0];
-        const vType = (new Uint8Array(memory.buffer, valsPtr + offset + 8, 1))[0];
-        const v = porfToJSValue({ memory, funcs, pages }, vValue, vType);
-
-        out.set(k, v);
-      }
-
-      return out;
-    }
-
     case TYPES.symbol: {
       const descStore = pages.get('bytestring: __Porffor_symbol_descStore/ptr').ind * pageSize;
       if (!descStore) return Symbol();
@@ -184,10 +144,11 @@ const porfToJSValue = ({ memory, funcs, pages }, value, type) => {
       return new WeakRef(porfToJSValue({ memory, funcs, pages }, v, t));
     }
 
-    case TYPES.weakset: {
+    case TYPES.weakset:
+    case TYPES.set: {
       const size = (new Uint32Array(memory.buffer, value, 1))[0];
 
-      const out = new WeakSet();
+      const out = type === TYPES.weakset ? new WeakSet() : new Set();
       for (let i = 0; i < size; i++) {
         const offset = value + 4 + (i * 9);
         const v = (new Float64Array(memory.buffer.slice(offset, offset + 8), 0, 1))[0];
@@ -199,6 +160,29 @@ const porfToJSValue = ({ memory, funcs, pages }, value, type) => {
       return out;
     }
 
+    case TYPES.weakmap:
+    case TYPES.map: {
+      const [ keysPtr, valsPtr ] = (new Uint32Array(memory.buffer, value, 2));
+      const size = (new Uint32Array(memory.buffer, keysPtr, 1))[0];
+
+      const out = type === TYPES.weakmap ? new WeakMap() : new Map();
+      for (let i = 0; i < size; i++) {
+        const offset = 4 + (i * 9);
+
+        const kValue = (new Float64Array(memory.buffer.slice(keysPtr + offset, keysPtr + offset + 8), 0, 1))[0];
+        const kType = (new Uint8Array(memory.buffer, keysPtr + offset + 8, 1))[0];
+        const k = porfToJSValue({ memory, funcs, pages }, kValue, kType);
+
+        const vValue = (new Float64Array(memory.buffer.slice(valsPtr + offset, valsPtr + offset + 8), 0, 1))[0];
+        const vType = (new Uint8Array(memory.buffer, valsPtr + offset + 8, 1))[0];
+        const v = porfToJSValue({ memory, funcs, pages }, vValue, vType);
+
+        out.set(k, v);
+      }
+
+      return out;
+    }
+
     default: return value;
   }
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "a basic experimental wip aot optimizing js -> wasm engine/compiler/runtime in js",
-  "version": "0.19.2+5551e8046",
+  "version": "0.19.4+1dbbc5d08",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {},

package/runner/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
-globalThis.version = '0.19.2+5551e8046';
+globalThis.version = '0.19.4+1dbbc5d08';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {

package/compiler/builtins/weakset.ts

@@ -1,102 +0,0 @@
-import type {} from './porffor.d.ts';
-
-export const __WeakSet_prototype_has = (_this: WeakSet, value: any) => {
-  const size: number = Porffor.wasm.i32.load(_this, 0, 0);
-
-  for (let i: number = 0; i < size; i++) {
-    if (__Porffor_set_read(_this, i) === value) return true;
-  }
-
-  return false;
-};
-
-export const __WeakSet_prototype_add = (_this: WeakSet, value: any) => {
-  if (Porffor.rawType(value) < 0x04) throw new TypeError('Value in WeakSet needs to be an object or symbol');
-
-  const size: number = Porffor.wasm.i32.load(_this, 0, 0);
-
-  // check if already in set
-  for (let i: number = 0; i < size; i++) {
-    if (__Porffor_set_read(_this, i) === value) return _this;
-  }
-
-  // not, add it
-  // increment size by 1
-  Porffor.wasm.i32.store(_this, size + 1, 0, 0);
-
-  // write new value at end
-  __Porffor_set_write(_this, size, value);
-
-  return _this;
-};
-
-export const __WeakSet_prototype_delete = (_this: WeakSet, value: any) => {
-  const size: number = Porffor.wasm.i32.load(_this, 0, 0);
-
-  // check if already in set
-  for (let i: number = 0; i < size; i++) {
-    if (__Porffor_set_read(_this, i) === value) {
-      // found, delete
-      // decrement size by 1
-      Porffor.wasm.i32.store(_this, size - 1, 0, 0);
-
-      // offset all elements after by -1 ind
-      Porffor.wasm`
-local offset i32
-local.get ${i}
-i32.to_u
-i32.const 9
-i32.mul
-local.get ${_this}
-i32.to_u
-i32.add
-i32.const 4
-i32.add
-local.set offset
-
-;; dst = offset (this element)
-local.get offset
-
-;; src = offset + 9 (this element + 1 element)
-local.get offset
-i32.const 9
-i32.add
-
-;; size = (size - i - 1) * 9
-local.get ${size}
-local.get ${i}
-f64.sub
-i32.to_u
-i32.const 1
-i32.sub
-i32.const 9
-i32.mul
-
-memory.copy 0 0`;
-
-      return true;
-    }
-  }
-
-  // not, return false
-  return false;
-};
-
-export const WeakSet = function (iterable: any): WeakSet {
-  if (!new.target) throw new TypeError("Constructor Set requires 'new'");
-
-  const out: WeakSet = __Porffor_allocate();
-
-  if (Porffor.rawType(iterable) != Porffor.TYPES.undefined) for (const x of iterable) {
-    __WeakSet_prototype_add(out, x);
-  }
-
-  return out;
-};
-
-export const __WeakSet_prototype_toString = (_this: WeakSet) => {
-  const out: bytestring = '[object WeakSet]';
-  return out;
-};
-
-export const __WeakSet_prototype_toLocaleString = (_this: WeakSet) => __WeakSet_prototype_toString(_this);