porffor 0.59.8 → 0.59.9

package/compiler/2c.js

@@ -534,8 +534,9 @@ export default ({ funcs, globals, data, pages }) => {
         case Opcodes.if: {
           let cond = removeBrackets(vals.pop());
           if (!lastCond) {
-            if (cond.startsWith(`(i32)`)) cond = `${cond.slice(5)} != 0e+0`;
-              else cond = `(${cond}) != 0`;
+            // if (cond.startsWith(`(i32)`)) cond = `${cond.slice(5)} != 0e+0`;
+            //   else cond = `(${cond}) != 0`;
+            cond = `(${cond}) != 0`;
           }
 
           line(`// if ${invValtype[i[1]] ?? ''}`, false);
@@ -600,7 +601,7 @@ export default ({ funcs, globals, data, pages }) => {
             const importFunc = importFuncs[i[1]];
             switch (importFunc.name) {
               case 'print':
-                line(`printf("${valtype === 'f64' ? '%g' : '%i'}", ${vals.pop()})`);
+                line(`printf("${valtype === 'f64' ? '%.15g' : '%i'}", ${vals.pop()})`);
                 includes.set('stdio.h', true);
                 break;
               case 'printChar':
@@ -772,8 +773,9 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
 
           let cond = removeBrackets(vals.pop());
           if (!lastCond) {
-            if (cond.startsWith(`(i32)`)) cond = `${cond.slice(5)} != 0e+0`;
-              else cond = `(${cond}) != 0`;
+            // if (cond.startsWith(`(i32)`)) cond = `${cond.slice(5)} != 0e+0`;
+            //   else cond = `(${cond}) != 0`;
+            cond = `(${cond}) != 0`;
           }
 
           line(`if (${cond}) {`, false);

package/compiler/builtins/console.ts

@@ -29,62 +29,6 @@ export const __Porffor_printHexDigit = (arg: number) => {
   }
 };
 
-export const __Porffor_numberLog = (arg: number) => {
-  print(arg);
-  Porffor.printStatic('\n');
-};
-
-export const __Porffor_miniLog = (arg: any) => {
-  switch (Porffor.type(arg)) {
-    case Porffor.TYPES.number:
-      print(arg);
-      break;
-
-    case Porffor.TYPES.boolean:
-      if (arg) {
-        Porffor.printStatic('true');
-      } else {
-        Porffor.printStatic('false');
-      }
-      break;
-
-    case Porffor.TYPES.bytestring:
-    case Porffor.TYPES.string:
-      Porffor.printStatic("'");
-      __Porffor_printString(arg);
-      Porffor.printStatic("'");
-      break;
-
-    case Porffor.TYPES.array:
-      const arrLen: i32 = arg.length - 1;
-      if (arrLen == -1) {
-        Porffor.printStatic('[]');
-      } else {
-        Porffor.printStatic('[ ');
-        for (let i: i32 = 0; i <= arrLen; i++) {
-          __Porffor_miniLog(arg[i]);
-          if (i != arrLen) Porffor.printStatic(', ');
-        }
-        Porffor.printStatic(' ]');
-      }
-      break;
-
-    case Porffor.TYPES.undefined:
-      Porffor.printStatic('undefined');
-      break;
-
-    case Porffor.TYPES.object:
-      if (arg) {
-        Porffor.printStatic('[Object]');
-      } else {
-        Porffor.printStatic('null');
-      }
-      break;
-  }
-
-  Porffor.printStatic('\n');
-};
-
 export const __Porffor_print = (arg: any, colors: boolean = true, depth: number = 0) => {
   const __Porffor_printArray = (arg: any[]|Uint8Array|Int8Array|Uint8ClampedArray|Uint16Array|Int16Array|Uint32Array|Int32Array|Float32Array|Float64Array, colors: boolean, length: boolean = false) => {
     const arrLen: i32 = arg.length;

package/compiler/builtins/json.ts

@@ -46,8 +46,10 @@ export const __Porffor_json_serialize = (value: any, depth: i32, space: bytestri
         Porffor.bytestring.append2Char(out, 92, 117); // \u
         Porffor.bytestring.append2Char(out, 48, 48); // 00
 
-        Porffor.printHexDigit((c & 0xf0) / 0x10);
-        Porffor.printHexDigit(c & 0x0f);
+        const h1: i32 = (c & 0xf0) / 0x10;
+        const h2: i32 = c & 0x0f;
+        Porffor.bytestring.appendChar(out, h1 < 10 ? h1 + 48 : h1 + 55); // 0-9 or A-F
+        Porffor.bytestring.appendChar(out, h2 < 10 ? h2 + 48 : h2 + 55); // 0-9 or A-F
         continue;
       }
 
@@ -73,7 +75,7 @@ export const __Porffor_json_serialize = (value: any, depth: i32, space: bytestri
     Porffor.type(value) == Porffor.TYPES.number,
     Porffor.type(value) == Porffor.TYPES.numberobject
   )) { // number
-    if (Number.isFinite(value)) return __Number_prototype_toString(value, 10);
+    if (Number.isFinite(value)) return value + '';
     return 'null';
   }
 
@@ -87,7 +89,7 @@ export const __Porffor_json_serialize = (value: any, depth: i32, space: bytestri
     for (const x of (value as any[])) {
       if (hasSpace) {
         Porffor.bytestring.appendChar(out, 10); // \n
-        for (let i: i32 = 0; i < depth; i++) Porffor.bytestring.appendStr(out, space);
+        for (let i: i32 = 0; i < depth; i++) Porffor.bytestring.appendStr(out, space as bytestring);
       }
 
       Porffor.bytestring.appendStr(out, __Porffor_json_serialize(x, depth, space) ?? 'null');
@@ -100,10 +102,9 @@ export const __Porffor_json_serialize = (value: any, depth: i32, space: bytestri
     // swap trailing , with ] (or append if empty)
     if (out.length > 1) {
       if (hasSpace) {
-        Porffor.wasm.i32.store8(Porffor.wasm`local.get ${out}` + out.length, 10, 0, 3); // \n
-        for (let i: i32 = 0; i < depth; i++) Porffor.bytestring.appendStr(out, space);
-        Porffor.wasm.i32.store8(Porffor.wasm`local.get ${out}` + out.length, 93, 0, 4); // ]
-        out.length += 1;
+        Porffor.bytestring.appendChar(out, 10); // \n
+        for (let i: i32 = 0; i < depth; i++) Porffor.bytestring.appendStr(out, space as bytestring);
+        Porffor.bytestring.appendChar(out, 93); // ]
       } else {
         Porffor.wasm.i32.store8(Porffor.wasm`local.get ${out}` + out.length, 93, 0, 3); // ]
       }
@@ -132,7 +133,7 @@ export const __Porffor_json_serialize = (value: any, depth: i32, space: bytestri
 
       if (hasSpace) {
         Porffor.bytestring.appendChar(out, 10); // \n
-        for (let i: i32 = 0; i < depth; i++) Porffor.bytestring.appendStr(out, space);
+        for (let i: i32 = 0; i < depth; i++) Porffor.bytestring.appendStr(out, space as bytestring);
       }
 
       Porffor.bytestring.appendChar(out, 34); // "
@@ -152,10 +153,9 @@ export const __Porffor_json_serialize = (value: any, depth: i32, space: bytestri
     // swap trailing , with } (or append if empty)
     if (out.length > 1) {
       if (hasSpace) {
-        Porffor.wasm.i32.store8(Porffor.wasm`local.get ${out}` + out.length, 10, 0, 3); // \n
-        for (let i: i32 = 0; i < depth; i++) Porffor.bytestring.appendStr(out, space);
-        Porffor.wasm.i32.store8(Porffor.wasm`local.get ${out}` + out.length, 125, 0, 4); // }
-        out.length += 1;
+        Porffor.bytestring.appendChar(out, 10); // \n
+        for (let i: i32 = 0; i < depth; i++) Porffor.bytestring.appendStr(out, space as bytestring);
+        Porffor.bytestring.appendChar(out, 125); // }
       } else {
         Porffor.wasm.i32.store8(Porffor.wasm`local.get ${out}` + out.length, 125, 0, 3); // }
       }
@@ -183,7 +183,6 @@ export const __JSON_stringify = (value: any, replacer: any, space: any) => {
       Porffor.type(space) == Porffor.TYPES.numberobject
     )) {
       space = Math.min(Math.trunc(space), 10);
-      Porffor.print(space); Porffor.printStatic('\n');
 
       if (space < 1) {
         space = undefined;
@@ -211,4 +210,197 @@ export const __JSON_stringify = (value: any, replacer: any, space: any) => {
   }
 
   return __Porffor_json_serialize(value, 0, space);
+};
+
+
+// todo: not globals when closures work well
+let text: bytestring, pos: i32, len: i32;
+export const __JSON_parse = (_: bytestring) => {
+  text = _;
+  pos = 0;
+  len = text.length;
+
+  const skipWhitespace = () => {
+    while (pos < len) {
+      const c: i32 = text.charCodeAt(pos);
+      if (c > 32) break; // fast path
+
+      if (c == 32 || c == 9 || c == 10 || c == 13) pos++;
+        else break;
+    }
+  };
+
+  const parseValue = (): any => {
+    skipWhitespace();
+    if (pos >= len) throw new SyntaxError('Unexpected end of JSON input');
+
+    const c: i32 = text.charCodeAt(pos);
+    if (c == 110) { // 'n' - null
+      if (pos + 4 <= len &&
+          text.charCodeAt(pos + 1) == 117 && // 'u'
+          text.charCodeAt(pos + 2) == 108 && // 'l'
+          text.charCodeAt(pos + 3) == 108) { // 'l'
+        pos += 4;
+        return null;
+      }
+      throw new SyntaxError('Unexpected token');
+    }
+
+    if (c == 116) { // 't' - true
+      if (pos + 4 <= len &&
+          text.charCodeAt(pos + 1) == 114 && // 'r'
+          text.charCodeAt(pos + 2) == 117 && // 'u'
+          text.charCodeAt(pos + 3) == 101) { // 'e'
+        pos += 4;
+        return true;
+      }
+      throw new SyntaxError('Unexpected token');
+    }
+
+    if (c == 102) { // 'f' - false
+      if (pos + 5 <= len &&
+          text.charCodeAt(pos + 1) == 97 && // 'a'
+          text.charCodeAt(pos + 2) == 108 && // 'l'
+          text.charCodeAt(pos + 3) == 115 && // 's'
+          text.charCodeAt(pos + 4) == 101) { // 'e'
+        pos += 5;
+        return false;
+      }
+      throw new SyntaxError('Unexpected token');
+    }
+
+    if (c == 34) { // '"' - string
+      pos++;
+      const out: bytestring = Porffor.allocate();
+
+      while (pos < len) {
+        const ch: i32 = text.charCodeAt(pos);
+        if (ch == 34) { // closing "
+          pos++;
+          return out;
+        }
+        if (ch == 92) { // backslash
+          pos++;
+          if (pos >= len) throw new SyntaxError('Unterminated string');
+
+          const esc: i32 = text.charCodeAt(pos++);
+          if (esc == 34) Porffor.bytestring.appendChar(out, 34); // \"
+            else if (esc == 92) Porffor.bytestring.appendChar(out, 92); // \\
+            else if (esc == 47) Porffor.bytestring.appendChar(out, 47); // \/
+            else if (esc == 98) Porffor.bytestring.appendChar(out, 8); // \b
+            else if (esc == 102) Porffor.bytestring.appendChar(out, 12); // \f
+            else if (esc == 110) Porffor.bytestring.appendChar(out, 10); // \n
+            else if (esc == 114) Porffor.bytestring.appendChar(out, 13); // \r
+            else if (esc == 116) Porffor.bytestring.appendChar(out, 9); // \t
+            else if (esc == 117) { // \u
+              if (pos + 4 >= len) throw new SyntaxError('Invalid unicode escape');
+              let unicode: i32 = 0;
+              for (let i: i32 = 0; i < 4; i++) {
+                const hex: i32 = text.charCodeAt(pos + i);
+                unicode <<= 4;
+                if (hex >= 48 && hex <= 57) unicode |= hex - 48; // 0-9
+                  else if (hex >= 65 && hex <= 70) unicode |= hex - 55; // A-F
+                  else if (hex >= 97 && hex <= 102) unicode |= hex - 87; // a-f
+                  else throw new SyntaxError('Invalid unicode escape');
+              }
+              pos += 4;
+              Porffor.bytestring.appendChar(out, unicode);
+            } else throw new SyntaxError('Invalid escape sequence');
+        } else {
+          if (ch >= 0x00 && ch <= 0x1f) throw new SyntaxError('Unescaped control character');
+          Porffor.bytestring.appendChar(out, ch);
+          pos++;
+        }
+      }3
+      throw new SyntaxError('Unterminated string');
+    }
+
+    if (c == 91) { // '[' - array
+      pos++;
+      const arr: any[] = Porffor.allocate();
+      skipWhitespace();
+
+      if (pos < len && text.charCodeAt(pos) == 93) { // empty array
+        pos++;
+        return arr;
+      }
+
+      while (true) {
+        arr.push(parseValue());
+        skipWhitespace();
+        if (pos >= len) throw new SyntaxError('Unterminated array');
+
+        const next: i32 = text.charCodeAt(pos);
+        if (next == 93) { // ]
+          pos++;
+          break;
+        }
+        if (next == 44) { // ,
+          pos++;
+          continue;
+        }
+        throw new SyntaxError('Expected , or ]');
+      }
+      return arr;
+    }
+
+    if (c == 123) { // '{' - object
+      pos++;
+      const obj: any = {};
+      skipWhitespace();
+
+      if (pos < len && text.charCodeAt(pos) == 125) { // empty object
+        pos++;
+        return obj;
+      }
+
+      while (true) {
+        skipWhitespace();
+        if (pos >= len || text.charCodeAt(pos) != 34) throw new SyntaxError('Expected string key');
+
+        const key: any = parseValue();
+        skipWhitespace();
+        if (pos >= len || text.charCodeAt(pos) != 58) throw new SyntaxError('Expected :');
+        pos++;
+
+        const value: any = parseValue();
+        obj[key] = value;
+
+        skipWhitespace();
+        if (pos >= len) throw new SyntaxError('Unterminated object');
+
+        const next: i32 = text.charCodeAt(pos);
+        if (next == 125) { // }
+          pos++;
+          break;
+        }
+        if (next == 44) { // ,
+          pos++;
+          continue;
+        }
+        throw new SyntaxError('Expected , or }');
+      }
+      return obj;
+    }
+
+    // number
+    if ((c >= 48 && c <= 57) || c == 45) { // 0-9 or -
+      const start: i32 = pos;
+      if (c == 45) pos++; // skip -
+
+      while (pos < len) {
+        const ch: i32 = text.charCodeAt(pos);
+        if (ch >= 48 && ch <= 57) pos++; // 0-9
+          else if (ch == 46 || ch == 101 || ch == 69) pos++; // . e E
+          else if ((ch == 43 || ch == 45) && pos > start + 1) pos++; // + - (not at start)
+          else break;
+      }
+
+      return +ecma262.StringToNumber(__ByteString_prototype_slice(text, start, pos));
+    }
+
+    throw new SyntaxError('Unexpected token');
+  };
+
+  return parseValue();
 };