porffor 0.49.7 → 0.49.8

package/compiler/2c.js

@@ -168,7 +168,8 @@ const removeBrackets = str => {
 
   for (const x in CValtype) {
     const p = `(${x})`;
-    if (str.startsWith(p)) return p + removeBrackets(str.slice(p.length));
+    // if (str.startsWith(p)) return p + removeBrackets(str.slice(p.length));
+    if (str.startsWith(p)) return str;
   }
 
   return str.startsWith('(') && str.endsWith(')') && !str.startsWith('(*') ? str.slice(1, -1) : str;
@@ -192,7 +193,7 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
     return out;
   };
   const sanitize = str => {
-    if (str === 'char') return '_' + str;
+    if (str === 'char' || str === 'main') return '_' + str;
 
     return str.replace(/[^0-9a-zA-Z_]/g, _ => codeToSanitizedStr(_.charCodeAt(0)));
   };
@@ -215,6 +216,7 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
   }
 
   if (pages.size > 0) {
+    includes.set('stdlib.h', true);
     prepend.set('_memory', `char* _memory; u32 _memoryPages = ${pages.size};\n`);
     prependMain.set('_initMemory', `_memory = malloc(_memoryPages * ${pageSize});\n`);
     if (Prefs['2cMemcpy']) includes.set('string.h', true);
@@ -719,7 +721,8 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
           break;
 
         case Opcodes.call_indirect:
-          // stub, todo
+          // todo: stub
+          if (Prefs.d) log.warning('2c', `unimplemented op: ${invOpcodes[i[0]]} \x1b[90m(${f.name})`);
           vals.pop();
           vals.push('0', '0');
           break;
@@ -871,7 +874,7 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
             break;
           }
 
-          if (Prefs.d) log.warning('2c', `unimplemented op: ${invOpcodes[i[0]]} \x1b[90m(${f.name})`);
+          if (Prefs.d) log.warning('2c', `unimplemented op: ${invOpcodes[i[0]] ?? invOpcodes[i[0] + ',' + i[1]]} \x1b[90m(${f.name})`);
       }
 
       lastCond = false;

package/compiler/builtins/console.ts

@@ -259,7 +259,7 @@ export const __Porffor_print = (arg: any, colors: boolean = true, depth: number
 
       const buffer = new Uint8Array(arg);
       const bufferLen = buffer.length - 1;
-      for (let i = 0; i <= bufferLen; i++) {
+      for (let i: i32 = 0; i <= bufferLen; i++) {
         const ele = buffer[i];
         __Porffor_printHexDigit((ele & 0xF0) / 16);
         __Porffor_printHexDigit(ele & 0xF);
@@ -340,7 +340,7 @@ export const __Porffor_print = (arg: any, colors: boolean = true, depth: number
 
 let tabLevel = 0;
 export const __Porffor_consoleIndent = () => {
-  for (let i = 0; i < tabLevel; i++) {
+  for (let i: i32 = 0; i < tabLevel; i++) {
     Porffor.printStatic('\t');
   }
 };
@@ -376,7 +376,7 @@ export const __console_groupEnd = () => {
 
 export const __console_log = (...args: any[]) => {
   const argLen: i32 = args.length - 1;
-  for (let i = 0; i <= argLen; i++) {
+  for (let i: i32 = 0; i <= argLen; i++) {
     __Porffor_consoleIndent();
     __Porffor_consolePrint(args[i]);
 
@@ -388,7 +388,7 @@ export const __console_log = (...args: any[]) => {
 
 export const __console_debug = (...args: any[]) => {
   const argLen: i32 = args.length - 1;
-  for (let i = 0; i <= argLen; i++) {
+  for (let i: i32 = 0; i <= argLen; i++) {
     __Porffor_consoleIndent();
     __Porffor_consolePrint(args[i]);
 
@@ -400,7 +400,7 @@ export const __console_debug = (...args: any[]) => {
 
 export const __console_info = (...args: any[]) => {
   const argLen: i32 = args.length - 1;
-  for (let i = 0; i <= argLen; i++) {
+  for (let i: i32 = 0; i <= argLen; i++) {
     __Porffor_consoleIndent();
     __Porffor_consolePrint(args[i]);
 
@@ -412,7 +412,7 @@ export const __console_info = (...args: any[]) => {
 
 export const __console_warn = (...args: any[]) => {
   const argLen: i32 = args.length - 1;
-  for (let i = 0; i <= argLen; i++) {
+  for (let i: i32 = 0; i <= argLen; i++) {
     __Porffor_consoleIndent();
     __Porffor_consolePrint(args[i]);
 
@@ -424,7 +424,7 @@ export const __console_warn = (...args: any[]) => {
 
 export const __console_error = (...args: any[]) => {
   const argLen: i32 = args.length - 1;
-  for (let i = 0; i <= argLen; i++) {
+  for (let i: i32 = 0; i <= argLen; i++) {
     __Porffor_consoleIndent();
     __Porffor_consolePrint(args[i]);
 
@@ -444,7 +444,7 @@ export const __console_assert = (assertion: any, ...args: any[]) => {
   }
 
   const argLen: i32 = args.length - 1;
-  for (let i = 0; i <= argLen; i++) {
+  for (let i: i32 = 0; i <= argLen; i++) {
     __Porffor_consolePrint(args[i]);
     if (i != argLen) Porffor.printStatic(' ');
   }

package/compiler/builtins/date.ts

@@ -684,7 +684,7 @@ export const __Date_parse = (string: bytestring): number => {
   // 'Sun May 12 2024 02:44:13 GMT+0000 (UTC)'
 
   // if first char is numerical, use DTSF parser
-  const chr: i32 = Porffor.wasm.i32.load8_u(string, 0, 4);;
+  const chr: i32 = Porffor.wasm.i32.load8_u(string, 0, 4);
   if (Porffor.fastAnd(chr >= 48, chr <= 57)) { // 0-9
     return __ecma262_ParseDTSF(string);
   }

package/compiler/builtins/math.ts

@@ -226,17 +226,22 @@ export const __Math_pow = (base: number, exponent: number): number => {
   if (base < 0) if (!Number.isInteger(exponent)) return NaN;
 
   // 13. Return an implementation-approximated Number value representing the result of raising ℝ(base) to the ℝ(exponent) power.
+  if (base == Math.E) {
+    return Math.exp(exponent);
+  }
+
   let currentBase: number = base;
   let currentExponent: number = Math.abs(exponent);
 
   let result: number = 1;
   while (currentExponent > 0) {
     if (currentExponent >= 1) {
-      if (currentExponent % 2 != 0) {
+      if (currentExponent & 1) {
         result *= currentBase;
       }
+
       currentBase *= currentBase;
-      currentExponent = Math.floor(currentExponent / 2);
+      currentExponent >>= 1;
     } else {
       // Handle fractional part
       result *= Math.exp(currentExponent * Math.log(Math.abs(currentBase)));

package/compiler/builtins/string.ts

@@ -1078,13 +1078,13 @@ export const __ByteString_prototype_trim = (_this: bytestring) => {
 };
 
 
-export const __String_prototype_concat = (_this: string, ...vals: any[]) => {
-  let out = Porffor.allocate();
+export const __String_prototype_concat = (_this: any, ...vals: any[]) => {
+  let out: any = Porffor.allocate();
   Porffor.clone(_this, out);
 
-  // override type to string
+  // copy _this type to out
   Porffor.wasm`
-i32.const 67 ;; string
+local.get ${_this+1}
 local.set ${out+1}`;
 
   const valsLen: i32 = vals.length;
@@ -1117,13 +1117,13 @@ local.set ${out}`;
   return out;
 };
 
-export const __ByteString_prototype_concat = (_this: bytestring, ...vals: any[]) => {
-  let out = Porffor.allocate();
+export const __ByteString_prototype_concat = (_this: any, ...vals: any[]) => {
+  let out: any = Porffor.allocate();
   Porffor.clone(_this, out);
 
-  // override type to bytestring
+  // copy _this type to out
   Porffor.wasm`
-i32.const 195 ;; bytestring
+local.get ${_this+1}
 local.set ${out+1}`;
 
   const valsLen: i32 = vals.length;