porffor 0.34.9 → 0.34.11

package/compiler/assemble.js

@@ -103,9 +103,6 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
     importDelta = importedFuncs.length - importFuncs.length;
   }
 
-  // fix call indexes for non-imports
-  // also fix call_indirect types
-  // also encode call indexes
   for (const f of funcs) {
     f.asmIndex = f.index - importDelta;
   }
@@ -320,7 +317,8 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
         // encode call ops as unsigned leb128 from raw number
         if ((o[0] === Opcodes.call /* || o[0] === Opcodes.return_call */) && o[1] >= importedFuncs.length) {
           const n = o[1] - importDelta;
-          o = [ o[0] ];
+          // o = [ o[0] ];
+          o = [ Opcodes.call ];
           unsignedLEB128_into(n, o);
         }
 
@@ -377,8 +375,7 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
     encodeVector(data.map(x => {
       if (Prefs.d && x.bytes.length > PageSize) log.warning('assemble', `data (${x.page}) has more bytes than Wasm page size! (${x.bytes.length})`);
 
-      const bytes = encodeVector(x.bytes);
-
+      const bytes = unsignedLEB128(x.bytes.length).concat(x.bytes);
       if (x.page != null) {
         // type: active
         let offset = pages.get(x.page).ind * pageSize;

package/compiler/builtins/__internal_object.ts

@@ -5,8 +5,13 @@ export const __Porffor_object_getObject = (obj: any): any => {
     let underlying: object = underlyingFuncObjs.get(funcI32);
     if (underlying == null) {
       underlying = {};
-      underlying.prototype = {};
-      underlying.prototype.constructor = obj;
+
+      const proto = {};
+      const key1: bytestring = 'prototype';
+      __Porffor_object_expr_initWithFlags(underlying, key1, proto, 0b1000);
+
+      const key2: bytestring = 'constructor';
+      __Porffor_object_expr_initWithFlags(proto, key2, obj, 0b1010);
 
       underlyingFuncObjs.set(funcI32, underlying);
     }

package/compiler/builtins/_internal_object.ts

@@ -572,6 +572,30 @@ export const __Porffor_object_expr_init = (obj: any, key: any, value: any): void
     0, 12);
 };
 
+export const __Porffor_object_expr_initWithFlags = (obj: any, key: any, value: any, flags: i32): void => {
+  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_getObject(obj);
+  let entryPtr: i32 = __Porffor_object_lookup(obj, key);
+  if (entryPtr == -1) {
+    // add new entry
+    // bump size +1
+    const size: i32 = Porffor.wasm.i32.load(obj, 0, 0);
+    Porffor.wasm.i32.store(obj, size + 1, 0, 0);
+
+    // entryPtr = current end of object
+    entryPtr = Porffor.wasm`local.get ${obj}` + 5 + size * 14;
+
+    __Porffor_object_writeKey(entryPtr, key);
+  }
+
+  // write new value value (lol)
+  Porffor.wasm.f64.store(entryPtr, value, 0, 4);
+
+  // write new tail (value type + flags)
+  Porffor.wasm.i32.store16(entryPtr,
+    flags + (Porffor.wasm`local.get ${value+1}` << 8),
+    0, 12);
+};
+
 // used for { get foo() {} }
 export const __Porffor_object_expr_get = (obj: any, key: any, get: any): void => {
   if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_getObject(obj);

package/compiler/builtins/date.ts

@@ -1746,9 +1746,7 @@ export const __ecma262_ToDateString = (tv: number) => {
   out.length = 0;
 
   // 1. If tv is NaN, return "Invalid Date".
-  if (Number.isNaN(tv)) {
-    return out = 'Invalid Date';
-  }
+  if (Number.isNaN(tv)) return out = 'Invalid Date';
 
   // 2. Let t be LocalTime(tv).
   const t: number = __ecma262_LocalTime(tv);
@@ -1788,10 +1786,7 @@ export const __Date_prototype_toTimeString = (_this: Date) => {
   let out: bytestring = Porffor.allocateBytes(27);
   out.length = 0;
 
-  if (Number.isNaN(tv)) {
-    out = 'Invalid Date';
-    return out;
-  }
+  if (Number.isNaN(tv)) return out = 'Invalid Date';
 
   // 5. Let t be LocalTime(tv).
   const t: number = __ecma262_LocalTime(tv);
@@ -1816,10 +1811,7 @@ export const __Date_prototype_toDateString = (_this: Date) => {
   let out: bytestring = Porffor.allocateBytes(20);
   out.length = 0;
 
-  if (Number.isNaN(tv)) {
-    out = 'Invalid Date';
-    return out;
-  }
+  if (Number.isNaN(tv)) return out = 'Invalid Date';
 
   // 5. Let t be LocalTime(tv).
   const t: number = __ecma262_LocalTime(tv);

package/compiler/builtins/string.ts

@@ -1495,6 +1495,41 @@ export const __ByteString_prototype_localeCompare = (_this: bytestring, compareS
 };
 
 
+export const __String_prototype_isWellFormed = (_this: string) => {
+  let ptr: i32 = Porffor.wasm`local.get ${_this}`;
+  const endPtr: i32 = ptr + _this.length * 2;
+  while (ptr < endPtr) {
+    const c1: i32 = Porffor.wasm.i32.load16_u(ptr, 0, 4);
+
+    if (Porffor.fastAnd(c1 >= 0xDC00, c1 <= 0xDFFF)) {
+      // lone trailing surrogate, bad
+      return false;
+    }
+
+    if (Porffor.fastAnd(c1 >= 0xD800, c1 <= 0xDBFF)) {
+      // leading surrogate, peek if next is trailing
+      const c2: i32 = ptr + 2 < endPtr ? Porffor.wasm.i32.load16_u(ptr + 2, 0, 4) : 0;
+
+      if (Porffor.fastAnd(c2 >= 0xDC00, c2 <= 0xDFFF)) {
+        // next is trailing surrogate, skip it too
+        ptr += 2;
+      } else {
+        // lone leading surrogate, bad
+        return false;
+      }
+    }
+
+    ptr += 2;
+  }
+
+  return true;
+};
+
+export const __ByteString_prototype_isWellFormed = (_this: bytestring) => {
+  // bytestrings cannot have surrogates, so always true
+  return true;
+};
+
 export const __String_prototype_toWellFormed = (_this: string) => {
   let out: string = Porffor.allocate();
   Porffor.clone(_this, out);

package/compiler/builtins_precompiled.js

@@ -3,10 +3,10 @@ import { number } from './embedding.js';
 
 export const BuiltinFuncs = function() {
 this.__Porffor_object_getObject = {
-wasm:(_,{glbl,builtin,internalThrow})=>[[32,1],[184],[68,6],[97],[4,64],[32,0],[33,2],...glbl(35,'underlyingFuncObjs',124),[33,4],[65,20],[33,5],[32,4],[32,5],[32,2],[65,1],[16,builtin('__Map_prototype_get')],[26],[34,3],[68,0],[97],[4,64],[16,builtin('__Porffor_allocate')],[184],[34,3],[33,9],[16,builtin('__Porffor_allocate')],[34,11],[65,9],[54,1,0],[32,11],[65,240,0],[58,0,4],[32,11],[65,242,0],[58,0,5],[32,11],[65,239,0],[58,0,6],[32,11],[65,244,0],[58,0,7],[32,11],[65,239,0],[58,0,8],[32,11],[65,244,0],[58,0,9],[32,11],[65,249,0],[58,0,10],[32,11],[65,240,0],[58,0,11],[32,11],[65,229,0],[58,0,12],[32,11],[184],[33,10],[32,9],[252,3],[65,7],[32,10],[65,195,1],[16,builtin('__ecma262_ToPropertyKey')],[33,12],[252,3],[32,12],[16,builtin('__Porffor_allocate')],[184],[65,7],[16,builtin('__Porffor_object_set')],[26],[26],[32,3],[33,9],[65,128,128,4],[34,11],[65,9],[54,1,0],[32,11],[65,240,0],[58,0,4],[32,11],[65,242,0],[58,0,5],[32,11],[65,239,0],[58,0,6],[32,11],[65,244,0],[58,0,7],[32,11],[65,239,0],[58,0,8],[32,11],[65,244,0],[58,0,9],[32,11],[65,249,0],[58,0,10],[32,11],[65,240,0],[58,0,11],[32,11],[65,229,0],[58,0,12],[32,11],[184],[33,13],[32,9],[252,3],[65,7],[32,13],[65,195,1],[16,builtin('__ecma262_ToPropertyKey')],[33,12],[252,3],[32,12],[16,builtin('__Porffor_object_get')],[33,6],[33,9],[16,builtin('__Porffor_allocate')],[34,11],[65,11],[54,1,0],[32,11],[65,227,0],[58,0,4],[32,11],[65,239,0],[58,0,5],[32,11],[65,238,0],[58,0,6],[32,11],[65,243,0],[58,0,7],[32,11],[65,244,0],[58,0,8],[32,11],[65,242,0],[58,0,9],[32,11],[65,245,0],[58,0,10],[32,11],[65,227,0],[58,0,11],[32,11],[65,244,0],[58,0,12],[32,11],[65,239,0],[58,0,13],[32,11],[65,242,0],[58,0,14],[32,11],[184],[33,10],[32,6],[33,16],[2,124],[32,16],[65,6],[70],[4,64,"TYPESWITCH|Function"],[32,9],[252,3],[32,6],[32,10],[65,195,1],[16,builtin('__ecma262_ToPropertyKey')],[33,12],[252,3],[32,12],[32,0],[32,1],[16,builtin('__Porffor_object_set')],[26],[12,1],[11],[32,16],[65,7],[70],[4,64,"TYPESWITCH|Object"],[32,9],[252,3],[32,6],[32,10],[65,195,1],[16,builtin('__ecma262_ToPropertyKey')],[33,12],[252,3],[32,12],[32,0],[32,1],[16,builtin('__Porffor_object_set')],[26],[12,1],[11],[32,16],[65,208,0],[70],[4,64,"TYPESWITCH|Array"],[32,9],[252,3],[32,10],[252,3],[65,9],[108],[106],[34,8],[32,0],[34,7],[57,0,4],[32,8],[32,1],[58,0,12],[32,7],[12,1],[11],[32,16],[65,216,0],[70],[4,64,"TYPESWITCH|Uint8Array"],[32,9],[252,3],[40,0,4],[32,10],[252,3],[106],[32,0],[34,7],[252,3],[58,0,4],[32,7],[12,1],[11],[32,16],[65,217,0],[70],[4,64,"TYPESWITCH|Int8Array"],[32,9],[252,3],[40,0,4],[32,10],[252,3],[106],[32,0],[34,7],[252,2],[58,0,4],[32,7],[12,1],[11],[32,16],[65,218,0],[70],[4,64,"TYPESWITCH|Uint8ClampedArray"],[32,9],[252,3],[40,0,4],[32,10],[252,3],[106],[32,0],[34,7],[68,0],[165],[68,255],[164],[252,3],[58,0,4],[32,7],[12,1],[11],[32,16],[65,219,0],[70],[4,64,"TYPESWITCH|Uint16Array"],[32,9],[252,3],[40,0,4],[32,10],[252,3],[65,2],[108],[106],[32,0],[34,7],[252,3],[59,0,4],[32,7],[12,1],[11],[32,16],[65,220,0],[70],[4,64,"TYPESWITCH|Int16Array"],[32,9],[252,3],[40,0,4],[32,10],[252,3],[65,2],[108],[106],[32,0],[34,7],[252,2],[59,0,4],[32,7],[12,1],[11],[32,16],[65,221,0],[70],[4,64,"TYPESWITCH|Uint32Array"],[32,9],[252,3],[40,0,4],[32,10],[252,3],[65,4],[108],[106],[32,0],[34,7],[252,3],[54,0,4],[32,7],[12,1],[11],[32,16],[65,222,0],[70],[4,64,"TYPESWITCH|Int32Array"],[32,9],[252,3],[40,0,4],[32,10],[252,3],[65,4],[108],[106],[32,0],[34,7],[252,2],[54,0,4],[32,7],[12,1],[11],[32,16],[65,223,0],[70],[4,64,"TYPESWITCH|Float32Array"],[32,9],[252,3],[40,0,4],[32,10],[252,3],[65,4],[108],[106],[32,0],[34,7],[182],[56,0,4],[32,7],[12,1],[11],[32,16],[65,224,0],[70],[4,64,"TYPESWITCH|Float64Array"],[32,9],[252,3],[40,0,4],[32,10],[252,3],[65,8],[108],[106],[32,0],[34,7],[57,0,4],[32,7],[12,1],[11],[32,16],[65,128,1],[70],[4,64,"TYPESWITCH|undefined"],...internalThrow(_,'TypeError',`Cannot set property of undefined`),[68,0],[12,1],[11],[32,0],[11,"TYPESWITCH_end"],[26],...glbl(35,'underlyingFuncObjs',124),[33,4],[65,20],[33,5],[32,4],[32,5],[32,2],[65,1],[32,3],[65,7],[16,builtin('__Map_prototype_set')],[33,6],[26],[11],[32,3],[65,7],[15],[11],[32,0],[32,1],[15]],
+wasm:(_,{allocPage,glbl,builtin})=>[[32,1],[184],[68,6],[97],[4,64],[32,0],[33,2],...glbl(35,'underlyingFuncObjs',124),[33,4],[65,20],[33,5],[32,4],[32,5],[32,2],[65,1],[16,builtin('__Map_prototype_get')],[26],[34,3],[68,0],[97],[4,64],[16,builtin('__Porffor_allocate')],[184],[33,3],[16,builtin('__Porffor_allocate')],[184],[33,7],[65,7],[33,8],...number(allocPage(_,'bytestring: __Porffor_object_getObject/key1','i8'),124),[33,9],[32,3],[252,2],[65,7],[32,9],[252,2],[65,195,1],[32,7],[32,8],[65,8],[65,1],[16,builtin('__Porffor_object_expr_initWithFlags')],[33,6],[183],[26],...number(allocPage(_,'bytestring: __Porffor_object_getObject/key2','i8'),124),[33,10],[32,7],[252,2],[32,8],[32,10],[252,2],[65,195,1],[32,0],[32,1],[65,10],[65,1],[16,builtin('__Porffor_object_expr_initWithFlags')],[33,6],[183],[26],...glbl(35,'underlyingFuncObjs',124),[33,4],[65,20],[33,5],[32,4],[32,5],[32,2],[65,1],[32,3],[65,7],[16,builtin('__Map_prototype_set')],[33,6],[26],[11],[32,3],[65,7],[15],[11],[32,0],[32,1],[15]],
 params:[124,127],typedParams:1,returns:[124,127],typedReturns:1,
-locals:[124,124,124,127,127,124,127,124,124,127,127,124,127,127,127],localNames:["obj","obj#type","funcI32","underlying","#proto_target","#proto_target#type","#last_type","#member_setter_val_tmp","#member_setter_ptr_tmp","#member_obj","#member_prop_assign","#makearray_pointer_tmp","#swap","#member_prop","#loadArray_offset","#member_allocd","#typeswitch_tmp1"],
-globalInits:{underlyingFuncObjs:(_,{glbl,builtin})=>[[68,1],[65,6],[16,builtin('__Porffor_allocate')],[184],[65,7],[68,0],[65,128,1],[16,builtin('Map')],[26],...glbl(36,'underlyingFuncObjs',124)]},
+locals:[124,124,124,127,127,124,127,124,124],localNames:["obj","obj#type","funcI32","underlying","#proto_target","#proto_target#type","#last_type","proto","proto#type","key1","key2"],
+globalInits:{underlyingFuncObjs:(_,{glbl,builtin})=>[[68,1],[65,6],[16,builtin('__Porffor_allocate')],[184],[65,7],[68,0],[65,128,1],[16,builtin('Map')],[26],...glbl(36,'underlyingFuncObjs',124)]},data:{"bytestring: __Porffor_object_getObject/key1":[9,0,0,0,112,114,111,116,111,116,121,112,101],"bytestring: __Porffor_object_getObject/key2":[11,0,0,0,99,111,110,115,116,114,117,99,116,111,114]},
 };
 this.__Porffor_strcmp = {
 wasm:()=>[[32,0],[32,2],[70],[4,64],[65,1],[65,2],[15],[11],[32,0],[40,0,0],[33,4],[32,2],[40,0,0],[33,5],[32,4],[32,5],[71],[4,64],[65,0],[65,2],[15],[11],[32,1],[65,195,1],[70],[4,64],[32,3],[65,195,1],[70],[4,64],[65,0],[33,6],[3,64],[32,6],[32,4],[72],[4,64],[32,0],[32,6],[106],[45,0,4],[32,2],[32,6],[106],[45,0,4],[71],[4,64],[65,0],[65,2],[15],[11],[32,6],[65,1],[106],[33,6],[12,1],[11],[11],[65,1],[65,2],[15],[5],[65,0],[33,6],[3,64],[32,6],[32,4],[72],[4,64],[32,0],[32,6],[106],[45,0,4],[32,2],[32,6],[65,2],[108],[106],[47,0,4],[71],[4,64],[65,0],[65,2],[15],[11],[32,6],[65,1],[106],[33,6],[12,1],[11],[11],[65,1],[65,2],[15],[11],[5],[32,3],[65,195,1],[70],[4,64],[65,0],[33,6],[3,64],[32,6],[32,4],[72],[4,64],[32,0],[32,6],[65,2],[108],[106],[47,0,4],[32,2],[32,6],[106],[45,0,4],[71],[4,64],[65,0],[65,2],[15],[11],[32,6],[65,1],[106],[33,6],[12,1],[11],[11],[65,1],[65,2],[15],[5],[65,0],[33,6],[3,64],[32,6],[32,4],[72],[4,64],[32,0],[32,6],[65,2],[108],[106],[47,0,4],[32,2],[32,6],[65,2],[108],[106],[47,0,4],[71],[4,64],[65,0],[65,2],[15],[11],[32,6],[65,1],[106],[33,6],[12,1],[11],[11],[65,1],[65,2],[15],[11],[11],[65,0],[65,128,1],[15]],
@@ -105,6 +105,11 @@ wasm:(_,{builtin})=>[[32,1],[65,7],[71],[4,64],[32,0],[184],[32,1],[16,builtin('
 params:[127,127,127,127,124,127],typedParams:1,returns:[127,127],typedReturns:1,
 locals:[127,127,127],localNames:["obj","obj#type","key","key#type","value","value#type","#last_type","entryPtr","size"],
 };
+this.__Porffor_object_expr_initWithFlags = {
+wasm:(_,{builtin})=>[[32,1],[65,7],[71],[4,64],[32,0],[184],[32,1],[16,builtin('__Porffor_object_getObject')],[33,8],[252,2],[34,0],[32,8],[33,1],[26],[11],[32,0],[32,1],[32,2],[32,3],[16,builtin('__Porffor_object_lookup')],[26],[34,9],[65,127],[70],[4,64],[32,0],[40,0,0],[33,10],[32,0],[32,10],[65,1],[106],[54,0,0],[32,0],[65,5],[106],[32,10],[65,14],[108],[106],[34,9],[65,1],[32,2],[32,3],[16,builtin('__Porffor_object_writeKey')],[33,8],[26],[11],[32,9],[32,4],[57,0,4],[32,9],[32,6],[32,5],[65,8],[116],[106],[59,0,12],[65,0],[65,128,1],[15]],
+params:[127,127,127,127,124,127,127,127],typedParams:1,returns:[127,127],typedReturns:1,
+locals:[127,127,127],localNames:["obj","obj#type","key","key#type","value","value#type","flags","flags#type","#last_type","entryPtr","size"],
+};
 this.__Porffor_object_expr_get = {
 wasm:(_,{builtin})=>[[32,1],[65,7],[71],[4,64],[32,0],[184],[32,1],[16,builtin('__Porffor_object_getObject')],[33,6],[252,2],[34,0],[32,6],[33,1],[26],[11],[32,0],[32,1],[32,2],[32,3],[16,builtin('__Porffor_object_lookup')],[26],[33,7],[65,0],[33,8],[65,128,1],[33,9],[32,7],[65,127],[70],[4,64],[32,0],[40,0,0],[33,10],[32,0],[32,10],[65,1],[106],[54,0,0],[32,0],[65,5],[106],[32,10],[65,14],[108],[106],[34,7],[65,1],[32,2],[32,3],[16,builtin('__Porffor_object_writeKey')],[33,6],[26],[5],[32,7],[65,1],[16,builtin('__Porffor_object_accessorSet')],[33,9],[33,8],[11],[32,7],[32,4],[32,5],[32,8],[32,9],[16,builtin('__Porffor_object_packAccessor')],[33,6],[57,0,4],[32,7],[65,15],[65,1],[65,8],[116],[106],[59,0,12],[65,0],[65,128,1],[15]],
 params:[127,127,127,127,127,127],typedParams:1,returns:[127,127],typedReturns:1,
@@ -2248,6 +2253,16 @@ wasm:(_,{builtin,internalThrow})=>[[32,2],[184],[32,3],[16,builtin('__ecma262_To
 params:[127,127,127,127],typedParams:1,returns:[127,127],typedReturns:1,
 locals:[127,127,127,127,127,127,127,127,127,127,127],localNames:["_this","_this#type","compareString","compareString#type","#last_type","thisLen","compareLen","maxLen","i","a","__proto_length_cache","__proto_pointer_cache","__charCodeAt_tmp","b","#typeswitch_tmp1"],
 };
+this.__String_prototype_isWellFormed = {
+wasm:()=>[[32,0],[34,2],[32,0],[40,1,0],[65,2],[108],[106],[33,3],[3,64],[32,2],[32,3],[72],[4,64],[32,2],[47,0,4],[34,4],[65,128,184,3],[78],[32,4],[65,255,191,3],[76],[113],[4,64],[65,0],[65,2],[15],[11],[32,4],[65,128,176,3],[78],[32,4],[65,255,183,3],[76],[113],[4,64],[32,2],[65,2],[106],[32,3],[72],[4,127],[32,2],[65,2],[106],[47,0,4],[65,1],[33,6],[5],[65,0],[65,1],[33,6],[11],[34,5],[65,128,184,3],[78],[32,5],[65,255,191,3],[76],[113],[4,64],[32,2],[65,2],[106],[33,2],[5],[65,0],[65,2],[15],[11],[11],[32,2],[65,2],[106],[33,2],[12,1],[11],[11],[65,1],[65,2],[15]],
+params:[127,127],typedParams:1,returns:[127,127],typedReturns:1,
+locals:[127,127,127,127,127],localNames:["_this","_this#type","ptr","endPtr","c1","c2","#last_type"],
+};
+this.__ByteString_prototype_isWellFormed = {
+wasm:()=>[[65,1],[65,2],[15]],
+params:[127,127],typedParams:1,returns:[127,127],typedReturns:1,
+locals:[],localNames:["_this","_this#type"],
+};
 this.__String_prototype_toWellFormed = {
 wasm:(_,{builtin})=>[[16,builtin('__Porffor_allocate')],[33,2],[32,0],[32,2],[16,builtin('__Porffor_clone')],[32,2],[34,3],[32,2],[40,1,0],[65,2],[108],[106],[33,4],[3,64],[32,3],[32,4],[72],[4,64],[32,3],[47,0,4],[34,5],[65,128,184,3],[78],[32,5],[65,255,191,3],[76],[113],[4,64],[32,3],[65,253,255,3],[59,0,4],[11],[32,5],[65,128,176,3],[78],[32,5],[65,255,183,3],[76],[113],[4,64],[32,3],[65,2],[106],[32,4],[72],[4,127],[32,3],[65,2],[106],[47,0,4],[65,1],[33,7],[5],[65,0],[65,1],[33,7],[11],[34,6],[65,128,184,3],[78],[32,6],[65,255,191,3],[76],[113],[4,64],[32,3],[65,2],[106],[33,3],[5],[32,3],[65,253,255,3],[59,0,4],[11],[11],[32,3],[65,2],[106],[33,3],[12,1],[11],[11],[32,2],[65,195,0],[15]],
 params:[127,127],typedParams:1,returns:[127,127],typedReturns:1,

package/compiler/codegen.js

@@ -102,7 +102,7 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
       return cacheAst(decl, generateNew(scope, decl, global, name));
 
     case 'ThisExpression':
-      return cacheAst(decl, generateThis(scope, decl, global, name));
+      return cacheAst(decl, generateThis(scope, decl));
 
     case 'Literal':
       return cacheAst(decl, generateLiteral(scope, decl, global, name));
@@ -2629,7 +2629,7 @@ const generateNew = (scope, decl, _global, _name) => generateCall(scope, {
   _new: true
 }, _global, _name);
 
-const generateThis = (scope, decl, _global, _name) => {
+const generateThis = (scope, decl) => {
   if (!scope.constr) {
     // this in a non-constructor context is a reference to globalThis
     return [
@@ -2639,7 +2639,7 @@ const generateThis = (scope, decl, _global, _name) => {
   }
 
   // opt: do not check for pure constructors
-  if (scope._onlyConstr) return [
+  if (scope._onlyConstr || scope._onlyThisMethod || decl._noGlobalThis) return [
     [ Opcodes.local_get, scope.locals['#this'].idx ],
     ...setLastType(scope, [ [ Opcodes.local_get, scope.locals['#this#type'].idx ] ])
   ];
@@ -5163,7 +5163,7 @@ const generateObject = (scope, decl, global = false, name = '$undeclared') => {
 
     for (const x of decl.properties) {
       // method, shorthand are made into useful values by parser for us :)
-      const { type, argument, computed, kind, key, value } = x;
+      let { type, argument, computed, kind, key, value } = x;
 
       if (type === 'SpreadElement') {
         out.push(
@@ -5189,6 +5189,18 @@ const generateObject = (scope, decl, global = false, name = '$undeclared') => {
         value: key.name
       };
 
+      if (isFuncType(value.type)) {
+        let id = value.id;
+
+        // todo: support computed names properly
+        if (typeof k.value === 'string') id ??= {
+          type: 'Identifier',
+          name: k.value
+        };
+
+        value = { ...value, id };
+      }
+
       out.push(
         [ Opcodes.local_get, tmp ],
         ...number(TYPES.object, Valtype.i32),
@@ -5695,7 +5707,7 @@ const generateClass = (scope, decl) => {
         body: []
       }
     }),
-    id: root,
+    id: root
   };
 
   const [ func, out ] = generateFunc(scope, {
@@ -5759,11 +5771,28 @@ const generateClass = (scope, decl) => {
       outArr = func.wasm;
       outOp = 'unshift';
       object = {
-        type: 'ThisExpression'
+        type: 'ThisExpression',
+        _noGlobalThis: true
       };
       outScope = func;
     }
 
+    if (isFuncType(value.type) && type === 'MethodDefinition') {
+      let id = value.id;
+
+      // todo: support computed names properly
+      if (typeof k.value === 'string') id ??= {
+        type: 'Identifier',
+        name: k.value
+      };
+
+      value = {
+        ...value,
+        id,
+        _onlyThisMethod: true
+      };
+    }
+
     outArr[outOp](
       ...generate(outScope, object),
       Opcodes.i32_to_u,
@@ -5884,7 +5913,7 @@ const generateFunc = (scope, decl, outUnused = false) => {
       (decl.type && decl.type !== 'ArrowFunctionExpression' && decl.type !== 'Program') &&
       // not async or generator
       !decl.async && !decl.generator,
-    _onlyConstr: decl._onlyConstr,
+    _onlyConstr: decl._onlyConstr, _onlyThisMethod: decl._onlyThisMethod,
     strict: scope.strict,
 
     generate() {
@@ -5941,7 +5970,7 @@ const generateFunc = (scope, decl, outUnused = false) => {
         // todo: wrap in try and reject thrown value once supported
       }
 
-      if (!globalThis.precompile && func.constr) {
+      if (!globalThis.precompile && func.constr && !func._onlyThisMethod) {
         wasm.unshift(
           // opt: do not check for pure constructors
           ...(func._onlyConstr ? [] : [
@@ -5951,7 +5980,7 @@ const generateFunc = (scope, decl, outUnused = false) => {
             [ Opcodes.if, Blocktype.void ],
           ]),
             // set prototype of this ;)
-            ...generate(func, setObjProp({ type: 'ThisExpression' }, '__proto__', getObjProp(func.name, 'prototype'))),
+            ...generate(func, setObjProp({ type: 'ThisExpression', _noGlobalThis: true }, '__proto__', getObjProp(func.name, 'prototype'))),
           ...(func._onlyConstr ? [] : [ [ Opcodes.end ] ])
         );
       }

package/compiler/decompile.js

@@ -99,7 +99,7 @@ export default (wasm, name = '', ind = 0, locals = {}, params = [], returns = []
 
     if (inst[0] === Opcodes.call || inst[0] === Opcodes.return_call) {
       const idx = inst[1];
-      const callFunc = funcs.find(x => (x.asmIndex ?? x.index) === idx);
+      const callFunc = funcs.find(x => x.index === idx);
       if (callFunc) out += ` ;; $${callFunc.name} ${makeSignature(callFunc.params, callFunc.returns)}`;
       if (globalThis.importFuncs && idx < importFuncs.length) {
         const importFunc = importFuncs[idx];

package/compiler/precompile.js

@@ -59,6 +59,7 @@ const compile = async (file, _funcs) => {
   const paramOverrides = {
     __Porffor_object_set: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32 ],
     __Porffor_object_expr_init: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32 ],
+    __Porffor_object_expr_initWithFlags: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32, Valtype.i32, Valtype.i32 ],
     __Porffor_object_define: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32, Valtype.i32, Valtype.i32 ],
   };
 

package/compiler/prototype.js

@@ -296,80 +296,6 @@ export const PrototypeFuncs = function() {
       // load current string ind {arg}
       [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
       Opcodes.i32_from_u
-    ],
-
-    isWellFormed: (pointer, length, _1, _2, iTmp, iTmp2) => [
-      // note: we cannot presume it begins as 0 in case it was used previously
-      ...pointer,
-      [ Opcodes.local_set, iTmp ],
-
-      // use cached length as end pointer
-      ...length.getCachedI32(),
-      ...number(ValtypeSize.i16, Valtype.i32),
-      [ Opcodes.i32_mul ],
-      ...pointer,
-      [ Opcodes.i32_add ],
-      ...length.setCachedI32(),
-
-      [ Opcodes.loop, Blocktype.void ],
-
-      [ Opcodes.block, Blocktype.void ],
-
-      [ Opcodes.local_get, iTmp ],
-      [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
-      [ Opcodes.local_set, iTmp2 ],
-
-      // if not surrogate, continue
-      [ Opcodes.local_get, iTmp2 ],
-      ...number(0xF800, Valtype.i32),
-      [ Opcodes.i32_and ],
-      ...number(0xD800, Valtype.i32),
-      [ Opcodes.i32_ne ],
-      [ Opcodes.br_if, 0 ],
-
-      // if not leading surrogate, return false
-      [ Opcodes.local_get, iTmp2 ],
-      ...number(0xDC00, Valtype.i32),
-      [ Opcodes.i32_ge_s ],
-      [ Opcodes.if, Blocktype.void ],
-      ...number(0),
-      [ Opcodes.br, 3 ],
-      [ Opcodes.end ],
-
-      // if not followed by trailing surrogate, return false
-      [ Opcodes.local_get, iTmp ],
-      [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 + ValtypeSize.i16 ],
-      ...number(0xFC00, Valtype.i32),
-      [ Opcodes.i32_and ],
-      ...number(0xDC00, Valtype.i32),
-      [ Opcodes.i32_ne ],
-      [ Opcodes.if, Blocktype.void ],
-      ...number(0),
-      [ Opcodes.br, 3 ],
-      [ Opcodes.end ],
-
-      // bump index again since gone through two valid chars
-      [ Opcodes.local_get, iTmp ],
-      ...number(ValtypeSize.i16, Valtype.i32),
-      [ Opcodes.i32_add ],
-      [ Opcodes.local_set, iTmp ],
-
-      [ Opcodes.end ],
-
-      // bump pointer and loop if not at the end
-      [ Opcodes.local_get, iTmp ],
-      ...number(ValtypeSize.i16, Valtype.i32),
-      [ Opcodes.i32_add ],
-      [ Opcodes.local_tee, iTmp ],
-
-      ...length.getCachedI32(), // end pointer
-      [ Opcodes.i32_ne ],
-      [ Opcodes.br_if, 0 ],
-
-      [ Opcodes.end ],
-
-      // return true
-      ...number(1)
     ]
   };
 
@@ -380,10 +306,6 @@ export const PrototypeFuncs = function() {
   this[TYPES.string].charCodeAt.local = Valtype.i32;
   this[TYPES.string].charCodeAt.noPointerCache = zeroChecks.charcodeat;
 
-  this[TYPES.string].isWellFormed.local = Valtype.i32;
-  this[TYPES.string].isWellFormed.local2 = Valtype.i32;
-  this[TYPES.string].isWellFormed.returnType = TYPES.boolean;
-
   if (Prefs.bytestring) {
     this[TYPES.bytestring] = {
       at: (pointer, length, wIndex, wType, iTmp, _, arrayShell) => {
@@ -499,11 +421,6 @@ export const PrototypeFuncs = function() {
         // load current string ind {arg}
         [ Opcodes.i32_load8_u, 0, ValtypeSize.i32 ],
         Opcodes.i32_from_u
-      ],
-
-      isWellFormed: () => [
-        // we know it must be true as it is a bytestring lol
-        ...number(1)
       ]
     };
 
@@ -513,9 +430,5 @@ export const PrototypeFuncs = function() {
     this[TYPES.bytestring].charCodeAt.returnType = TYPES.number;
     this[TYPES.bytestring].charCodeAt.local = Valtype.i32;
     this[TYPES.bytestring].charCodeAt.noPointerCache = zeroChecks.charcodeat;
-
-    this[TYPES.bytestring].isWellFormed.local = Valtype.i32;
-    this[TYPES.bytestring].isWellFormed.local2 = Valtype.i32;
-    this[TYPES.bytestring].isWellFormed.returnType = TYPES.boolean;
   }
 };

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.34.9+9dbf4dfbb",
+  "version": "0.34.11+f7ca044b2",
   "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.34.9+9dbf4dfbb';
+globalThis.version = '0.34.11+f7ca044b2';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {