porffor 0.35.1 → 0.35.3

package/compiler/builtins/annexb_string.js

@@ -1,59 +1,14 @@
 export default () => {
-  let out = `// @porf --funsafe-no-unlikely-proto-checks --valtype=i32
-`;
-
+  let out = ``;
   const noArgs = (a0, a1) => out += `
-export const __String_prototype_${a0} = (_this: string) => {
-  let out: string = Porffor.s\`<${a1}>\`;
-
-  let outPtr: i32 = Porffor.wasm\`local.get \${out}\` + ${(2 + a1.length) * 2};
-  let thisPtr: i32 = Porffor.wasm\`local.get \${_this}\`;
-  let thisLen: i32 = _this.length;
-  let endPtr: i32 = thisPtr + thisLen * 2;
-
-  while (thisPtr < endPtr) {
-    let chr: i32 = Porffor.wasm.i32.load16_u(thisPtr, 0, 4);
-    Porffor.wasm.i32.store16(outPtr, chr, 0, 4);
-
-    thisPtr += 2;
-    outPtr += 2;
-  }
-
-  Porffor.wasm.i32.store16(outPtr, 60, 0, 4); // <
-  Porffor.wasm.i32.store16(outPtr, 47, 0, 6); // /
-
-${[...a1].map((x, i) => `  Porffor.wasm.i32.store16(outPtr, ${x.charCodeAt(0)}, 0, ${8 + i * 2}); // ${x}`).join('\n')}
-
-  Porffor.wasm.i32.store16(outPtr, 62, 0, ${8 + a1.length * 2}); // >
-
-  out.length = thisLen + ${a1.length * 2 + 2 + 3};
-
-  return out;
-};
-export const __ByteString_prototype_${a0} = (_this: bytestring) => {
-  let out: bytestring = Porffor.bs\`<${a1}>\`;
-
-  let outPtr: i32 = Porffor.wasm\`local.get \${out}\` + ${2 + a1.length};
-  let thisPtr: i32 = Porffor.wasm\`local.get \${_this}\`;
-  let thisLen: i32 = _this.length;
-  let endPtr: i32 = thisPtr + thisLen;
-
-  while (thisPtr < endPtr) {
-    let chr: i32 = Porffor.wasm.i32.load8_u(thisPtr++, 0, 4);
-    Porffor.wasm.i32.store8(outPtr++, chr, 0, 4);
-  }
-
-  Porffor.wasm.i32.store8(outPtr, 60, 0, 4); // <
-  Porffor.wasm.i32.store8(outPtr, 47, 0, 5); // /
-
-${[...a1].map((x, i) => `  Porffor.wasm.i32.store8(outPtr, ${x.charCodeAt(0)}, 0, ${6 + i}); // ${x}`).join('\n')}
-
-  Porffor.wasm.i32.store8(outPtr, 62, 0, ${6 + a1.length}); // >
+export const __String_prototype_${a0} = (_this: any) => {
+  const pre: bytestring = '<${a1}>';
+  const post: bytestring = '</${a1}>';
 
-  out.length = thisLen + ${a1.length * 2 + 2 + 3};
-
-  return out;
+  return Porffor.concatStrings(Porffor.concatStrings(pre, _this), post);
 };
+export const __ByteString_prototype_${a0} = (_this: any) =>
+  __String_prototype_${a0}(_this);
 `;
 
   noArgs('big', 'big');
@@ -67,69 +22,15 @@ ${[...a1].map((x, i) => `  Porffor.wasm.i32.store8(outPtr, ${x.charCodeAt(0)}, 0
   noArgs('sup', 'sup');
 
   const arg = (name, s1, s2) => out += `
-export const __String_prototype_${name} = (_this: string, arg: any) => {
-  let out: string = Porffor.s\`${`<${s1} ${s2}="`}\`;
-  out += arg;
-
-  let outPtr: i32 = Porffor.wasm\`local.get \${out}\` + ${(`<${s1} ${s2}="`.length + 2) * 2} + arg.length * 2;
-
-  Porffor.wasm.i32.store16(outPtr, 34, 0, 0); // "
-  Porffor.wasm.i32.store16(outPtr, 62, 0, 2); // >
-
-  let thisPtr: i32 = Porffor.wasm\`local.get \${_this}\`;
-  let thisLen: i32 = _this.length;
-  let endPtr: i32 = thisPtr + thisLen * 2;
+export const __String_prototype_${name} = (_this: any, arg: any) => {
+  const pre1: bytestring = '<${s1} ${s2}="';
+  const pre2: bytestring = '">';
+  const post: bytestring = '</${s1}>';
 
-  while (thisPtr < endPtr) {
-    let chr: i32 = Porffor.wasm.i32.load16_u(thisPtr, 0, 4);
-    Porffor.wasm.i32.store16(outPtr, chr, 0, 4);
-
-    thisPtr += 2;
-    outPtr += 2;
-  }
-
-  Porffor.wasm.i32.store16(outPtr, 60, 0, 4); // <
-  Porffor.wasm.i32.store16(outPtr, 47, 0, 6); // /
-
-${[...s1].map((x, i) => `  Porffor.wasm.i32.store16(outPtr, ${x.charCodeAt(0)}, 0, ${8 + i * 2}); // ${x}`).join('\n')}
-
-  Porffor.wasm.i32.store16(outPtr, 62, 0, ${8 + s1.length * 2}); // >
-
-  out.length = thisLen + arg.length + ${`<${s1} ${s2}="`.length + s1.length + 5};
-
-  return out;
-};
-export const __ByteString_prototype_${name} = (_this: bytestring, arg: any) => {
-  let out: string = Porffor.s\`${`<${s1} ${s2}="`}\`;
-  out += arg;
-
-  let outPtr: i32 = Porffor.wasm\`local.get \${out}\` + ${(`<${s1} ${s2}="`.length + 2) * 2} + arg.length * 2;
-
-  Porffor.wasm.i32.store16(outPtr, 34, 0, 0); // "
-  Porffor.wasm.i32.store16(outPtr, 62, 0, 2); // >
-
-  let thisPtr: i32 = Porffor.wasm\`local.get \${_this}\`;
-  let thisLen: i32 = _this.length;
-  let endPtr: i32 = thisPtr + thisLen;
-
-  while (thisPtr < endPtr) {
-    let chr: i32 = Porffor.wasm.i32.load8_u(thisPtr++, 0, 4);
-    Porffor.wasm.i32.store16(outPtr, chr, 0, 4);
-
-    outPtr += 2;
-  }
-
-  Porffor.wasm.i32.store16(outPtr, 60, 0, 4); // <
-  Porffor.wasm.i32.store16(outPtr, 47, 0, 6); // /
-
-${[...s1].map((x, i) => `  Porffor.wasm.i32.store16(outPtr, ${x.charCodeAt(0)}, 0, ${8 + i * 2}); // ${x}`).join('\n')}
-
-  Porffor.wasm.i32.store16(outPtr, 62, 0, ${8 + s1.length * 2}); // >
-
-  out.length = thisLen + arg.length + ${`<${s1} ${s2}="`.length + s1.length + 5};
-
-  return out;
+  return Porffor.concatStrings(Porffor.concatStrings(Porffor.concatStrings(Porffor.concatStrings(pre1, arg), pre2), _this), post);
 };
+export const __ByteString_prototype_${name} = (_this: any, arg: any) =>
+  __String_prototype_${name}(_this, arg);
 `;
 
   arg('fontcolor', 'font', 'color');
@@ -137,12 +38,10 @@ ${[...s1].map((x, i) => `  Porffor.wasm.i32.store16(outPtr, ${x.charCodeAt(0)},
   arg('anchor', 'a', 'name');
   arg('link', 'a', 'href');
 
-  const prototypeAlias = (regular, annex) => `export const __String_prototype_${annex} = (_this: string) => {
-  return __String_prototype_${regular}(_this);
-};
-export const __ByteString_prototype_${annex} = (_this: bytestring) => {
-  return __ByteString_prototype_${regular}(_this);
-};
+  const prototypeAlias = (regular, annex) => `export const __String_prototype_${annex} = (_this: any) =>
+  __String_prototype_${regular}(_this);
+export const __ByteString_prototype_${annex} = (_this: any) =>
+  __ByteString_prototype_${regular}(_this);
 `;
 
   prototypeAlias('trimStart', 'trimLeft');

package/compiler/builtins/object.ts

@@ -193,8 +193,7 @@ export const __Porffor_object_in = (obj: any, prop: any) => {
     return true;
   }
 
-  const t: i32 = Porffor.rawType(obj);
-  if (t != Porffor.TYPES.object) {
+  if (Porffor.rawType(obj) != Porffor.TYPES.object) {
     return false;
   }
 
@@ -206,6 +205,31 @@ export const __Porffor_object_in = (obj: any, prop: any) => {
 
     if (__Object_prototype_hasOwnProperty(obj, prop)) return true;
   }
+
+  return false;
+};
+
+export const __Porffor_object_instanceof = (obj: any, constr: any) => {
+  if (Porffor.rawType(constr) != Porffor.TYPES.function) {
+    throw new TypeError('instanceof right-hand side is not a function');
+  }
+
+  const checkProto: any = constr.prototype;
+  if (!Porffor.object.isObject(checkProto)) {
+    throw new TypeError('instanceof right-hand side has non-object prototype');
+  }
+
+  let lastProto = obj;
+  while (true) {
+    obj = obj.__proto__;
+    if (Porffor.fastOr(obj == null, Porffor.wasm`local.get ${obj}` == Porffor.wasm`local.get ${lastProto}`)) break;
+    lastProto = obj;
+
+    console.log(obj === Object.prototype);
+    if (obj === checkProto) return true;
+  }
+
+  return false;
 };
 
 

package/compiler/builtins.js

@@ -160,19 +160,19 @@ export const BuiltinFuncs = function() {
   // add bitwise ops by converting operands to i32 first
   for (const [ char, op ] of [ ['&', Opcodes.i32_and], ['|', Opcodes.i32_or], ['^', Opcodes.i32_xor], ['<<', Opcodes.i32_shl], ['>>', Opcodes.i32_shr_s], ['>>>', Opcodes.i32_shr_u] ]) {
     this[`f64_${char}`] = {
-      params: [ valtypeBinary, valtypeBinary ],
+      params: [ Valtype.f64, Valtype.f64 ],
       locals: [],
-      returns: [ valtypeBinary ],
+      returns: [ Valtype.f64 ],
       returnType: TYPES.number,
       wasm: [
         [ Opcodes.local_get, 0 ],
-        Opcodes.i32_to,
+        Opcodes.i32_trunc_sat_f64_s,
 
         [ Opcodes.local_get, 1 ],
-        Opcodes.i32_to,
+        Opcodes.i32_trunc_sat_f64_s,
 
         [ op ],
-        Opcodes.i32_from
+        [ Opcodes.f64_convert_i32_s ]
       ]
     };
   }