porffor 0.14.0-3c0ba31cd → 0.14.0-3fa90b5d2

package/compiler/builtins/array.ts

@@ -27,14 +27,16 @@ export const __Array_prototype_slice = (_this: any[], start: number, end: number
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
   let thisPtr: i32 = Porffor.wasm`local.get ${_this}`;
 
-  const thisPtrEnd: i32 = thisPtr + end * 8;
+  const thisPtrEnd: i32 = thisPtr + end * 9;
 
-  thisPtr += start * 8;
+  thisPtr += start * 9;
 
   while (thisPtr < thisPtrEnd) {
     Porffor.wasm.f64.store(outPtr, Porffor.wasm.f64.load(thisPtr, 0, 4), 0, 4);
-    thisPtr += 8;
-    outPtr += 8;
+    Porffor.wasm.i32.store8(outPtr + 8, Porffor.wasm.i32.load8_u(thisPtr + 8, 0, 4), 0, 4);
+
+    thisPtr += 9;
+    outPtr += 9;
   }
 
   out.length = end - start;

package/compiler/builtins/set.ts

@@ -56,14 +56,13 @@ i32.store8 0 12`;
 };
 
 
-// todo: this should be a getter somehow not a method
-export const __Set_prototype_size = (_this: Set) => {
+export const __Set_prototype_size$get = (_this: Set) => {
   return Porffor.wasm.i32.load(_this, 0, 0);
 };
 
 export const __Set_prototype_values = (_this: Set) => {
   // todo: this should return an iterator not array
-  const size: number = __Set_prototype_size(_this);
+  const size: number = Porffor.wasm.i32.load(_this, 0, 0);
 
   const out: any[] = __Porffor_allocate();
   for (let i: number = 0; i < size; i++) {
@@ -79,7 +78,7 @@ export const __Set_prototype_keys = (_this: Set) => {
 };
 
 export const __Set_prototype_has = (_this: Set, value: any) => {
-  const size: number = __Set_prototype_size(_this);
+  const size: number = Porffor.wasm.i32.load(_this, 0, 0);
 
   for (let i: number = 0; i < size; i++) {
     if (__Porffor_set_read(_this, i) === value) return true;
@@ -89,7 +88,7 @@ export const __Set_prototype_has = (_this: Set, value: any) => {
 };
 
 export const __Set_prototype_add = (_this: Set, value: any) => {
-  const size: number = __Set_prototype_size(_this);
+  const size: number = Porffor.wasm.i32.load(_this, 0, 0);
 
   // check if already in set
   for (let i: number = 0; i < size; i++) {
@@ -107,7 +106,7 @@ export const __Set_prototype_add = (_this: Set, value: any) => {
 };
 
 export const __Set_prototype_delete = (_this: Set, value: any) => {
-  const size: number = __Set_prototype_size(_this);
+  const size: number = Porffor.wasm.i32.load(_this, 0, 0);
 
   // check if already in set
   for (let i: number = 0; i < size; i++) {

package/compiler/builtins/symbol.ts

@@ -19,7 +19,7 @@ export const Symbol = (description: any): Symbol => {
 };
 
 // todo: this should be a getter somehow not a method
-export const __Symbol_prototype_description = (_this: Symbol) => {
+export const __Symbol_prototype_description$get = (_this: Symbol) => {
   const description: bytestring = __Porffor_symbol_descStore(false,
     Porffor.wasm`local.get ${_this}` - 1);
   return description;

package/compiler/builtins.js

@@ -221,6 +221,7 @@ export const BuiltinFuncs = function() {
     typedParams: true,
     locals: [ Valtype.i32, Valtype.i32 ],
     returns: [],
+    callsSelf: true,
     wasm: (scope, { typeSwitch }) => [
       ...typeSwitch(scope, [ [ Opcodes.local_get, 1 ] ], {
         [TYPES.number]: [
@@ -317,7 +318,7 @@ export const BuiltinFuncs = function() {
 
           // make end pointer
           [ Opcodes.i32_load, Math.log2(ValtypeSize.i32) - 1, 0 ],
-          ...number(ValtypeSize[valtype], Valtype.i32),
+          ...number(ValtypeSize[valtype] + 1, Valtype.i32),
           [ Opcodes.i32_mul ],
 
           [ Opcodes.local_get, 2 ],
@@ -328,12 +329,16 @@ export const BuiltinFuncs = function() {
 
           // print current char
           [ Opcodes.local_get, 2 ],
-          [ Opcodes.load, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
-          [ Opcodes.call, importedFuncs.print ],
+          [ Opcodes.load, 0, ValtypeSize.i32 ],
+
+          [ Opcodes.local_get, 2 ],
+          [ Opcodes.i32_load8_u, 0, ValtypeSize.i32 + ValtypeSize[valtype] ],
+
+          [ Opcodes.call, -1 ],
 
           // increment pointer by sizeof valtype
           [ Opcodes.local_get, 2 ],
-          ...number(ValtypeSize[valtype], Valtype.i32),
+          ...number(ValtypeSize[valtype] + 1, Valtype.i32),
           [ Opcodes.i32_add ],
           [ Opcodes.local_tee, 2 ],