porffor 0.18.32 → 0.18.33

package/compiler/builtins/string.ts

@@ -1042,6 +1042,75 @@ export const __ByteString_prototype_trim = (_this: bytestring) => {
 };
 
 
+export const __String_prototype_concat = (_this: string, ...vals: any[]) => {
+  // todo/perf: rewrite to use memory.copy?
+  let out: string = Porffor.allocate();
+  out += _this;
+
+  const valsLen: i32 = vals.length;
+  for (let i: i32 = 0; i < valsLen; i++) {
+    let x: any;
+    Porffor.wasm`
+local.get ${vals}
+local.get ${i}
+i32.const 9
+i32.mul
+i32.add
+f64.load 0 4
+
+local.get ${vals}
+local.get ${i}
+i32.const 9
+i32.mul
+i32.add
+i32.load8_u 0 12
+
+call __ecma262_ToString
+local.set ${x+1}
+i32.trunc_sat_f64_u
+local.set ${x}`;
+
+    out += x;
+  }
+
+  return out;
+};
+
+export const __ByteString_prototype_concat = (_this: bytestring, ...vals: any[]) => {
+  // todo/perf: rewrite to use memory.copy?
+  let out: string = Porffor.allocate();
+  out += _this;
+
+  const valsLen: i32 = vals.length;
+  for (let i: i32 = 0; i < valsLen; i++) {
+    let x: any;
+    Porffor.wasm`
+local.get ${vals}
+local.get ${i}
+i32.const 9
+i32.mul
+i32.add
+f64.load 0 4
+
+local.get ${vals}
+local.get ${i}
+i32.const 9
+i32.mul
+i32.add
+i32.load8_u 0 12
+
+call __ecma262_ToString
+local.set ${x+1}
+i32.trunc_sat_f64_u
+local.set ${x}`;
+
+    out += x;
+  }
+
+  return out;
+};
+
+
 // 22.1.3.29 String.prototype.toString ()
 // https://tc39.es/ecma262/#sec-string.prototype.tostring
 export const __String_prototype_toString = (_this: string) => {

package/compiler/builtins.js

@@ -263,7 +263,7 @@ export const BuiltinFuncs = function() {
 
 
   this.__Porffor_print = {
-    params: [ valtypeBinary, Valtype.i32 ],
+    params: [ globalThis.precompile ? Valtype.f64 : valtypeBinary, Valtype.i32 ],
     typedParams: true,
     locals: [ Valtype.i32, Valtype.i32 ],
     returns: [],

package/compiler/codegen.js

@@ -189,7 +189,14 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
             if (!Array.isArray(inst)) inst = [ inst ];
             const immediates = asm.slice(1).map(x => {
               const int = parseInt(x);
-              if (Number.isNaN(int)) return scope.locals[x]?.idx ?? globals[x].idx;
+              if (Number.isNaN(int)) {
+                if (builtinFuncs[x]) {
+                  if (funcIndex[x] == null) includeBuiltin(scope, x);
+                  return funcIndex[x];
+                }
+
+                return scope.locals[x]?.idx ?? globals[x].idx;
+              }
               return int;
             });
 
@@ -4737,7 +4744,7 @@ const internalConstrs = {
 
           // print space
           ...(i !== decl.arguments.length - 1 ? [
-            ...number(32),
+            ...number(32, globalThis.precompile ? Valtype.f64 : valtypeBinary),
             [ Opcodes.call, importedFuncs.printChar ]
           ] : [])
         );
@@ -4745,7 +4752,7 @@ const internalConstrs = {
 
       // print newline
       out.push(
-        ...number(10),
+        ...number(10, globalThis.precompile ? Valtype.f64 : valtypeBinary),
         [ Opcodes.call, importedFuncs.printChar ]
       );
 

package/compiler/generated_builtins.js

@@ -1662,6 +1662,20 @@ export const BuiltinFuncs = function() {
     returns: [127,127], typedReturns: 1,
     locals: [127], localNames: ["_this","_this#type","#last_type"],
   };
+  this.__String_prototype_concat = {
+    wasm: (scope, {builtin}) => [[16, builtin('__Porffor_allocate')],[33,5],[252,2],[34,4],[32,0],[33,6],[33,9],[65,1],[64,0],[65,128,128,4],[108],[34,10],[32,9],[40,0,0],[34,8],[32,6],[40,0,0],[34,7],[106],[54,1,0],[32,10],[65,4],[106],[32,9],[65,4],[106],[65,252,255,3],[252,10,0,0],[32,10],[65,4],[106],[32,8],[65,2],[108],[106],[32,6],[65,4],[106],[32,7],[65,2],[108],[252,10,0,0],[65,194,0],[33,5],[32,10],[33,4],[32,2],[40,1,0],[33,11],[65,0],[33,12],[3,64],[32,12],[32,11],[72],[4,64],[32,2],[32,12],[65,9],[108],[106],[43,0,4],[32,2],[32,12],[65,9],[108],[106],[45,0,12],[16, builtin('__ecma262_ToString')],[33,14],[252,3],[33,13],[32,4],[32,13],[33,6],[33,9],[65,1],[64,0],[65,128,128,4],[108],[34,10],[32,9],[40,0,0],[34,8],[32,6],[40,0,0],[34,7],[106],[54,1,0],[65,194,0],[65,194,1],[70],[4,64],[32,9],[32,8],[16, builtin('__Porffor_bytestringToString')],[33,9],[11],[32,14],[65,194,1],[70],[4,64],[32,6],[32,7],[16, builtin('__Porffor_bytestringToString')],[33,6],[11],[32,10],[65,4],[106],[32,9],[65,4],[106],[65,252,255,3],[252,10,0,0],[32,10],[65,4],[106],[32,8],[65,2],[108],[106],[32,6],[65,4],[106],[32,7],[65,2],[108],[252,10,0,0],[65,194,0],[33,5],[32,10],[33,4],[32,12],[65,1],[106],[33,12],[12,1],[11],[11],[32,4],[65,194,0],[15]],
+    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","vals","vals#type","out","#last_type","concat_right_pointer","concat_right_length","concat_left_length","concat_left_pointer","concat_out_pointer","valsLen","i","x","x#type"],
+    hasRestArgument: 1,
+  };
+  this.__ByteString_prototype_concat = {
+    wasm: (scope, {builtin}) => [[16, builtin('__Porffor_allocate')],[33,5],[252,2],[34,4],[32,0],[33,6],[33,9],[65,1],[64,0],[65,128,128,4],[108],[34,10],[32,9],[40,0,0],[34,8],[32,6],[40,0,0],[34,7],[106],[54,1,0],[65,194,0],[65,194,1],[70],[4,64],[32,9],[32,8],[16, builtin('__Porffor_bytestringToString')],[33,9],[11],[65,194,1],[65,194,1],[70],[4,64],[32,6],[32,7],[16, builtin('__Porffor_bytestringToString')],[33,6],[11],[32,10],[65,4],[106],[32,9],[65,4],[106],[65,252,255,3],[252,10,0,0],[32,10],[65,4],[106],[32,8],[65,2],[108],[106],[32,6],[65,4],[106],[32,7],[65,2],[108],[252,10,0,0],[65,194,0],[33,5],[32,10],[33,4],[32,2],[40,1,0],[33,11],[65,0],[33,12],[3,64],[32,12],[32,11],[72],[4,64],[32,2],[32,12],[65,9],[108],[106],[43,0,4],[32,2],[32,12],[65,9],[108],[106],[45,0,12],[16, builtin('__ecma262_ToString')],[33,14],[252,3],[33,13],[32,4],[32,13],[33,6],[33,9],[65,1],[64,0],[65,128,128,4],[108],[34,10],[32,9],[40,0,0],[34,8],[32,6],[40,0,0],[34,7],[106],[54,1,0],[65,194,0],[65,194,1],[70],[4,64],[32,9],[32,8],[16, builtin('__Porffor_bytestringToString')],[33,9],[11],[32,14],[65,194,1],[70],[4,64],[32,6],[32,7],[16, builtin('__Porffor_bytestringToString')],[33,6],[11],[32,10],[65,4],[106],[32,9],[65,4],[106],[65,252,255,3],[252,10,0,0],[32,10],[65,4],[106],[32,8],[65,2],[108],[106],[32,6],[65,4],[106],[32,7],[65,2],[108],[252,10,0,0],[65,194,0],[33,5],[32,10],[33,4],[32,12],[65,1],[106],[33,12],[12,1],[11],[11],[32,4],[65,194,0],[15]],
+    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","vals","vals#type","out","#last_type","concat_right_pointer","concat_right_length","concat_left_length","concat_left_pointer","concat_out_pointer","valsLen","i","x","x#type"],
+    hasRestArgument: 1,
+  };
   this.__String_prototype_toString = {
     wasm: (scope, {}) => [[32,0],[65,194,0],[15]],
     params: [127,127], typedParams: 1,
@@ -3808,7 +3822,7 @@ export const BuiltinFuncs = function() {
     locals: [124], localNames: ["argument","argument#type","number"],
   };
   this.__ecma262_ToString = {
-    wasm: (scope, {allocPage,builtin,internalThrow}) => [[16, builtin('__Porffor_allocate')],[33,3],[33,2],[32,0],[32,1],[16, builtin('__Porffor_rawType')],[34,4],[68,0,0,0,0,0,128,80,64],[97],[32,4],[68,0,0,0,0,0,64,104,64],[97],[114],[4,64],[32,0],[32,1],[15],[11],[32,4],[68,0,0,0,0,0,0,24,64],[97],[4,64],...internalThrow(scope, 'TypeError', `Cannot convert a Symbol value to a string`),[11],[32,4],[68,0,0,0,0,0,0,8,64],[97],[4,64],...number(allocPage(scope, 'bytestring: __ecma262_ToString/out', 'i8') * pageSize, 124),[34,2],[65,194,1],[15],[11],[32,4],[68,0,0,0,0,0,0,16,64],[97],[32,0],[68,0,0,0,0,0,0,0,0],[97],[113],[4,64],[32,2],[252,3],[34,5],[65,4],[54,1,0],[32,5],[65,238,0],[58,0,4],[32,5],[65,245,0],[58,0,5],[32,5],[65,236,0],[58,0,6],[32,5],[65,236,0],[58,0,7],[32,5],[184],[34,2],[65,194,1],[15],[11],[32,4],[68,0,0,0,0,0,0,240,63],[97],[4,64],[32,0],[68,0,0,0,0,0,0,240,63],[97],[4,64],[32,2],[252,3],[34,5],[65,4],[54,1,0],[32,5],[65,244,0],[58,0,4],[32,5],[65,242,0],[58,0,5],[32,5],[65,245,0],[58,0,6],[32,5],[65,229,0],[58,0,7],[32,5],[184],[34,2],[65,194,1],[15],[11],[32,2],[252,3],[34,5],[65,5],[54,1,0],[32,5],[65,230,0],[58,0,4],[32,5],[65,225,0],[58,0,5],[32,5],[65,236,0],[58,0,6],[32,5],[65,243,0],[58,0,7],[32,5],[65,229,0],[58,0,8],[32,5],[184],[34,2],[65,194,1],[15],[11],[32,0],[33,6],[32,1],[34,7],[33,8],[2,124],[32,8],[65,0],[70],[4,64,"TYPESWITCH|Number"],[32,6],[32,7],[68,0,0,0,0,0,0,0,0],[65,3],[16, builtin('__Number_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,1],[70],[4,64,"TYPESWITCH|Boolean"],[32,6],[32,7],[16, builtin('__Boolean_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,4],[70],[4,64,"TYPESWITCH|Object"],[32,6],[32,7],[16, builtin('__Object_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,5],[70],[4,64,"TYPESWITCH|Function"],[32,6],[32,7],[16, builtin('__Function_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,6],[70],[4,64,"TYPESWITCH|Symbol"],[32,6],[32,7],[16, builtin('__Symbol_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,18],[70],[4,64,"TYPESWITCH|Date"],[32,6],[32,7],[16, builtin('__Date_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,19],[70],[4,64,"TYPESWITCH|Set"],[32,6],[32,7],[16, builtin('__Set_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,33],[70],[4,64,"TYPESWITCH|WeakSet"],[32,6],[32,7],[16, builtin('__WeakSet_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,194,0],[70],[4,64,"TYPESWITCH|String"],[32,6],[252,2],[32,7],[16, builtin('__String_prototype_toString')],[33,3],[183],[12,1],[11],[32,8],[65,208,0],[70],[4,64,"TYPESWITCH|Array"],[32,6],[32,7],[16, builtin('__Array_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,215,0],[70],[4,64,"TYPESWITCH|Uint8Array"],[32,6],[32,7],[16, builtin('__Uint8Array_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,216,0],[70],[4,64,"TYPESWITCH|Int8Array"],[32,6],[32,7],[16, builtin('__Int8Array_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,217,0],[70],[4,64,"TYPESWITCH|Uint8ClampedArray"],[32,6],[32,7],[16, builtin('__Uint8ClampedArray_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,218,0],[70],[4,64,"TYPESWITCH|Uint16Array"],[32,6],[32,7],[16, builtin('__Uint16Array_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,219,0],[70],[4,64,"TYPESWITCH|Int16Array"],[32,6],[32,7],[16, builtin('__Int16Array_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,220,0],[70],[4,64,"TYPESWITCH|Uint32Array"],[32,6],[32,7],[16, builtin('__Uint32Array_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,221,0],[70],[4,64,"TYPESWITCH|Int32Array"],[32,6],[32,7],[16, builtin('__Int32Array_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,222,0],[70],[4,64,"TYPESWITCH|Float32Array"],[32,6],[32,7],[16, builtin('__Float32Array_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,223,0],[70],[4,64,"TYPESWITCH|Float64Array"],[32,6],[32,7],[16, builtin('__Float64Array_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,194,1],[70],[4,64,"TYPESWITCH|ByteString"],[32,6],[252,2],[32,7],[16, builtin('__ByteString_prototype_toString')],[33,3],[183],[12,1],[11],...internalThrow(scope, 'TypeError', `'toString' proto func tried to be called on a type without an impl`),[11,"TYPESWITCH_end"],[32,3],[15]],
+    wasm: (scope, {allocPage,builtin,internalThrow}) => [[16, builtin('__Porffor_allocate')],[33,3],[33,2],[32,0],[32,1],[16, builtin('__Porffor_rawType')],[34,4],[68,0,0,0,0,0,128,80,64],[97],[32,4],[68,0,0,0,0,0,64,104,64],[97],[114],[4,64],[32,0],[32,1],[15],[11],[32,4],[68,0,0,0,0,0,0,24,64],[97],[4,64],...internalThrow(scope, 'TypeError', `Cannot convert a Symbol value to a string`),[11],[32,4],[68,0,0,0,0,0,0,8,64],[97],[4,64],...number(allocPage(scope, 'bytestring: __ecma262_ToString/out', 'i8') * pageSize, 124),[34,2],[65,194,1],[15],[11],[32,4],[68,0,0,0,0,0,0,16,64],[97],[32,0],[68,0,0,0,0,0,0,0,0],[97],[113],[4,64],[32,2],[252,3],[34,5],[65,4],[54,1,0],[32,5],[65,238,0],[58,0,4],[32,5],[65,245,0],[58,0,5],[32,5],[65,236,0],[58,0,6],[32,5],[65,236,0],[58,0,7],[32,5],[184],[34,2],[65,194,1],[15],[11],[32,4],[68,0,0,0,0,0,0,240,63],[97],[4,64],[32,0],[68,0,0,0,0,0,0,240,63],[97],[4,64],[32,2],[252,3],[34,5],[65,4],[54,1,0],[32,5],[65,244,0],[58,0,4],[32,5],[65,242,0],[58,0,5],[32,5],[65,245,0],[58,0,6],[32,5],[65,229,0],[58,0,7],[32,5],[184],[34,2],[65,194,1],[15],[11],[32,2],[252,3],[34,5],[65,5],[54,1,0],[32,5],[65,230,0],[58,0,4],[32,5],[65,225,0],[58,0,5],[32,5],[65,236,0],[58,0,6],[32,5],[65,243,0],[58,0,7],[32,5],[65,229,0],[58,0,8],[32,5],[184],[34,2],[65,194,1],[15],[11],[32,0],[33,6],[32,1],[34,7],[33,8],[2,124],[32,8],[65,0],[70],[4,64,"TYPESWITCH|Number"],[32,6],[32,7],[68,0,0,0,0,0,0,0,0],[65,3],[16, builtin('__Number_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,1],[70],[4,64,"TYPESWITCH|Boolean"],[32,6],[32,7],[16, builtin('__Boolean_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,4],[70],[4,64,"TYPESWITCH|Object"],[32,6],[32,7],[16, builtin('__Object_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,5],[70],[4,64,"TYPESWITCH|Function"],[32,6],[32,7],[16, builtin('__Function_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,6],[70],[4,64,"TYPESWITCH|Symbol"],[32,6],[32,7],[16, builtin('__Symbol_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,18],[70],[4,64,"TYPESWITCH|Date"],[32,6],[32,7],[16, builtin('__Date_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,19],[70],[4,64,"TYPESWITCH|Set"],[32,6],[32,7],[16, builtin('__Set_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,32],[70],[4,64,"TYPESWITCH|WeakRef"],[32,6],[32,7],[16, builtin('__WeakRef_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,33],[70],[4,64,"TYPESWITCH|WeakSet"],[32,6],[32,7],[16, builtin('__WeakSet_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,194,0],[70],[4,64,"TYPESWITCH|String"],[32,6],[252,2],[32,7],[16, builtin('__String_prototype_toString')],[33,3],[183],[12,1],[11],[32,8],[65,208,0],[70],[4,64,"TYPESWITCH|Array"],[32,6],[32,7],[16, builtin('__Array_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,215,0],[70],[4,64,"TYPESWITCH|Uint8Array"],[32,6],[32,7],[16, builtin('__Uint8Array_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,216,0],[70],[4,64,"TYPESWITCH|Int8Array"],[32,6],[32,7],[16, builtin('__Int8Array_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,217,0],[70],[4,64,"TYPESWITCH|Uint8ClampedArray"],[32,6],[32,7],[16, builtin('__Uint8ClampedArray_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,218,0],[70],[4,64,"TYPESWITCH|Uint16Array"],[32,6],[32,7],[16, builtin('__Uint16Array_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,219,0],[70],[4,64,"TYPESWITCH|Int16Array"],[32,6],[32,7],[16, builtin('__Int16Array_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,220,0],[70],[4,64,"TYPESWITCH|Uint32Array"],[32,6],[32,7],[16, builtin('__Uint32Array_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,221,0],[70],[4,64,"TYPESWITCH|Int32Array"],[32,6],[32,7],[16, builtin('__Int32Array_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,222,0],[70],[4,64,"TYPESWITCH|Float32Array"],[32,6],[32,7],[16, builtin('__Float32Array_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,223,0],[70],[4,64,"TYPESWITCH|Float64Array"],[32,6],[32,7],[16, builtin('__Float64Array_prototype_toString')],[33,3],[12,1],[11],[32,8],[65,194,1],[70],[4,64,"TYPESWITCH|ByteString"],[32,6],[252,2],[32,7],[16, builtin('__ByteString_prototype_toString')],[33,3],[183],[12,1],[11],...internalThrow(scope, 'TypeError', `'toString' proto func tried to be called on a type without an impl`),[11,"TYPESWITCH_end"],[32,3],[15]],
     params: [124,127], typedParams: 1,
     returns: [124,127], typedReturns: 1,
     locals: [124,127,124,127,124,127,127], localNames: ["argument","argument#type","out","#last_type","type","#makearray_pointer_tmp","#proto_target","#proto_target#type","#typeswitch_tmp"],

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.18.32+da1ae5c67",
+  "version": "0.18.33+823ef76d5",
   "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.18.32+da1ae5c67';
+globalThis.version = '0.18.33+823ef76d5';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {