porffor 0.35.0 → 0.35.1

package/compiler/builtins/__internal_string.ts

@@ -45,4 +45,78 @@ export const __Porffor_strcmp = (a: any, b: any): boolean => {
       return true;
     }
   }
+};
+
+export const __Porffor_strcat = (a: any, b: any): any => {
+  // a and b must be string or bytestring
+
+  const al: i32 = Porffor.wasm.i32.load(a, 0, 0);
+  const bl: i32 = Porffor.wasm.i32.load(b, 0, 0);
+
+  if (Porffor.wasm`local.get ${a+1}` == Porffor.TYPES.bytestring) {
+    if (Porffor.wasm`local.get ${b+1}` == Porffor.TYPES.bytestring) {
+      // bytestring, bytestring
+      const out: bytestring = Porffor.allocateBytes(4 + al + bl);
+
+      // out.length = a.length + b.length
+      Porffor.wasm.i32.store(out, al + bl, 0, 0);
+
+      // copy left (fast memcpy)
+      Porffor.wasm.memory.copy(Porffor.wasm`local.get ${out}` + 4, Porffor.wasm`local.get ${a}` + 4, al, 0, 0);
+
+      // copy right (fast memcpy)
+      Porffor.wasm.memory.copy(Porffor.wasm`local.get ${out}` + 4 + al, Porffor.wasm`local.get ${b}` + 4, bl, 0, 0);
+
+      return out;
+    } else {
+      // bytestring, string
+      const out: string = Porffor.allocateBytes(4 + (al + bl) * 2);
+
+      // out.length = a.length + b.length
+      Porffor.wasm.i32.store(out, al + bl, 0, 0);
+
+      // copy left (slow bytestring -> string)
+      for (let i: i32 = 0; i < al; i++) {
+        Porffor.wasm.i32.store16(Porffor.wasm`local.get ${out}` + i*2, Porffor.wasm.i32.load8_u(Porffor.wasm`local.get ${a}` + i, 0, 4), 0, 4);
+      }
+
+      // copy right (fast memcpy)
+      Porffor.wasm.memory.copy(Porffor.wasm`local.get ${out}` + 4 + al*2, Porffor.wasm`local.get ${b}` + 4, bl * 2, 0, 0);
+
+      return out;
+    }
+  } else {
+    if (Porffor.wasm`local.get ${b+1}` == Porffor.TYPES.bytestring) {
+      // string, bytestring
+      const out: string = Porffor.allocateBytes(4 + (al + bl) * 2);
+
+      // out.length = a.length + b.length
+      Porffor.wasm.i32.store(out, al + bl, 0, 0);
+
+      // copy left (fast memcpy)
+      Porffor.wasm.memory.copy(Porffor.wasm`local.get ${out}` + 4, Porffor.wasm`local.get ${a}` + 4, al * 2, 0, 0);
+
+      // copy right (slow bytestring -> string)
+      let ptr: i32 = Porffor.wasm`local.get ${out}` + al*2;
+      for (let i: i32 = 0; i < bl; i++) {
+        Porffor.wasm.i32.store16(ptr + i*2, Porffor.wasm.i32.load8_u(Porffor.wasm`local.get ${b}` + i, 0, 4), 0, 4);
+      }
+
+      return out;
+    } else {
+      // string, string
+      const out: string = Porffor.allocateBytes(4 + (al + bl) * 2);
+
+      // out.length = a.length + b.length
+      Porffor.wasm.i32.store(out, al + bl, 0, 0);
+
+      // copy left (fast memcpy)
+      Porffor.wasm.memory.copy(Porffor.wasm`local.get ${out}` + 4, Porffor.wasm`local.get ${a}` + 4, al * 2, 0, 0);
+
+      // copy right (fast memcpy)
+      Porffor.wasm.memory.copy(Porffor.wasm`local.get ${out}` + 4 + al*2, Porffor.wasm`local.get ${b}` + 4, bl * 2, 0, 0);
+
+      return out;
+    }
+  }
 };

package/compiler/builtins/_internal_string.ts

@@ -35,4 +35,25 @@ export const __Porffor_compareStrings = (a: any, b: any): boolean => {
   }
 
   return Porffor.strcmp(a, b);
+};
+
+export const __Porffor_concatStrings = (a: any, b: any): boolean => {
+  let at: i32 = Porffor.rawType(a);
+  let bt: i32 = Porffor.rawType(b);
+
+  if ((at | 0b10000000) != Porffor.TYPES.bytestring) {
+    // a is not string or bytestring
+    // todo/perf: just use a.toString()?
+    a = ecma262.ToString(a);
+    at = Porffor.rawType(a);
+  }
+
+  if ((bt | 0b10000000) != Porffor.TYPES.bytestring) {
+    // b is not string or bytestring
+    // todo/perf: just use b.toString()?
+    b = ecma262.ToString(b);
+    bt = Porffor.rawType(b);
+  }
+
+  return Porffor.strcat(a, b);
 };

package/compiler/builtins/string.ts

@@ -1079,14 +1079,21 @@ 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;
+  let out = Porffor.allocate();
+  Porffor.clone(_this, out);
+
+  // override type to string
+  Porffor.wasm`
+i32.const 67 ;; string
+local.set ${out+1}`;
 
   const valsLen: i32 = vals.length;
   for (let i: i32 = 0; i < valsLen; i++) {
-    let x: any;
     Porffor.wasm`
+local.get ${out}
+f64.convert_i32_u
+local.get ${out+1}
+
 local.get ${vals}
 local.get ${i}
 i32.const 9
@@ -1101,26 +1108,31 @@ i32.mul
 i32.add
 i32.load8_u 0 12
 
-call __ecma262_ToString
-local.set ${x+1}
+call __Porffor_concatStrings
+local.set ${out+1}
 i32.trunc_sat_f64_u
-local.set ${x}`;
-
-    out += x;
+local.set ${out}`;
   }
 
   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;
+  let out = Porffor.allocate();
+  Porffor.clone(_this, out);
+
+  // override type to bytestring
+  Porffor.wasm`
+i32.const 195 ;; bytestring
+local.set ${out+1}`;
 
   const valsLen: i32 = vals.length;
   for (let i: i32 = 0; i < valsLen; i++) {
-    let x: any;
     Porffor.wasm`
+local.get ${out}
+f64.convert_i32_u
+local.get ${out+1}
+
 local.get ${vals}
 local.get ${i}
 i32.const 9
@@ -1135,12 +1147,10 @@ i32.mul
 i32.add
 i32.load8_u 0 12
 
-call __ecma262_ToString
-local.set ${x+1}
+call __Porffor_concatStrings
+local.set ${out+1}
 i32.trunc_sat_f64_u
-local.set ${x}`;
-
-    out += x;
+local.set ${out}`;
   }
 
   return out;