porffor 0.2.0-e04e26f → 0.2.0-e62542f

package/compiler/builtins/escape.ts

@@ -1,4 +1,4 @@
-// @porf -funsafe-no-unlikely-proto-checks -valtype=i32
+// @porf --funsafe-no-unlikely-proto-checks --valtype=i32
 
 import type {} from './porffor';
 
@@ -13,7 +13,7 @@ export const escape = (input: string|bytestring): bytestring => {
 
   let i: i32 = Porffor.wasm`local.get ${input}`;
 
-  if (Porffor.wasm`local.get ${input+1}` == Porffor.TYPES._bytestring) {
+  if (Porffor.wasm`local.get ${input+1}` == Porffor.TYPES.bytestring) {
     const endPtr: i32 = i + len;
     while (i < endPtr) {
       const chr: i32 = Porffor.wasm.i32.load8_u(i++, 0, 4);

package/compiler/builtins/int.ts

@@ -1,4 +1,4 @@
-// @porf -funsafe-no-unlikely-proto-checks
+// @porf --funsafe-no-unlikely-proto-checks
 
 // radix: number|any for rawType check
 // export const parseInt = (input: string|bytestring, radix: number|any): f64 => {
@@ -17,7 +17,7 @@ export const parseInt = (input: string|bytestring, radix: number): f64 => {
   let nMax: f64 = 58;
   if (radix < 10) nMax = 48 + radix;
 
-  // if (Porffor.rawType(input) == Porffor.TYPES._bytestring) input = ___bytestring_prototype_trimStart(input);
+  // if (Porffor.rawType(input) == Porffor.TYPES.bytestring) input = __ByteString_prototype_trimStart(input);
   //   else input = __String_prototype_trimStart(input);
 
   let n: f64 = NaN;
@@ -28,7 +28,7 @@ export const parseInt = (input: string|bytestring, radix: number): f64 => {
 
   let negative: boolean = false;
 
-  if (Porffor.rawType(input) == Porffor.TYPES._bytestring) {
+  if (Porffor.rawType(input) == Porffor.TYPES.bytestring) {
     const endPtr: f64 = i + len;
 
     // check start of string

package/compiler/builtins/number.ts

@@ -1,4 +1,4 @@
-// // @porf -funsafe-no-unlikely-proto-checks
+// @porf --funsafe-no-unlikely-proto-checks
 
 // radix: number|any for rawType check
 export const __Number_prototype_toString = (_this: number, radix: number|any) => {

package/compiler/builtins/porffor.d.ts

@@ -7,23 +7,40 @@ type PorfforGlobal = {
   wasm: {
     (...args: any[]): any;
     i32: {
-      or(a: i32, b: i32): i32;
-
       load(pointer: i32, align: i32, offset: i32): i32;
       store(pointer: i32, value: i32, align: i32, offset: i32): i32;
       load8_u(pointer: i32, align: i32, offset: i32): i32;
       store8(pointer: i32, value: i32, align: i32, offset: i32): i32;
       load16_u(pointer: i32, align: i32, offset: i32): i32;
       store16(pointer: i32, value: i32, align: i32, offset: i32): i32;
+      const(value: i32): i32;
+    }
+
+    f64: {
+      load(pointer: i32, align: i32, offset: i32): i32;
+      store(pointer: i32, value: f64, align: i32, offset: i32): f64;
     }
   }
 
-  // randomInt(): i32;
   randomByte(): i32;
 
   type(x: any): bytestring;
   rawType(x: any): i32;
-  TYPES: Record<string, i32>;
+  TYPES: {
+    number: i32;
+    boolean: i32;
+    string: i32;
+    undefined: i32;
+    object: i32;
+    function: i32;
+    symbol: i32;
+    bigint: i32;
+
+    _array: i32;
+    _regexp: i32;
+    _bytestring: i32;
+    _date: i32;
+  }
 
   fastOr(...args: any): boolean;
   fastAnd(...args: any): boolean;

package/compiler/builtins/string.ts

@@ -1,4 +1,4 @@
-// @porf -funsafe-no-unlikely-proto-checks -valtype=i32
+// @porf --funsafe-no-unlikely-proto-checks --valtype=i32
 
 export const __String_fromCharCode = (code: i32) => {
   // todo: support >1 arg
@@ -37,7 +37,7 @@ export const __String_prototype_toUpperCase = (_this: string) => {
   return out;
 };
 
-export const ___bytestring_prototype_toUpperCase = (_this: bytestring) => {
+export const __ByteString_prototype_toUpperCase = (_this: bytestring) => {
   const len: i32 = _this.length;
 
   let out: bytestring = '';
@@ -83,7 +83,7 @@ export const __String_prototype_toLowerCase = (_this: string) => {
   return out;
 };
 
-export const ___bytestring_prototype_toLowerCase = (_this: bytestring) => {
+export const __ByteString_prototype_toLowerCase = (_this: bytestring) => {
   const len: i32 = _this.length;
 
   let out: bytestring = '';
@@ -134,10 +134,10 @@ export const __String_prototype_startsWith = (_this: string, searchString: strin
   return true;
 };
 
-export const ___bytestring_prototype_startsWith = (_this: bytestring, searchString: bytestring, position: number) => {
+export const __ByteString_prototype_startsWith = (_this: bytestring, searchString: bytestring, position: number) => {
   // if searching non-bytestring, bytestring will not start with it
   // todo: change this to just check if = string and ToString others
-  if (Porffor.wasm`local.get ${searchString+1}` != Porffor.TYPES._bytestring) return false;
+  if (Porffor.wasm`local.get ${searchString+1}` != Porffor.TYPES.bytestring) return false;
 
   // todo/perf: investigate whether for counter vs while ++s are faster
 
@@ -204,10 +204,10 @@ export const __String_prototype_endsWith = (_this: string, searchString: string,
   return true;
 };
 
-export const ___bytestring_prototype_endsWith = (_this: bytestring, searchString: bytestring, endPosition: number) => {
+export const __ByteString_prototype_endsWith = (_this: bytestring, searchString: bytestring, endPosition: number) => {
   // if searching non-bytestring, bytestring will not start with it
   // todo: change this to just check if = string and ToString others
-  if (Porffor.wasm`local.get ${searchString+1}` != Porffor.TYPES._bytestring) return false;
+  if (Porffor.wasm`local.get ${searchString+1}` != Porffor.TYPES.bytestring) return false;
 
   let i: i32 = Porffor.wasm`local.get ${_this}`,
       j: i32 = Porffor.wasm`local.get ${searchString}`;
@@ -282,10 +282,10 @@ export const __String_prototype_indexOf = (_this: string, searchString: string,
   return -1;
 };
 
-export const ___bytestring_prototype_indexOf = (_this: bytestring, searchString: bytestring, position: number) => {
+export const __ByteString_prototype_indexOf = (_this: bytestring, searchString: bytestring, position: number) => {
   // if searching non-bytestring, bytestring will not start with it
   // todo: change this to just check if = string and ToString others
-  if (Porffor.wasm`local.get ${searchString+1}` != Porffor.TYPES._bytestring) return -1;
+  if (Porffor.wasm`local.get ${searchString+1}` != Porffor.TYPES.bytestring) return -1;
 
   let thisPtr: i32 = Porffor.wasm`local.get ${_this}`;
   const searchPtr: i32 = Porffor.wasm`local.get ${searchString}`;
@@ -369,10 +369,10 @@ export const __String_prototype_lastIndexOf = (_this: string, searchString: stri
   return -1;
 };
 
-export const ___bytestring_prototype_lastIndexOf = (_this: bytestring, searchString: bytestring, position: number) => {
+export const __ByteString_prototype_lastIndexOf = (_this: bytestring, searchString: bytestring, position: number) => {
   // if searching non-bytestring, bytestring will not start with it
   // todo: change this to just check if = string and ToString others
-  if (Porffor.wasm`local.get ${searchString+1}` != Porffor.TYPES._bytestring) return -1;
+  if (Porffor.wasm`local.get ${searchString+1}` != Porffor.TYPES.bytestring) return -1;
 
   let thisPtr: i32 = Porffor.wasm`local.get ${_this}`;
   const searchPtr: i32 = Porffor.wasm`local.get ${searchString}`;
@@ -455,10 +455,10 @@ export const __String_prototype_includes = (_this: string, searchString: string,
   return false;
 };
 
-export const ___bytestring_prototype_includes = (_this: bytestring, searchString: bytestring, position: number) => {
+export const __ByteString_prototype_includes = (_this: bytestring, searchString: bytestring, position: number) => {
   // if searching non-bytestring, bytestring will not start with it
   // todo: change this to just check if = string and ToString others
-  if (Porffor.wasm`local.get ${searchString+1}` != Porffor.TYPES._bytestring) return -1;
+  if (Porffor.wasm`local.get ${searchString+1}` != Porffor.TYPES.bytestring) return -1;
 
   let thisPtr: i32 = Porffor.wasm`local.get ${_this}`;
   const searchPtr: i32 = Porffor.wasm`local.get ${searchString}`;
@@ -542,7 +542,7 @@ export const __String_prototype_padStart = (_this: string, targetLength: number,
   return out;
 };
 
-export const ___bytestring_prototype_padStart = (_this: bytestring, targetLength: number, padString: bytestring) => {
+export const __ByteString_prototype_padStart = (_this: bytestring, targetLength: number, padString: bytestring) => {
   // todo: handle padString being non-bytestring
 
   let out: bytestring = Porffor.bs``;
@@ -631,7 +631,7 @@ export const __String_prototype_padEnd = (_this: string, targetLength: number, p
   return out;
 };
 
-export const ___bytestring_prototype_padEnd = (_this: bytestring, targetLength: number, padString: bytestring) => {
+export const __ByteString_prototype_padEnd = (_this: bytestring, targetLength: number, padString: bytestring) => {
   // todo: handle padString being non-bytestring
 
   let out: bytestring = Porffor.bs``;
@@ -713,7 +713,7 @@ export const __String_prototype_substring = (_this: string, start: number, end:
   return out;
 };
 
-export const ___bytestring_prototype_substring = (_this: bytestring, start: number, end: number) => {
+export const __ByteString_prototype_substring = (_this: bytestring, start: number, end: number) => {
   const len: i32 = _this.length;
   if (Porffor.wasm`local.get ${end+1}` == Porffor.TYPES.undefined) end = len;
     else if (start > end) {
@@ -786,7 +786,7 @@ export const __String_prototype_substr = (_this: string, start: number, length:
   return out;
 };
 
-export const ___bytestring_prototype_substr = (_this: string, start: number, length: number) => {
+export const __ByteString_prototype_substr = (_this: string, start: number, length: number) => {
   const len: i32 = _this.length;
 
   start |= 0;
@@ -862,7 +862,7 @@ export const __String_prototype_slice = (_this: string, start: number, end: numb
   return out;
 };
 
-export const ___bytestring_prototype_slice = (_this: bytestring, start: number, end: number) => {
+export const __ByteString_prototype_slice = (_this: bytestring, start: number, end: number) => {
   const len: i32 = _this.length;
   if (Porffor.wasm`local.get ${end+1}` == Porffor.TYPES.undefined) end = len;
 
@@ -935,7 +935,7 @@ export const __String_prototype_trimStart = (_this: string) => {
   return out;
 };
 
-export const ___bytestring_prototype_trimStart = (_this: bytestring) => {
+export const __ByteString_prototype_trimStart = (_this: bytestring) => {
   let out: bytestring = Porffor.bs``;
 
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
@@ -1006,7 +1006,7 @@ export const __String_prototype_trimEnd = (_this: string) => {
   return out;
 };
 
-export const ___bytestring_prototype_trimEnd = (_this: bytestring) => {
+export const __ByteString_prototype_trimEnd = (_this: bytestring) => {
   let out: bytestring = Porffor.bs``;
 
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
@@ -1049,7 +1049,7 @@ export const __String_prototype_trim = (_this: string) => {
   return __String_prototype_trimStart(__String_prototype_trimEnd(_this));
 };
 
-export const ___bytestring_prototype_trim = (_this: bytestring) => {
+export const __ByteString_prototype_trim = (_this: bytestring) => {
   // todo/perf: optimize and not just reuse
-  return ___bytestring_prototype_trimStart(___bytestring_prototype_trimEnd(_this));
+  return __ByteString_prototype_trimStart(__ByteString_prototype_trimEnd(_this));
 };

package/compiler/builtins/tostring.ts

@@ -1,4 +1,4 @@
-// // @porf -funsafe-no-unlikely-proto-checks -valtype=i32
+// // @porf --funsafe-no-unlikely-proto-checks --valtype=i32
 
 export const __Boolean_prototype_toString = (_this: boolean) => {
   let out: bytestring = '';
@@ -14,7 +14,7 @@ export const __String_prototype_toString = (_this: string) => {
   return out;
 };
 
-export const ___bytestring_prototype_toString = (_this: bytestring) => {
+export const __ByteString_prototype_toString = (_this: bytestring) => {
   let out: bytestring = Porffor.bs``;
   Porffor.clone(_this, out);
   return out;
@@ -36,10 +36,10 @@ export const __Function_prototype_toString = (_this: Function) => {
 };
 
 
-// // export const ___array_prototype_toString = (_this: any[]) => {
+// // export const __Array_prototype_toString = (_this: any[]) => {
 // //   return _this.join();
 // // };
 
-// // export const ___regexp_prototype_toString = (_this: number) => {
+// // export const __RegExp_prototype_toString = (_this: number) => {
 
 // // };

package/compiler/builtins.js

@@ -141,7 +141,7 @@ export const BuiltinVars = function() {
 
   // wintercg(tm)
   this.__navigator_userAgent = (scope, { makeString }) => makeString(scope, `Porffor/0.2.0`, false, '__navigator_userAgent');
-  this.__navigator_userAgent.type = Prefs.bytestring ? TYPES._bytestring : TYPES.string;
+  this.__navigator_userAgent.type = Prefs.bytestring ? TYPES.bytestring : TYPES.string;
 
   for (const x in TYPES) {
     this['__Porffor_TYPES_' + x] = number(TYPES[x]);
@@ -216,7 +216,7 @@ export const BuiltinFuncs = function() {
   };
 
 
-  this.__console_log = {
+  this.__Porffor_print = {
     params: [ valtypeBinary, Valtype.i32 ],
     typedParams: true,
     locals: [ Valtype.i32, Valtype.i32 ],
@@ -273,7 +273,7 @@ export const BuiltinFuncs = function() {
 
           [ Opcodes.end ]
         ],
-        [TYPES._bytestring]: [
+        [TYPES.bytestring]: [
           // simply print a (byte)string :))
           // cache input pointer as i32
           [ Opcodes.local_get, 0 ],
@@ -307,7 +307,7 @@ export const BuiltinFuncs = function() {
 
           [ Opcodes.end ]
         ],
-        [TYPES._array]: [
+        [TYPES.array]: [
           ...printStaticStr('[ '),
 
           // cache input pointer as i32
@@ -368,10 +368,7 @@ export const BuiltinFuncs = function() {
           [ Opcodes.local_get, 0 ],
           [ Opcodes.call, importedFuncs.print ],
         ]
-      }, Blocktype.void),
-
-      ...char('\n'),
-      [ Opcodes.call, importedFuncs.printChar ]
+      }, Blocktype.void)
     ]
   };
 
@@ -918,27 +915,6 @@ export const BuiltinFuncs = function() {
     ]
   };
 
-  // this.__Porffor_randomInt = {
-  //   params: [],
-  //   locals: prng.locals,
-  //   localNames: [ 's1', 's0' ],
-  //   globals: prng.globals,
-  //   globalNames: [ 'state0', 'state1' ],
-  //   globalInits: [ prngSeed0, prngSeed1 ],
-  //   returns: [ Valtype.i32 ],
-  //   wasm: [
-  //     ...prng.wasm,
-
-  //     ...(prng.returns === Valtype.i64 ? [
-  //       // the lowest bits of the output generated by xorshift128+ have low quality
-  //       ...number(56, Valtype.i64),
-  //       [ Opcodes.i64_shr_u ],
-
-  //       [ Opcodes.i32_wrap_i64 ],
-  //     ] : []),
-  //   ]
-  // };
-
   this.__Porffor_randomByte = {
     params: [],
     locals: prng.locals,
@@ -1063,7 +1039,7 @@ export const BuiltinFuncs = function() {
     typedParams: true,
     locals: [ Valtype.i32, Valtype.i32 ],
     returns: [ valtypeBinary ],
-    returnType: Prefs.bytestring ? TYPES._bytestring : TYPES.string,
+    returnType: Prefs.bytestring ? TYPES.bytestring : TYPES.string,
     wasm: (scope, { TYPE_NAMES, typeSwitch, makeString }) => {
       const bc = {};
       for (const x in TYPE_NAMES) {