porffor 0.16.0-60619b22e → 0.16.0-61ae4fd8d

package/compiler/builtins/string_f64.ts

@@ -0,0 +1,10 @@
+// todo: support non-bytestring properly
+export const String = (value: any): bytestring => {
+  if (Porffor.rawType(value) == Porffor.TYPES.symbol) return __Symbol_prototype_toString(value);
+  return __ecma262_ToString(value);
+};
+
+// todo: support constructor/string objects properly
+export const String$constructor = (value: any): bytestring => {
+  return __ecma262_ToString(value);
+};

package/compiler/codegen.js

@@ -1933,15 +1933,15 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     }
 
     if (valtypeBinary !== Valtype.i32 &&
-      (builtinFuncs[name] && builtinFuncs[name].params[i * (typedParams ? 2 : 1)] === Valtype.i32)
+      (func && func.params[i * (typedParams ? 2 : 1)] === Valtype.i32)
     ) {
       out.push(Opcodes.i32_to);
     }
 
     if (valtypeBinary === Valtype.i32 &&
-      (builtinFuncs[name] && builtinFuncs[name].params[i * (typedParams ? 2 : 1)] === Valtype.f64)
+      (func && func.params[i * (typedParams ? 2 : 1)] === Valtype.f64)
     ) {
-      out.push(Opcodes.f64_convert_i32_s);
+      out.push([ Opcodes.f64_convert_i32_s ]);
     }
 
     if (typedParams) out = out.concat(getNodeType(scope, arg));
@@ -3665,6 +3665,9 @@ const generateFunc = (scope, decl) => {
     index: currentFuncIndex++
   };
 
+  funcIndex[name] = func.index;
+  funcs.push(func);
+
   if (typedInput && decl.returnType) {
     const { type } = extractTypeAnnotation(decl.returnType);
     // if (type != null && !Prefs.indirectCalls) {
@@ -3674,12 +3677,26 @@ const generateFunc = (scope, decl) => {
     }
   }
 
+  const defaultValues = {};
   for (let i = 0; i < params.length; i++) {
-    const name = params[i].name;
+    let name;
+    const x = params[i];
+    switch (x.type) {
+      case 'Identifier': {
+        name = x.name;
+        break;
+      }
+
+      case 'AssignmentPattern': {
+        name = x.left.name;
+        defaultValues[name] = x.right;
+        break;
+      }
+    }
+
     // if (name == null) return todo('non-identifier args are not supported');
 
     allocVar(func, name, false);
-
     if (typedInput && params[i].typeAnnotation) {
       addVarMetadata(func, name, false, extractTypeAnnotation(params[i]));
     }
@@ -3696,11 +3713,22 @@ const generateFunc = (scope, decl) => {
     };
   }
 
-  funcIndex[name] = func.index;
-  funcs.push(func);
+  const prelude = [];
+  for (const x in defaultValues) {
+    prelude.push(
+      ...getType(func, x),
+      ...number(TYPES.undefined, Valtype.i32),
+      [ Opcodes.i32_eq ],
+      [ Opcodes.if, Blocktype.void ],
+        ...generate(func, defaultValues[x], false, x),
+        [ Opcodes.local_set, func.locals[x].idx ],
 
-  const wasm = generate(func, body);
-  func.wasm = wasm;
+        ...setType(func, x, getNodeType(scope, defaultValues[x])),
+      [ Opcodes.end ]
+    );
+  }
+
+  const wasm = func.wasm = prelude.concat(generate(func, body));
 
   if (name === 'main') func.gotLastType = true;
 

package/compiler/generated_builtins.js

@@ -2092,6 +2092,24 @@ export const BuiltinFuncs = function() {
     locals: [],
     localNames: ["_this","_this#type"],
   };
+  this.String = {
+    wasm: (scope, {builtin,}) => [[32,0],[32,1],[16, builtin('__Porffor_rawType')],[68,0,0,0,0,0,0,24,64],[97],[4,64],[32,0],[32,1],[16, builtin('__Symbol_prototype_toString')],[26],[15],[11],[32,0],[32,1],[16, builtin('__ecma262_ToString')],[15]],
+    params: [124,127],
+    typedParams: true,
+    returns: [124],
+    returnType: 18,
+    locals: [127],
+    localNames: ["value","value#type","#last_type"],
+  };
+  this.String$constructor = {
+    wasm: (scope, {builtin,}) => [[32,0],[32,1],[16, builtin('__ecma262_ToString')],[15]],
+    params: [124,127],
+    typedParams: true,
+    returns: [124],
+    returnType: 18,
+    locals: [],
+    localNames: ["value","value#type"],
+  };
   this.__Porffor_symbol_descStore = {
     wasm: (scope, {allocPage,builtin,}) => [...number(allocPage(scope, 'bytestring: __Porffor_symbol_descStore/ptr', 'i8') * pageSize, 124),[33,4],[32,0],[252,3],[4,64],[32,4],[252,2],[40,0,0],[183],[33,5],[32,4],[252,2],[32,5],[68,0,0,0,0,0,0,240,63],[160],[252,2],[54,0,0],[32,4],[65,18],[32,5],[65,0],[32,2],[32,3],[16, builtin('__Porffor_set_write')],[26],[32,5],[65,0],[15],[5],[32,4],[65,18],[32,2],[32,3],[16, builtin('__Porffor_set_read')],[34,6],[15],[11],[68,0,0,0,0,0,0,0,0],[65,3],[15]],
     params: [124,127,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.16.0-60619b22e",
+  "version": "0.16.0-61ae4fd8d",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {},