porffor 0.18.12 → 0.18.14

package/compiler/builtins/array.ts

@@ -413,7 +413,7 @@ export const __Array_prototype_sort = (_this: any[], callbackFn: any) => {
 export const __Array_prototype_toString = (_this: any[]) => {
   // todo: this is bytestring only!
 
-  let out: bytestring = '';
+  let out: bytestring = Porffor.allocate();
   out.length = 0;
 
   const len: i32 = _this.length;
@@ -444,7 +444,7 @@ export const __Array_prototype_join = (_this: any[], _separator: any) => {
   if (Porffor.rawType(_separator) != Porffor.TYPES.undefined)
     separator = ecma262.ToString(_separator);
 
-  let out: bytestring = '';
+  let out: bytestring = Porffor.allocate();
   out.length = 0;
 
   const len: i32 = _this.length;

package/compiler/builtins/base64.ts

@@ -8,7 +8,7 @@ export const btoa = (input: bytestring): bytestring => {
   const keyStrPtr: i32 = Porffor.wasm`local.get ${keyStr}`;
 
   let len: i32 = input.length;
-  let output: bytestring = '';
+  let output: bytestring = Porffor.allocate();
 
   let i: i32 = Porffor.wasm`local.get ${input}`,
       j: i32 = Porffor.wasm`local.get ${output}`;
@@ -49,7 +49,7 @@ export const atob = (input: bytestring): bytestring => {
   const lut: bytestring = '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@>@@@?456789:;<=@@@@@@@\x00\x01\x02\x03\x04\x05\x06\x07\b\t\n\x0B\f\r\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19@@@@@@\x1A\x1B\x1C\x1D\x1E\x1F !"#$%&\'()*+,-./0123';
   const lutPtr: i32 = Porffor.wasm`local.get ${lut}`;
 
-  let output: bytestring = '';
+  let output: bytestring = Porffor.allocate();
 
   let i: i32 = Porffor.wasm`local.get ${input}`,
       j: i32 = Porffor.wasm`local.get ${output}`;

package/compiler/builtins/boolean.ts

@@ -5,7 +5,7 @@ import type {} from './porffor.d.ts';
 export const __Boolean_prototype_toString = (_this: boolean) => {
   // 1. Let b be ? ThisBooleanValue(this value).
   // 2. If b is true, return "true"; else return "false".
-  let out: bytestring = '';
+  let out: bytestring = Porffor.allocate();
   if (_this) out = 'true';
     else out = 'false';
 

package/compiler/builtins/date.ts

@@ -418,7 +418,7 @@ export const __ecma262_WeekDayName = (tv: number): bytestring => {
 
   const lut: bytestring = 'SunMonTueWedThuFriSat';
 
-  let out: bytestring = '';
+  let out: bytestring = Porffor.allocateBytes(7);
   out.length = 3;
 
   let outPtr: number = Porffor.wasm`local.get ${out}`;
@@ -452,7 +452,7 @@ export const __ecma262_MonthName = (tv: number): bytestring => {
 
   const lut: bytestring = 'JanFebMarAprMayJunJulAugSepOctNovDec';
 
-  let out: bytestring = '';
+  let out: bytestring = Porffor.allocateBytes(7);
   out.length = 3;
 
   let outPtr: number = Porffor.wasm`local.get ${out}`;
@@ -1574,7 +1574,7 @@ export const __Porffor_bytestring_appendPadNum = (str: bytestring, num: number,
 export const __ecma262_ToUTCDTSF = (t: number): bytestring => {
   const year: number = __ecma262_YearFromTime(t);
 
-  let out: bytestring = '';
+  let out: bytestring = Porffor.allocateBytes(31);
   out.length = 0;
 
   if (Porffor.fastOr(year < 0, year >= 10000)) {
@@ -1670,7 +1670,7 @@ export const __ecma262_TimeString = (tv: number): bytestring => {
   const second: number = __ecma262_SecFromTime(tv);
 
   // 4. Return the string-concatenation of hour, ":", minute, ":", second, the code unit 0x0020 (SPACE), and "GMT".
-  let out: bytestring = '';
+  let out: bytestring = Porffor.allocateBytes(16);
   out.length = 0;
 
   __Porffor_bytestring_appendPadNum(out, hour, 2);
@@ -1709,7 +1709,7 @@ export const __ecma262_DateString = (tv: number): bytestring => {
   // 5. If yv is +0𝔽 or yv > +0𝔽, let yearSign be the empty String; otherwise, let yearSign be "-".
   // 6. Let paddedYear be ToZeroPaddedDecimalString(abs(ℝ(yv)), 4).
   // 7. Return the string-concatenation of weekday, the code unit 0x0020 (SPACE), month, the code unit 0x0020 (SPACE), day, the code unit 0x0020 (SPACE), yearSign, and paddedYear.
-  let out: bytestring = '';
+  let out: bytestring = Porffor.allocateBytes(20);
   out.length = 0;
 
   // weekday
@@ -1742,7 +1742,7 @@ export const __ecma262_TimeZoneString = (tv: number) => {
 // 21.4.4.41.4 ToDateString (tv)
 // https://tc39.es/ecma262/multipage/numbers-and-dates.html#sec-todatestring
 export const __ecma262_ToDateString = (tv: number) => {
-  let out: bytestring = '';
+  let out: bytestring = Porffor.allocateBytes(44);
   out.length = 0;
 
   // 1. If tv is NaN, return "Invalid Date".
@@ -1785,7 +1785,7 @@ export const __Date_prototype_toTimeString = (_this: Date) => {
   const tv: number = __Porffor_date_read(_this);
 
   // 4. If tv is NaN, return "Invalid Date".
-  let out: bytestring = '';
+  let out: bytestring = Porffor.allocateBytes(27);
   out.length = 0;
 
   if (Number.isNaN(tv)) {
@@ -1813,7 +1813,7 @@ export const __Date_prototype_toDateString = (_this: Date) => {
   const tv: number = __Porffor_date_read(_this);
 
   // 4. If tv is NaN, return "Invalid Date".
-  let out: bytestring = '';
+  let out: bytestring = Porffor.allocateBytes(20);
   out.length = 0;
 
   if (Number.isNaN(tv)) {
@@ -1838,7 +1838,7 @@ export const __Date_prototype_toUTCString = (_this: Date) => {
   const tv: number = __Porffor_date_read(_this);
 
   // 4. If tv is NaN, return "Invalid Date".
-  let out: bytestring = '';
+  let out: bytestring = Porffor.allocateBytes(34);
   out.length = 0;
 
   if (Number.isNaN(tv)) {

package/compiler/builtins/escape.ts

@@ -28,7 +28,7 @@ export const escape = (input: string|bytestring): bytestring => {
 
     if (outLength == len) return input;
 
-    let output: bytestring = '';
+    let output: bytestring = Porffor.allocate();
     output.length = outLength;
 
     i = Porffor.wasm`local.get ${input}`;
@@ -81,7 +81,7 @@ export const escape = (input: string|bytestring): bytestring => {
 
   if (outLength == len) return input;
 
-  let output: bytestring = '';
+  let output: bytestring = Porffor.allocate();
   output.length = outLength;
 
   i = Porffor.wasm`local.get ${input}`;

package/compiler/builtins/number.ts

@@ -2,7 +2,7 @@ import type {} from './porffor.d.ts';
 
 // radix: number|any for rawType check
 export const __Number_prototype_toString = (_this: number, radix: number|any) => {
-  let out: bytestring = '';
+  let out: bytestring = Porffor.allocate();
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
 
   if (!Number.isFinite(_this)) {
@@ -235,7 +235,7 @@ export const __Number_prototype_toString = (_this: number, radix: number|any) =>
 };
 
 export const __Number_prototype_toFixed = (_this: number, fractionDigits: number) => {
-  let out: bytestring = '';
+  let out: bytestring = Porffor.allocate();
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
 
   if (!Number.isFinite(_this)) {
@@ -322,7 +322,7 @@ export const __Number_prototype_toFixed = (_this: number, fractionDigits: number
 
 // fractionDigits: number|any for rawType check
 export const __Number_prototype_toExponential = (_this: number, fractionDigits: number|any) => {
-  let out: bytestring = '';
+  let out: bytestring = Porffor.allocate();
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
 
   if (!Number.isFinite(_this)) {

package/compiler/builtins/string.ts

@@ -18,7 +18,7 @@ export const __String_prototype_toUpperCase = (_this: string) => {
   // todo: unicode not just ascii
   const len: i32 = _this.length;
 
-  let out: string = Porffor.s``;
+  let out: string = Porffor.allocate();
   Porffor.wasm.i32.store(out, len, 0, 0);
 
   let i: i32 = Porffor.wasm`local.get ${_this}`,
@@ -41,7 +41,7 @@ export const __String_prototype_toUpperCase = (_this: string) => {
 export const __ByteString_prototype_toUpperCase = (_this: bytestring) => {
   const len: i32 = _this.length;
 
-  let out: bytestring = '';
+  let out: bytestring = Porffor.allocate();
   Porffor.wasm.i32.store(out, len, 0, 0);
 
   let i: i32 = Porffor.wasm`local.get ${_this}`,
@@ -64,7 +64,7 @@ export const __String_prototype_toLowerCase = (_this: string) => {
   // todo: unicode not just ascii
   const len: i32 = _this.length;
 
-  let out: string = Porffor.s``;
+  let out: string = Porffor.allocate();
   Porffor.wasm.i32.store(out, len, 0, 0);
 
   let i: i32 = Porffor.wasm`local.get ${_this}`,
@@ -87,7 +87,7 @@ export const __String_prototype_toLowerCase = (_this: string) => {
 export const __ByteString_prototype_toLowerCase = (_this: bytestring) => {
   const len: i32 = _this.length;
 
-  let out: bytestring = '';
+  let out: bytestring = Porffor.allocate();
   Porffor.wasm.i32.store(out, len, 0, 0);
 
   let i: i32 = Porffor.wasm`local.get ${_this}`,
@@ -499,7 +499,7 @@ export const __ByteString_prototype_includes = (_this: bytestring, searchString:
 
 
 export const __String_prototype_padStart = (_this: string, targetLength: number, padString: string) => {
-  let out: string = Porffor.s``;
+  let out: string = Porffor.allocate();
 
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
   let thisPtr: i32 = Porffor.wasm`local.get ${_this}`;
@@ -546,7 +546,7 @@ export const __String_prototype_padStart = (_this: string, targetLength: number,
 export const __ByteString_prototype_padStart = (_this: bytestring, targetLength: number, padString: bytestring) => {
   // todo: handle padString being non-bytestring
 
-  let out: bytestring = Porffor.bs``;
+  let out: bytestring = Porffor.allocate();
 
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
   let thisPtr: i32 = Porffor.wasm`local.get ${_this}`;
@@ -588,7 +588,7 @@ export const __ByteString_prototype_padStart = (_this: bytestring, targetLength:
 
 
 export const __String_prototype_padEnd = (_this: string, targetLength: number, padString: string) => {
-  let out: string = Porffor.s``;
+  let out: string = Porffor.allocate();
 
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
   let thisPtr: i32 = Porffor.wasm`local.get ${_this}`;
@@ -635,7 +635,7 @@ export const __String_prototype_padEnd = (_this: string, targetLength: number, p
 export const __ByteString_prototype_padEnd = (_this: bytestring, targetLength: number, padString: bytestring) => {
   // todo: handle padString being non-bytestring
 
-  let out: bytestring = Porffor.bs``;
+  let out: bytestring = Porffor.allocate();
 
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
   let thisPtr: i32 = Porffor.wasm`local.get ${_this}`;
@@ -693,7 +693,7 @@ export const __String_prototype_substring = (_this: string, start: number, end:
   if (end < 0) end = 0;
   if (end > len) end = len;
 
-  let out: string = Porffor.s``;
+  let out: string = Porffor.allocate();
 
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
   let thisPtr: i32 = Porffor.wasm`local.get ${_this}`;
@@ -731,7 +731,7 @@ export const __ByteString_prototype_substring = (_this: bytestring, start: numbe
   if (end < 0) end = 0;
   if (end > len) end = len;
 
-  let out: bytestring = Porffor.bs``;
+  let out: bytestring = Porffor.allocate();
 
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
   let thisPtr: i32 = Porffor.wasm`local.get ${_this}`;
@@ -766,7 +766,7 @@ export const __String_prototype_substr = (_this: string, start: number, length:
 
   if (start + length > len) length = len - start;
 
-  let out: string = Porffor.s``;
+  let out: string = Porffor.allocate();
 
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
   let thisPtr: i32 = Porffor.wasm`local.get ${_this}`;
@@ -803,7 +803,7 @@ export const __ByteString_prototype_substr = (_this: string, start: number, leng
 
   if (start + length > len) length = len - start;
 
-  let out: bytestring = Porffor.bs``;
+  let out: bytestring = Porffor.allocate();
 
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
   let thisPtr: i32 = Porffor.wasm`local.get ${_this}`;
@@ -840,7 +840,7 @@ export const __String_prototype_slice = (_this: string, start: number, end: numb
   }
   if (end > len) end = len;
 
-  let out: string = Porffor.s``;
+  let out: string = Porffor.allocate();
 
   if (start > end) return out;
 
@@ -881,7 +881,7 @@ export const __ByteString_prototype_slice = (_this: bytestring, start: number, e
   }
   if (end > len) end = len;
 
-  let out: bytestring = Porffor.bs``;
+  let out: bytestring = Porffor.allocate();
 
   if (start > end) return out;
 
@@ -903,7 +903,7 @@ export const __ByteString_prototype_slice = (_this: bytestring, start: number, e
 
 
 export const __String_prototype_trimStart = (_this: string) => {
-  let out: string = Porffor.s``;
+  let out: string = Porffor.allocate();
 
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
   let thisPtr: i32 = Porffor.wasm`local.get ${_this}`;
@@ -919,7 +919,7 @@ export const __String_prototype_trimStart = (_this: string) => {
 
     if (start) {
       // todo: not spec compliant, needs more unicode chars
-      if (Porffor.fastOr(chr == 0x0009, chr == 0x000b, chr == 0x000c, chr == 0x0020, chr == 0x00a0, chr == 0xfeff, chr == 0x000a, chr == 0x000d, chr == 0x2028, chr == 0x2029)) {
+      if (Porffor.fastOr(chr == 0x9, chr == 0xb, chr == 0xc, chr == 0xfeff, chr == 0x20, chr == 0xa0, chr == 0x1680, chr == 0x2000, chr == 0x2001, chr == 0x2002, chr == 0x2003, chr == 0x2004, chr == 0x2005, chr == 0x2006, chr == 0x2007, chr == 0x2008, chr == 0x2009, chr == 0x200a, chr == 0x202f, chr == 0x205f, chr == 0x3000, chr == 0xa, chr == 0xd, chr == 0x2028, chr == 0x2029)) {
         n++;
         continue;
       }
@@ -937,7 +937,7 @@ export const __String_prototype_trimStart = (_this: string) => {
 };
 
 export const __ByteString_prototype_trimStart = (_this: bytestring) => {
-  let out: bytestring = Porffor.bs``;
+  let out: bytestring = Porffor.allocate();
 
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
   let thisPtr: i32 = Porffor.wasm`local.get ${_this}`;
@@ -952,7 +952,7 @@ export const __ByteString_prototype_trimStart = (_this: bytestring) => {
 
     if (start) {
       // todo: not spec compliant, needs more unicode chars
-      if (Porffor.fastOr(chr == 0x0009, chr == 0x000b, chr == 0x000c, chr == 0x0020, chr == 0x00a0, chr == 0xfeff, chr == 0x000a, chr == 0x000d, chr == 0x2028, chr == 0x2029)) {
+      if (Porffor.fastOr(chr == 0x9, chr == 0xb, chr == 0xc, chr == 0xfeff, chr == 0x20, chr == 0xa0, chr == 0x1680, chr == 0x2000, chr == 0x2001, chr == 0x2002, chr == 0x2003, chr == 0x2004, chr == 0x2005, chr == 0x2006, chr == 0x2007, chr == 0x2008, chr == 0x2009, chr == 0x200a, chr == 0x202f, chr == 0x205f, chr == 0x3000, chr == 0xa, chr == 0xd, chr == 0x2028, chr == 0x2029)) {
         n++;
         continue;
       }
@@ -970,7 +970,7 @@ export const __ByteString_prototype_trimStart = (_this: bytestring) => {
 
 
 export const __String_prototype_trimEnd = (_this: string) => {
-  let out: string = Porffor.s``;
+  let out: string = Porffor.allocate();
 
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
   let thisPtr: i32 = Porffor.wasm`local.get ${_this}`;
@@ -991,7 +991,7 @@ export const __String_prototype_trimEnd = (_this: string) => {
 
     if (start) {
       // todo: not spec compliant, needs more unicode chars
-      if (Porffor.fastOr(chr == 0x0009, chr == 0x000b, chr == 0x000c, chr == 0x0020, chr == 0x00a0, chr == 0xfeff, chr == 0x000a, chr == 0x000d, chr == 0x2028, chr == 0x2029)) {
+      if (Porffor.fastOr(chr == 0x9, chr == 0xb, chr == 0xc, chr == 0xfeff, chr == 0x20, chr == 0xa0, chr == 0x1680, chr == 0x2000, chr == 0x2001, chr == 0x2002, chr == 0x2003, chr == 0x2004, chr == 0x2005, chr == 0x2006, chr == 0x2007, chr == 0x2008, chr == 0x2009, chr == 0x200a, chr == 0x202f, chr == 0x205f, chr == 0x3000, chr == 0xa, chr == 0xd, chr == 0x2028, chr == 0x2029)) {
         n++;
         continue;
       }
@@ -1008,7 +1008,7 @@ export const __String_prototype_trimEnd = (_this: string) => {
 };
 
 export const __ByteString_prototype_trimEnd = (_this: bytestring) => {
-  let out: bytestring = Porffor.bs``;
+  let out: bytestring = Porffor.allocate();
 
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
   let thisPtr: i32 = Porffor.wasm`local.get ${_this}`;
@@ -1028,7 +1028,7 @@ export const __ByteString_prototype_trimEnd = (_this: bytestring) => {
 
     if (start) {
       // todo: not spec compliant, needs more unicode chars
-      if (Porffor.fastOr(chr == 0x0009, chr == 0x000b, chr == 0x000c, chr == 0x0020, chr == 0x00a0, chr == 0xfeff, chr == 0x000a, chr == 0x000d, chr == 0x2028, chr == 0x2029)) {
+      if (Porffor.fastOr(chr == 0x9, chr == 0xb, chr == 0xc, chr == 0xfeff, chr == 0x20, chr == 0xa0, chr == 0x1680, chr == 0x2000, chr == 0x2001, chr == 0x2002, chr == 0x2003, chr == 0x2004, chr == 0x2005, chr == 0x2006, chr == 0x2007, chr == 0x2008, chr == 0x2009, chr == 0x200a, chr == 0x202f, chr == 0x205f, chr == 0x3000, chr == 0xa, chr == 0xd, chr == 0x2028, chr == 0x2029)) {
         n++;
         continue;
       }

package/compiler/builtins/symbol.ts

@@ -28,7 +28,7 @@ export const __Symbol_prototype_description$get = (_this: Symbol) => {
 };
 
 export const __Symbol_prototype_toString = (_this: Symbol) => {
-  let out: bytestring = '';
+  let out: bytestring = Porffor.allocate();
 
   // Symbol(
   Porffor.wasm.i32.store8(out, 83, 0, 4);

package/compiler/builtins/z_ecma262.ts

@@ -26,7 +26,7 @@ export const __ecma262_ToIntegerOrInfinity = (argument: unknown): number => {
 // 7.1.17 ToString (argument)
 // https://tc39.es/ecma262/#sec-tostring
 export const __ecma262_ToString = (argument: unknown): bytestring => {
-  let out: bytestring = '';
+  let out: bytestring = Porffor.allocate();
   const type: i32 = Porffor.rawType(argument);
 
   // 1. If argument is a String, return argument.

package/compiler/builtins.js

@@ -1,7 +1,7 @@
 import * as GeneratedBuiltins from './generated_builtins.js';
 import { Blocktype, Opcodes, Valtype, ValtypeSize } from './wasmSpec.js';
 import { number } from './embedding.js';
-import { TYPES } from './types.js';
+import { TYPES, TYPE_NAMES } from './types.js';
 import Prefs from './prefs.js';
 
 export const importedFuncs = [
@@ -1099,7 +1099,7 @@ export const BuiltinFuncs = function() {
     locals: [ Valtype.i32, Valtype.i32 ],
     returns: [ valtypeBinary ],
     returnType: Prefs.bytestring ? TYPES.bytestring : TYPES.string,
-    wasm: (scope, { TYPE_NAMES, typeSwitch, makeString }) => {
+    wasm: (scope, { typeSwitch, makeString }) => {
       const bc = {};
       for (const x in TYPE_NAMES) {
         bc[x] = makeString(scope, TYPE_NAMES[x], false, '#Porffor_type_result');
@@ -1159,8 +1159,8 @@ export const BuiltinFuncs = function() {
       [ Opcodes.global_get, 1 ],
       ...number(pageSize, Valtype.i32),
       [ Opcodes.i32_ge_s ],
-      [ Opcodes.if, Valtype.i32 ],
-        // bytesWritten = 0
+      [ Opcodes.if, Blocktype.void ],
+        // bytesWritten = bytesToAllocate
         [ Opcodes.local_get, 0 ],
         [ Opcodes.global_set, 1 ],
 
@@ -1185,5 +1185,62 @@ export const BuiltinFuncs = function() {
     ]
   };
 
+  this.__Porffor_bytestringToString = {
+    params: [ Valtype.i32, Valtype.i32 ],
+    locals: [ Valtype.i32, Valtype.i32 ],
+    localNames: [ 'src', 'len', '#bytestring_to_string_counter', '#bytestring_to_string_dst' ],
+    returns: [ Valtype.i32 ],
+    returnType: TYPES.string,
+    wasm: [
+      // dst = grow memory by 1 page
+      [ Opcodes.i32_const, 1 ],
+      [ Opcodes.memory_grow, 0 ],
+      ...number(65536, Valtype.i32),
+      [ Opcodes.i32_mul ],
+      [ Opcodes.local_tee, 3 ],
+
+      // dst.length = len
+      [ Opcodes.local_get, 1 ],
+      [ Opcodes.i32_store, 0, 0 ],
+
+      // counter = 0
+      [ Opcodes.i32_const, 0 ],
+      [ Opcodes.local_set, 2 ],
+
+      [ Opcodes.loop, Blocktype.void ],
+
+      // base for store later
+      [ Opcodes.local_get, 2 ],
+      [ Opcodes.i32_const, 2 ],
+      [ Opcodes.i32_mul ],
+      [ Opcodes.local_get, 3 ],
+      [ Opcodes.i32_add ],
+
+      // load char from src
+      [ Opcodes.local_get, 0 ],
+      [ Opcodes.local_get, 2 ],
+      [ Opcodes.i32_add ],
+      [ Opcodes.i32_load8_u, 0, 4 ],
+
+      // store char to dst
+      [ Opcodes.i32_store16, 0, 4 ],
+
+      // counter++
+      [ Opcodes.local_get, 2 ],
+      [ Opcodes.i32_const, 1 ],
+      [ Opcodes.i32_add ],
+      [ Opcodes.local_tee, 2 ],
+
+      // loop if counter < len
+      [ Opcodes.local_get, 1 ],
+      [ Opcodes.i32_lt_s ],
+      [ Opcodes.br_if, 0 ],
+      [ Opcodes.end ],
+
+      // return dst
+      [ Opcodes.local_get, 3 ]
+    ]
+  };
+
   GeneratedBuiltins.BuiltinFuncs.call(this);
 };