porffor 0.60.11 → 0.60.13

package/compiler/builtins/_internal_object.ts

@@ -489,6 +489,9 @@ i32.load 0 4
 local.set ${obj}
 i32.load8_u 0 3
 local.set ${obj+1}`;
+
+        // if undefined, prototype is object.prototype
+        if (Porffor.type(obj) == Porffor.TYPES.undefined) obj = __Object_prototype;
       } else obj = __Porffor_object_getPrototype(obj);
       if (Porffor.type(obj) != Porffor.TYPES.object) obj = __Porffor_object_underlying(obj);
 
@@ -555,6 +558,9 @@ i32.load 0 4
 local.set ${obj}
 i32.load8_u 0 3
 local.set ${obj+1}`;
+
+        // if undefined, prototype is object.prototype
+        if (Porffor.type(obj) == Porffor.TYPES.undefined) obj = __Object_prototype;
       } else obj = __Porffor_object_getPrototype(obj);
       if (Porffor.type(obj) != Porffor.TYPES.object) obj = __Porffor_object_underlying(obj);
 

package/compiler/builtins/function.ts

@@ -1,5 +1,14 @@
 import type {} from './porffor.d.ts';
 
+// `eval` is invalid syntax so work around
+export const _eval = (source: string) => {
+  throw new SyntaxError('Dynamic code evaluation is not supported');
+};
+
+export const Function = function (source: string) {
+  throw new SyntaxError('Dynamic code evaluation is not supported');
+};
+
 export const __Function_prototype_toString = (_this: Function) => {
   const out: bytestring = Porffor.allocate();
 

package/compiler/builtins/object_hiddenPrototype.js

@@ -23,7 +23,7 @@ export const __Porffor_object_getHiddenPrototype = (trueType: i32): any => {
   }`;
 
   for (const x in TYPES) {
-    if (['undefined', 'string', 'bytestring', 'stringobject', 'number', 'numberobject', 'boolean', 'booleanobject'].includes(x)) continue;
+    if (['object', 'undefined', 'string', 'bytestring', 'stringobject', 'number', 'numberobject', 'boolean', 'booleanobject'].includes(x)) continue;
 
     const name = TYPE_NAMES[TYPES[x]];
     out += `

package/compiler/builtins/regexp.ts

@@ -989,26 +989,15 @@ export const __Porffor_regex_interpret = (regexp: RegExp, input: i32, isTest: bo
   const sticky: boolean = (flags & 0b00100000) != 0;
 
   const inputLen: i32 = Porffor.wasm.i32.load(input, 0, 0);
-  let searchStart: i32 = 0;
+  let lastIndex: i32 = 0;
   if (global || sticky) {
-    searchStart = Porffor.wasm.i32.load16_u(regexp, 0, 8);
+    lastIndex = Porffor.wasm.i32.load16_u(regexp, 0, 8);
   }
 
-  if (searchStart > inputLen) {
-    if (global || sticky) Porffor.wasm.i32.store16(regexp, 0, 0, 8);
-    return null;
-  }
-
-  // todo: free all at the end (or statically allocate but = [] causes memory corruption)
-  const backtrackStack: i32[] = Porffor.allocate();
-  const captures: i32[] = Porffor.allocateBytes(6144);
-
-  for (let i: i32 = searchStart; i <= inputLen; i++) {
-    if (sticky && i != searchStart) {
-      if (isTest) return false;
-      return null;
-    }
+  const backtrackStack: i32[] = [];
+  const captures: i32[] = [];
 
+  for (let i: i32 = lastIndex; i <= inputLen; i++) {
     backtrackStack.length = 0;
     captures.length = 0;
 
@@ -1065,7 +1054,6 @@ export const __Porffor_regex_interpret = (regexp: RegExp, input: i32, isTest: bo
 
       if (op == 0x01) { // single
         if (sp >= inputLen) {
-          // Porffor.log(`single: oob`);
           backtrack = true;
         } else {
           let c1: i32 = Porffor.wasm.i32.load8_u(pc, 0, 1);
@@ -1075,11 +1063,9 @@ export const __Porffor_regex_interpret = (regexp: RegExp, input: i32, isTest: bo
             if (c2 >= 97 && c2 <= 122) c2 -= 32;
           }
           if (c1 == c2) {
-            // Porffor.log(`single: matched ${c1}`);
             pc += 2;
             sp += 1;
           } else {
-            // Porffor.log(`single: failed, expected ${c1}, got ${c2}`);
             backtrack = true;
           }
         }
@@ -1291,7 +1277,6 @@ export const __Porffor_regex_interpret = (regexp: RegExp, input: i32, isTest: bo
         const lookaheadEndPc = pc + jumpOffset + 3;
         const savedSp = sp; // Save current string position
 
-
         // Use fork to test the lookahead pattern
         Porffor.array.fastPushI32(backtrackStack, lookaheadEndPc); // Continue point after lookahead
         Porffor.array.fastPushI32(backtrackStack, savedSp); // Restore original sp
@@ -1320,7 +1305,6 @@ export const __Porffor_regex_interpret = (regexp: RegExp, input: i32, isTest: bo
         const capIndex = Porffor.wasm.i32.load8_u(pc, 0, 1);
         const arrIndex = capIndex + 255; // + 255 offset for temp start, as it could never end properly
         captures[arrIndex] = sp;
-        // Porffor.log(`startCapture: captures[${arrIndex}] = ${sp} | captures.length = ${captures.length}`);
         pc += 2;
       } else if (op == 0x31) { // end capture
         const capIndex = Porffor.wasm.i32.load8_u(pc, 0, 1);
@@ -1328,7 +1312,6 @@ export const __Porffor_regex_interpret = (regexp: RegExp, input: i32, isTest: bo
         while (captures.length <= arrIndex) Porffor.array.fastPushI32(captures, -1);
         captures[arrIndex - 1] = captures[capIndex + 255];
         captures[arrIndex] = sp;
-        // Porffor.log(`endCapture: captures[${arrIndex}] = ${sp} | captures.length = ${captures.length}`);
         pc += 2;
       } else { // unknown op
         backtrack = true;
@@ -1337,7 +1320,6 @@ export const __Porffor_regex_interpret = (regexp: RegExp, input: i32, isTest: bo
       if (backtrack) {
         if (backtrackStack.length == 0) break;
 
-
         // Check if we're backtracking from a lookahead
         if (backtrackStack.length >= 4) {
           const marker = backtrackStack[backtrackStack.length - 1];
@@ -1365,11 +1347,9 @@ export const __Porffor_regex_interpret = (regexp: RegExp, input: i32, isTest: bo
         }
 
         // Normal backtracking
-        // Porffor.log(`backtrack! before: captures.length = ${captures.length}, sp = ${sp}, pc = ${pc}`);
         captures.length = Porffor.array.fastPopI32(backtrackStack);
         sp = Porffor.array.fastPopI32(backtrackStack);
         pc = Porffor.array.fastPopI32(backtrackStack);
-        // Porffor.log(`backtrack! after: captures.length = ${captures.length}, sp = ${sp}, pc = ${pc}`);
       }
     }
 
@@ -1378,7 +1358,7 @@ export const __Porffor_regex_interpret = (regexp: RegExp, input: i32, isTest: bo
 
       const matchStart: i32 = i;
       if (global || sticky) {
-        Porffor.wasm.i32.store(regexp, finalSp, 0, 8);
+        Porffor.wasm.i32.store16(regexp, finalSp, 0, 8); // write last index
       }
 
       const result: any[] = Porffor.allocateBytes(4096);
@@ -1404,10 +1384,16 @@ export const __Porffor_regex_interpret = (regexp: RegExp, input: i32, isTest: bo
 
       return result;
     }
+
+    if (sticky) { // sticky, do not go forward in string
+      Porffor.wasm.i32.store16(regexp, 0, 0, 8); // failed, write 0 last index
+      if (isTest) return false;
+      return null;
+    }
   }
 
   if (global || sticky) {
-    Porffor.wasm.i32.store(regexp, 0, 0, 8);
+    Porffor.wasm.i32.store16(regexp, 0, 0, 8); // failed, write 0 last index
   }
 
   if (isTest) return false;
@@ -1419,6 +1405,10 @@ export const __RegExp_prototype_source$get = (_this: RegExp) => {
   return Porffor.wasm.i32.load(_this, 0, 0) as bytestring;
 };
 
+export const __RegExp_prototype_lastIndex$get = (_this: RegExp) => {
+  return Porffor.wasm.i32.load16_u(_this, 0, 8);
+};
+
 // 22.2.6.4 get RegExp.prototype.flags
 // https://tc39.es/ecma262/multipage/text-processing.html#sec-get-regexp.prototype.flags
 export const __RegExp_prototype_flags$get = (_this: RegExp) => {
@@ -1532,12 +1522,63 @@ export const __RegExp_prototype_test = (_this: RegExp, input: any) => {
   return __Porffor_regex_interpret(_this, input, true);
 };
 
-export const __String_prototype_match = (_this: string, regexp: any) => {
+
+export const __Porffor_regex_match = (regexp: any, input: any) => {
   if (Porffor.type(regexp) !== Porffor.TYPES.regexp) regexp = new RegExp(regexp);
-  return __RegExp_prototype_exec(regexp, _this);
+  if (Porffor.type(input) !== Porffor.TYPES.bytestring) input = ecma262.ToString(input);
+
+  if (__RegExp_prototype_global$get(regexp)) {
+    // global should return all matches as just complete string result
+    const result: any[] = Porffor.allocateBytes(4096);
+    let match: any;
+    while (match = __Porffor_regex_interpret(regexp, input, false)) {
+      // read ourselves as we are in i32 space
+      Porffor.wasm`
+local.get ${result}
+f64.convert_i32_u
+local.get ${result+1}
+
+local.get ${match}
+f64.load 0 4
+local.get ${match}
+i32.load8_u 0 12
+
+call __Porffor_array_fastPush`;
+    }
+    return result;
+  }
+
+  return __Porffor_regex_interpret(regexp, input, false);
+};
+
+export const __String_prototype_match = (_this: string, regexp: any) => {
+  return __Porffor_regex_match(regexp, _this);
 };
 
 export const __ByteString_prototype_match = (_this: bytestring, regexp: any) => {
+  return __Porffor_regex_match(regexp, _this);
+};
+
+
+// todo: use actual iterator not array
+export const __Porffor_regex_matchAll = (regexp: any, input: any) => {
   if (Porffor.type(regexp) !== Porffor.TYPES.regexp) regexp = new RegExp(regexp);
-  return __RegExp_prototype_exec(regexp, _this);
+  if (Porffor.type(input) !== Porffor.TYPES.bytestring) input = ecma262.ToString(input);
+
+  if (!__RegExp_prototype_global$get(regexp)) throw new TypeError('matchAll used with non-global RegExp');
+
+  const result: any[] = Porffor.allocateBytes(4096);
+  let match: any;
+  while (match = __Porffor_regex_interpret(regexp, input, false)) {
+    Porffor.array.fastPush(result, match);
+  }
+  return result;
+};
+
+export const __String_prototype_matchAll = (_this: string, regexp: any) => {
+  return __Porffor_regex_matchAll(regexp, _this);
+};
+
+export const __ByteString_prototype_matchAll = (_this: bytestring, regexp: any) => {
+  return __Porffor_regex_matchAll(regexp, _this);
 };