porffor 0.41.1 → 0.41.3

package/compiler/codegen.js

@@ -601,18 +601,21 @@ const truthy = (scope, wasm, type, intIn = false, intOut = false, forceTruthyMod
         [ Opcodes.i32_eqz ], */
         ...(intOut ? [] : [ Opcodes.i32_from_u ])
       ] ],
-      // [ [ TYPES.boolean, TYPES.number, TYPES.object, TYPES.undefined, TYPES.empty ], def ],
-      // [ 'default', [
-      //   // other types are always truthy
-      //   ...(!useTmp ? [ [ Opcodes.drop ] ] : []),
-      //   ...number(1, intOut ? Valtype.i32 : valtypeBinary)
-      // ] ]
+
       ...(truthyMode === 'full' ? [ [ [ TYPES.booleanobject, TYPES.numberobject ], [
         // always truthy :))
         ...(!useTmp ? [ [ Opcodes.drop ] ] : []),
         ...number(1, intOut ? Valtype.i32 : valtypeBinary)
       ] ] ] : []),
+
       [ 'default', def ]
+
+      // [ [ TYPES.boolean, TYPES.number, TYPES.object, TYPES.undefined, TYPES.empty ], def ],
+      // [ 'default', [
+      //   // other types are always truthy
+      //   ...(!useTmp ? [ [ Opcodes.drop ] ] : []),
+      //   ...number(1, intOut ? Valtype.i32 : valtypeBinary)
+      // ] ]
     ], intOut ? Valtype.i32 : valtypeBinary)
   ];
 };
@@ -666,18 +669,21 @@ const falsy = (scope, wasm, type, intIn = false, intOut = false, forceTruthyMode
         [ Opcodes.i32_eqz ],
         ...(intOut ? [] : [ Opcodes.i32_from_u ])
       ] ],
-      // [ [ TYPES.boolean, TYPES.number, TYPES.object, TYPES.undefined, TYPES.empty ], def ],
-      // [ 'default', [
-      //   // other types are always truthy
-      //   ...(!useTmp ? [ [ Opcodes.drop ] ] : []),
-      //   ...number(0, intOut ? Valtype.i32 : valtypeBinary)
-      // ] ]
+
       ...(truthyMode === 'full' ? [ [ [ TYPES.booleanobject, TYPES.numberobject ], [
         // always truthy :))
         ...(!useTmp ? [ [ Opcodes.drop ] ] : []),
         ...number(0, intOut ? Valtype.i32 : valtypeBinary)
       ] ] ] : []),
+
       [ 'default', def ]
+
+      // [ [ TYPES.boolean, TYPES.number, TYPES.object, TYPES.undefined, TYPES.empty ], def ],
+      // [ 'default', [
+      //   // other types are always truthy
+      //   ...(!useTmp ? [ [ Opcodes.drop ] ] : []),
+      //   ...number(0, intOut ? Valtype.i32 : valtypeBinary)
+      // ] ]
     ], intOut ? Valtype.i32 : valtypeBinary)
   ];
 };
@@ -749,7 +755,8 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
   // todo: niche null hell with 0
 
   if ((knownLeft === TYPES.string || knownRight === TYPES.string) ||
-      (knownLeft === TYPES.bytestring || knownRight === TYPES.bytestring)) {
+      (knownLeft === TYPES.bytestring || knownRight === TYPES.bytestring) ||
+      (knownLeft === TYPES.stringobject || knownRight === TYPES.stringobject)) {
     if (op === '+') {
       // string concat (a + b)
       return concatStrings(scope, left, right, leftType, rightType);
@@ -887,6 +894,7 @@ const generateBinaryExp = (scope, decl, _global, _name) => {
         // switch primitive types to primitive object types
         if (checkType === TYPES.number) checkType = TYPES.numberobject;
         if (checkType === TYPES.boolean) checkType = TYPES.booleanobject;
+        if (checkType === TYPES.string) checkType = TYPES.stringobject;
 
         // currently unsupported types
         if ([TYPES.string].includes(checkType)) {
@@ -1269,6 +1277,14 @@ const getNodeType = (scope, node) => {
 
     if (node.type === 'CallExpression' || node.type === 'NewExpression') {
       const name = node.callee.name;
+
+      // hack: special primitive object types
+      if (node.type === 'NewExpression') {
+        if (name === 'Number') return TYPES.numberobject;
+        if (name === 'Boolean') return TYPES.booleanobject;
+        if (name === 'String') return TYPES.stringobject;
+      }
+
       if (name == null) {
         // iife
         if (scope.locals['#last_type']) return getLastType(scope);
@@ -1375,11 +1391,14 @@ const getNodeType = (scope, node) => {
 
       if ((knownLeft != null || knownRight != null) && !(
         (knownLeft === TYPES.string || knownRight === TYPES.string) ||
-        (knownLeft === TYPES.bytestring || knownRight === TYPES.bytestring)
+        (knownLeft === TYPES.bytestring || knownRight === TYPES.bytestring) ||
+        (knownLeft === TYPES.stringobject || knownRight === TYPES.stringobject)
       )) return TYPES.number;
 
-      if (knownLeft === TYPES.string || knownRight === TYPES.string)
-        return TYPES.string;
+      if (
+        (knownLeft === TYPES.string || knownRight === TYPES.string) ||
+        (knownLeft === TYPES.stringobject || knownRight === TYPES.stringobject)
+      ) return TYPES.string;
 
       // guess bytestring, could really be bytestring or string
       if (knownLeft === TYPES.bytestring || knownRight === TYPES.bytestring)
@@ -1727,6 +1746,7 @@ const aliasPrimObjsBC = bc => {
 
   add(TYPES.boolean, TYPES.booleanobject);
   add(TYPES.number, TYPES.numberobject);
+  add(TYPES.string, TYPES.stringobject);
 };
 
 const createThisArg = (scope, decl) => {
@@ -2100,6 +2120,9 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
         };
       }
 
+      // alias primitive prototype with primitive object types
+      aliasPrimObjsBC(protoBC);
+
       return [
         ...(usePointerCache ? [
           ...rawPointer,
@@ -6195,6 +6218,7 @@ const generateFunc = (scope, decl) => {
       ].includes(typeAnno.type)) {
         let types = [ typeAnno.type ];
         if (typeAnno.type === TYPES.number) types.push(TYPES.numberobject);
+        if (typeAnno.type === TYPES.string) types.push(TYPES.stringobject);
 
         prelude.push(
           ...typeIsNotOneOf([ [ Opcodes.local_get, func.locals[name].idx + 1 ] ], types),

package/compiler/types.js

@@ -76,6 +76,7 @@ registerInternalType('Promise');
 
 registerInternalType('BooleanObject');
 registerInternalType('NumberObject');
+registerInternalType('StringObject');
 
 registerInternalType('Error');
 registerInternalType('AggregateError');

package/compiler/wrap.js

@@ -159,6 +159,8 @@ ${flags & 0b0001 ? `    get func idx: ${get}
       return Array.from(read(Uint8Array, memory, value + 4, length)).map(x => String.fromCharCode(x)).join('');
     }
 
+    case TYPES.stringobject: return new String(porfToJSValue({ memory, funcs, pages }, value, TYPES.string));
+
     case TYPES.array: {
       let length = read(Uint32Array, memory, value, 1)[0];
       if (override) length = override;

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.41.1+1afa668c0",
+  "version": "0.41.3+da80ef2f5",
   "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.41.1+1afa668c0';
+globalThis.version = '0.41.3+da80ef2f5';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {

package/r.js

@@ -1,5 +0,0 @@
-class A {
-  constructor() {
-    this.a = "a";
-  }
-}