porffor 0.2.0-e62542f → 0.2.0-e69a2a2

package/CONTRIBUTING.md

@@ -139,6 +139,7 @@ Here we define a built-in for Porffor. Notably:
 - We do not use `a.b.c`, instead we use `__a_b_c`
 - We use a `_this` argument, as `this` does not exist in Porffor yet
 - We use an arrow function
+- We do not set a return type as prototype methods cannot use them currently or errors can happen.
 
 ---
 
@@ -201,6 +202,7 @@ Store the character code into the `out` pointer variable, and increment it.
 - You might spot `Porffor.fastOr`/`Porffor.fastAnd`, these are non-short circuiting versions of `||`/`&&`, taking any number of conditions as arguments. You shouldn't don't need to use or worry about these.
 - **There are ~no objects, you cannot use them/literals.**
 - Attempt to avoid string/array-heavy code and use more variables instead if possible, easier on memory and CPU/perf.
+- Do not set a return type for prototype methods, it can cause errors/unexpected results.
 
 <br>
 

package/compiler/builtins/boolean.ts

@@ -0,0 +1,6 @@
+// 20.3.3.3 Boolean.prototype.valueOf ()
+// https://tc39.es/ecma262/#sec-boolean.prototype.valueof
+export const __Boolean_prototype_valueOf = (_this: boolean) => {
+  // 1. Return ? ThisBooleanValue(this value).
+  return _this;
+};

package/compiler/builtins/date.ts

@@ -2051,8 +2051,8 @@ export const __Date_prototype_toLocaleTimeString = (_this: Date, reserved1: any,
   return __Date_prototype_toTimeString(_this);
 };
 
-
 // 21.4.4.44 Date.prototype.valueOf ()
+// https://tc39.es/ecma262/#sec-date.prototype.valueof
 export const __Date_prototype_valueOf = (_this: Date) => {
   // 1. Let dateObject be the this value.
   // 2. Perform ? RequireInternalSlot(dateObject, [[DateValue]]).
@@ -2060,7 +2060,6 @@ export const __Date_prototype_valueOf = (_this: Date) => {
   return __Porffor_date_read(_this);
 };
 
-
 // 21.4.2.1 Date (...values)
 // https://tc39.es/ecma262/multipage/numbers-and-dates.html#sec-date
 export const Date = (): bytestring => {

package/compiler/builtins/escape.ts

@@ -1,7 +1,5 @@
 // @porf --funsafe-no-unlikely-proto-checks --valtype=i32
 
-import type {} from './porffor';
-
 export const escape = (input: string|bytestring): bytestring => {
   // we have no byte array yet so use bytestring with 0x00 and 0x01 via escape characters
   // 0 = should escape, 1 = should not escape

package/compiler/builtins/number.ts

@@ -524,4 +524,11 @@ export const __Number_prototype_toExponential = (_this: number, fractionDigits:
   out.length = outPtr - Porffor.wasm`local.get ${out}`;
 
   return out;
-};
+};
+
+// 21.1.3.7 Number.prototype.valueOf ()
+// https://tc39.es/ecma262/#sec-number.prototype.valueof
+export const __Number_prototype_valueOf = (_this: number) => {
+  // 1. Return ? ThisNumberValue(this value).
+  return _this;
+};

package/compiler/builtins/string.ts

@@ -1052,4 +1052,19 @@ export const __String_prototype_trim = (_this: string) => {
 export const __ByteString_prototype_trim = (_this: bytestring) => {
   // todo/perf: optimize and not just reuse
   return __ByteString_prototype_trimStart(__ByteString_prototype_trimEnd(_this));
+};
+
+
+// 22.1.3.35 String.prototype.valueOf ()
+// https://tc39.es/ecma262/#sec-string.prototype.valueof
+export const __String_prototype_valueOf = (_this: string) => {
+  // 1. Return ? ThisStringValue(this value).
+  return _this;
+};
+
+// 22.1.3.35 String.prototype.valueOf ()
+// https://tc39.es/ecma262/#sec-string.prototype.valueof
+export const __ByteString_prototype_valueOf = (_this: bytestring) => {
+  // 1. Return ? ThisStringValue(this value).
+  return _this;
 };

package/compiler/codegen.js

@@ -59,6 +59,10 @@ const todo = (scope, msg, expectsValue = undefined) => {
 };
 
 const isFuncType = type => type === 'FunctionDeclaration' || type === 'FunctionExpression' || type === 'ArrowFunctionExpression';
+const hasFuncWithName = name => {
+  const func = funcs.find(x => x.name === name);
+  return !!(func || builtinFuncs[name] || importedFuncs[name] || internalConstrs[name]);
+};
 const generate = (scope, decl, global = false, name = undefined, valueUnused = false) => {
   switch (decl.type) {
     case 'BinaryExpression':
@@ -1177,7 +1181,6 @@ const generateLogicExp = (scope, decl) => {
 // js type: 4 bits
 // internal type: ? bits
 // pointer: 32 bits
-
 // generic
 // 1              23   4             5
 // 0 11111111111 11TTTTIIII??????????PPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP
@@ -1399,6 +1402,15 @@ const getNodeType = (scope, node) => {
     }
 
     if (node.type === 'MemberExpression') {
+      // hack: if something.name, string type
+      if (node.property.name === 'name') {
+        if (hasFuncWithName(node.object.name)) {
+          return TYPES.bytestring;
+        } else {
+          return TYPES.undefined;
+        }
+      }
+
       // hack: if something.length, number type
       if (node.property.name === 'length') return TYPES.number;
 
@@ -3229,6 +3241,20 @@ export const generateMember = (scope, decl, _global, _name) => {
 
   const aotPointer = Prefs.aotPointerOpt && pointer != null;
 
+  // hack: .name
+  if (decl.property.name === 'name') {
+    if (hasFuncWithName(name)) {
+      let nameProp = name;
+
+      // eg: __String_prototype_toLowerCase -> toLowerCase
+      if (nameProp.startsWith('__')) nameProp = nameProp.split('_').pop();
+
+      return makeString(scope, name, _global, _name, true);
+    } else {
+      return generate(scope, DEFAULT_VALUE);
+    }
+  }
+
   // hack: .length
   if (decl.property.name === 'length') {
     const func = funcs.find(x => x.name === name);
@@ -3238,6 +3264,16 @@ export const generateMember = (scope, decl, _global, _name) => {
       return number(typedParams ? func.params.length / 2 : func.params.length);
     }
 
+    if (builtinFuncs[name + '$constructor']) {
+      const regularFunc = builtinFuncs[name];
+      const regularParams = regularFunc.typedParams ? (regularFunc.params.length / 2) : regularFunc.params.length;
+
+      const constructorFunc = builtinFuncs[name + '$constructor'];
+      const constructorParams = constructorFunc.typedParams ? (constructorFunc.params.length / 2) : constructorFunc.params.length;
+
+      return number(Math.max(regularParams, constructorParams));
+    }
+
     if (builtinFuncs[name]) return number(builtinFuncs[name].typedParams ? (builtinFuncs[name].params.length / 2) : builtinFuncs[name].params.length);
     if (importedFuncs[name]) return number(importedFuncs[name].params);
     if (internalConstrs[name]) return number(internalConstrs[name].length ?? 0);
@@ -3369,8 +3405,8 @@ const objectHack = node => {
 
       if (!objectName) objectName = objectHack(node.object)?.name?.slice?.(2);
 
-      // if .length, give up (hack within a hack!)
-      if (node.property.name === 'length') {
+      // if .name or .length, give up (hack within a hack!)
+      if (['name', 'length'].includes(node.property.name)) {
         node.object = objectHack(node.object);
         return;
       }
@@ -3654,23 +3690,6 @@ const internalConstrs = {
   }
 };
 
-// const _ = Array.prototype.push;
-// Array.prototype.push = function (a) {
-//   const check = arr => {
-//     for (const x of arr) {
-//       if (x === undefined) {
-//         console.trace(arr);
-//         process.exit();
-//       }
-//       if (Array.isArray(x)) check(x);
-//     }
-//   };
-//   if (Array.isArray(a) && !new Error().stack.includes('node:')) check(a);
-//   // if (Array.isArray(a)) check(a);
-
-//   return _.apply(this, arguments);
-// };
-
 export default program => {
   globals = {};
   globalInd = 0;

package/compiler/generated_builtins.js

@@ -307,6 +307,15 @@ export const BuiltinFuncs = function() {
     localNames: ["input","input#type","keyStr","keyStrPtr","len","output","__length_setter_tmp","i","j","endPtr","endPtr#type","chr1","chr2","#last_type","chr3","enc1","enc2","enc3","enc4"],
     data: [{"offset":0,"bytes":[65,0,0,0,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,48,49,50,51,52,53,54,55,56,57,43,47,61]}],
   };
+  this.__Boolean_prototype_valueOf = {
+    wasm: (scope, { allocPage, builtin }) => [[32,0],[65,1],[15]],
+    params: [124,127],
+    typedParams: true,
+    returns: [124,127],
+    typedReturns: true,
+    locals: [],
+    localNames: ["_this","_this#type"],
+  };
   this.__crypto_randomUUID = {
     wasm: (scope, { allocPage, builtin }) => [...number(allocPage(scope, 'bytestring: __crypto_randomUUID/bytes', 'i8') * pageSize, 127),[34,0],[34,1],[34,2],[65,16],[106],[33,3],[3,64],[32,2],[32,3],[72],[4,64],[32,2],[32,2],[65,1],[106],[33,2],[16, builtin('__Porffor_randomByte')],[58,0,4],[12,1],[11],[11],[32,1],[32,1],[45,0,10],[65,15],[113],[65,192,0],[114],[58,0,10],[32,1],[32,1],[45,0,12],[65,63],[113],[65,128,1],[114],[58,0,12],...number(allocPage(scope, 'bytestring: __crypto_randomUUID/output', 'i8') * pageSize, 127),[34,4],[33,5],[32,1],[33,6],[32,5],[65,8],[106],[33,7],[3,64],[32,5],[32,7],[72],[4,64],[32,6],[32,6],[65,1],[106],[33,6],[45,0,4],[34,8],[65,15],[113],[65,48],[106],[34,9],[65,57],[74],[4,64],[32,9],[65,39],[106],[33,9],[11],[32,8],[65,4],[117],[65,48],[106],[34,10],[65,57],[74],[4,64],[32,10],[65,39],[106],[33,10],[11],[32,5],[32,5],[65,1],[106],[33,5],[32,10],[58,0,4],[32,5],[32,5],[65,1],[106],[33,5],[32,9],[58,0,4],[12,1],[11],[11],[32,5],[65,1],[106],[34,5],[65,4],[106],[33,7],[3,64],[32,5],[32,7],[72],[4,64],[32,6],[32,6],[65,1],[106],[33,6],[45,0,4],[34,8],[65,15],[113],[65,48],[106],[34,9],[65,57],[74],[4,64],[32,9],[65,39],[106],[33,9],[11],[32,8],[65,4],[117],[65,48],[106],[34,10],[65,57],[74],[4,64],[32,10],[65,39],[106],[33,10],[11],[32,5],[32,5],[65,1],[106],[33,5],[32,10],[58,0,4],[32,5],[32,5],[65,1],[106],[33,5],[32,9],[58,0,4],[12,1],[11],[11],[32,5],[65,1],[106],[34,5],[65,4],[106],[33,7],[3,64],[32,5],[32,7],[72],[4,64],[32,6],[32,6],[65,1],[106],[33,6],[45,0,4],[34,8],[65,15],[113],[65,48],[106],[34,9],[65,57],[74],[4,64],[32,9],[65,39],[106],[33,9],[11],[32,8],[65,4],[117],[65,48],[106],[34,10],[65,57],[74],[4,64],[32,10],[65,39],[106],[33,10],[11],[32,5],[32,5],[65,1],[106],[33,5],[32,10],[58,0,4],[32,5],[32,5],[65,1],[106],[33,5],[32,9],[58,0,4],[12,1],[11],[11],[32,5],[65,1],[106],[34,5],[65,4],[106],[33,7],[3,64],[32,5],[32,7],[72],[4,64],[32,6],[32,6],[65,1],[106],[33,6],[45,0,4],[34,8],[65,15],[113],[65,48],[106],[34,9],[65,57],[74],[4,64],[32,9],[65,39],[106],[33,9],[11],[32,8],[65,4],[117],[65,48],[106],[34,10],[65,57],[74],[4,64],[32,10],[65,39],[106],[33,10],[11],[32,5],[32,5],[65,1],[106],[33,5],[32,10],[58,0,4],[32,5],[32,5],[65,1],[106],[33,5],[32,9],[58,0,4],[12,1],[11],[11],[32,5],[65,1],[106],[34,5],[65,12],[106],[33,7],[3,64],[32,5],[32,7],[72],[4,64],[32,6],[32,6],[65,1],[106],[33,6],[45,0,4],[34,8],[65,15],[113],[65,48],[106],[34,9],[65,57],[74],[4,64],[32,9],[65,39],[106],[33,9],[11],[32,8],[65,4],[117],[65,48],[106],[34,10],[65,57],[74],[4,64],[32,10],[65,39],[106],[33,10],[11],[32,5],[32,5],[65,1],[106],[33,5],[32,10],[58,0,4],[32,5],[32,5],[65,1],[106],[33,5],[32,9],[58,0,4],[12,1],[11],[11],[32,5],[65,1],[106],[33,5],[32,4],[15]],
     params: [],
@@ -1149,6 +1158,15 @@ export const BuiltinFuncs = function() {
     locals: [124,124,127,127,127,124,124,124,124,124,124,124,124,124,124,124],
     localNames: ["_this","_this#type","fractionDigits","fractionDigits#type","out","outPtr","#makearray_pointer_tmp","logictmpi","#last_type","i","digits","l","e","digitsPtr","endPtr","j","intPart","digit","dotPlace","__length_setter_tmp"],
   };
+  this.__Number_prototype_valueOf = {
+    wasm: (scope, { allocPage, builtin }) => [[32,0],[65,0],[15]],
+    params: [124,127],
+    typedParams: true,
+    returns: [124,127],
+    typedReturns: true,
+    locals: [],
+    localNames: ["_this","_this#type"],
+  };
   this.__String_fromCharCode = {
     wasm: (scope, { allocPage, builtin }) => [[32,0],[65,128,2],[72],[4,64],...number(allocPage(scope, 'bytestring: __String_fromCharCode/out', 'i8') * pageSize, 127),[34,2],[32,0],[58,0,4],[32,2],[65,18],[15],[11],[65,0],[34,2],[34,3],[65,1],[54,1,0],[32,3],[65,46],[59,0,4],[32,2],[32,0],[59,0,4],[32,2],[65,2],[15]],
     params: [127,127],
@@ -1431,6 +1449,24 @@ export const BuiltinFuncs = function() {
     locals: [127],
     localNames: ["_this","_this#type","#last_type"],
   };
+  this.__String_prototype_valueOf = {
+    wasm: (scope, { allocPage, builtin }) => [[32,0],[65,2],[15]],
+    params: [127,127],
+    typedParams: true,
+    returns: [127,127],
+    typedReturns: true,
+    locals: [],
+    localNames: ["_this","_this#type"],
+  };
+  this.__ByteString_prototype_valueOf = {
+    wasm: (scope, { allocPage, builtin }) => [[32,0],[65,18],[15]],
+    params: [127,127],
+    typedParams: true,
+    returns: [127,127],
+    typedReturns: true,
+    locals: [],
+    localNames: ["_this","_this#type"],
+  };
   this.__Boolean_prototype_toString = {
     wasm: (scope, { allocPage, builtin }) => [...number(allocPage(scope, 'bytestring: __Boolean_prototype_toString/out', 'i8') * pageSize, 124),[33,2],[32,0],[252,3],[4,64],[32,2],[252,3],[34,3],[65,4],[54,1,0],[32,3],[65,244,0],[58,0,4],[32,3],[65,242,0],[58,0,5],[32,3],[65,245,0],[58,0,6],[32,3],[65,229,0],[58,0,7],[32,3],[184],[33,2],[5],[32,2],[252,3],[34,3],[65,5],[54,1,0],[32,3],[65,230,0],[58,0,4],[32,3],[65,225,0],[58,0,5],[32,3],[65,236,0],[58,0,6],[32,3],[65,243,0],[58,0,7],[32,3],[65,229,0],[58,0,8],[32,3],[184],[33,2],[11],[32,2],[65,18],[15]],
     params: [124,127],

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.2.0-e62542f",
+  "version": "0.2.0-e69a2a2",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {