core: adapt to new TLA changes

Fixes: #538
saghul · Jun 7, 2024 · bed0423 · bed0423
1 parent 09af900
commit bed0423
Show file tree

Hide file tree

Showing 14 changed files with 39,822 additions and 39,938 deletions.
diff --git a/deps/quickjs b/deps/quickjs
diff --git a/src/bundles/c/core/core.c b/src/bundles/c/core/core.c
diff --git a/src/bundles/c/core/polyfills.c b/src/bundles/c/core/polyfills.c
diff --git a/src/bundles/c/core/run-main.c b/src/bundles/c/core/run-main.c
diff --git a/src/bundles/c/stdlib/assert.c b/src/bundles/c/stdlib/assert.c
diff --git a/src/bundles/c/stdlib/ffi.c b/src/bundles/c/stdlib/ffi.c
diff --git a/src/bundles/c/stdlib/getopts.c b/src/bundles/c/stdlib/getopts.c
diff --git a/src/bundles/c/stdlib/hashing.c b/src/bundles/c/stdlib/hashing.c
diff --git a/src/bundles/c/stdlib/ipaddr.c b/src/bundles/c/stdlib/ipaddr.c
diff --git a/src/bundles/c/stdlib/path.c b/src/bundles/c/stdlib/path.c
@@ -2,22 +2,22 @@
 
 #include <inttypes.h>
 
-const uint32_t tjs__path_size = 105;
+const uint32_t tjs__path_size = 106;
 
-const uint8_t tjs__path[105] = {
+const uint8_t tjs__path[106] = {
  0x0c, 0x04, 0x10, 0x74, 0x6a, 0x73, 0x3a, 0x70,
  0x61, 0x74, 0x68, 0x02, 0x6c, 0x02, 0x6f, 0x32,
  0x74, 0x6a, 0x73, 0x2e, 0x69, 0x6e, 0x74, 0x65,
  0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x6d, 0x6f, 0x64,
  0x75, 0x6c, 0x65, 0x73, 0x2e, 0x70, 0x61, 0x74,
  0x68, 0x0d, 0xb2, 0x03, 0x00, 0x01, 0x00, 0x01,
- 0x2c, 0x00, 0x00, 0x0c, 0x20, 0x02, 0x01, 0x9e,
- 0x01, 0x00, 0x00, 0x00, 0x04, 0x02, 0x00, 0x20,
- 0x00, 0xb4, 0x03, 0x00, 0x01, 0xb6, 0x03, 0x01,
- 0x01, 0x08, 0xe9, 0x02, 0x29, 0x38, 0x8a, 0x00,
- 0x00, 0x00, 0x38, 0x96, 0x00, 0x00, 0x00, 0x42,
- 0x11, 0x00, 0x00, 0x00, 0x04, 0xdc, 0x00, 0x00,
- 0x00, 0x24, 0x01, 0x00, 0x47, 0xe4, 0xe1, 0x06,
- 0x2e,
+ 0x2c, 0x00, 0x00, 0x00, 0x0c, 0x20, 0x02, 0x01,
+ 0x9e, 0x01, 0x00, 0x00, 0x00, 0x04, 0x02, 0x00,
+ 0x20, 0x00, 0xb4, 0x03, 0x00, 0x01, 0xb6, 0x03,
+ 0x01, 0x01, 0x08, 0xe9, 0x02, 0x29, 0x38, 0x8a,
+ 0x00, 0x00, 0x00, 0x38, 0x96, 0x00, 0x00, 0x00,
+ 0x42, 0x11, 0x00, 0x00, 0x00, 0x04, 0xdc, 0x00,
+ 0x00, 0x00, 0x24, 0x01, 0x00, 0x47, 0xe4, 0xe1,
+ 0x06, 0x2e,
 };
 
diff --git a/src/bundles/c/stdlib/sqlite.c b/src/bundles/c/stdlib/sqlite.c
diff --git a/src/bundles/c/stdlib/uuid.c b/src/bundles/c/stdlib/uuid.c
diff --git a/src/js/run-main/repl.js b/src/js/run-main/repl.js
@@ -1129,42 +1129,31 @@ function _run(g) {
                      '\\q      exit\n');
     }
 
-    function preprocessEval(input) {
-        const awaitMatcher = /^(?:\s*(?:(?:let|var|const)\s)?\s*([^=]+)=\s*|^\s*)(await\s[\s\S]*)/;
-        const asyncWrapper = (code, binder) => {
-            let assign = binder ? `global.${binder} = ` : '';
-            return `(function(){ async function _wrap() { return ${assign}${code} } return _wrap();})()`;
-        };
-
-        // match & transform
-        const match = input.match(awaitMatcher);
-        if (match) {
-            input = `${asyncWrapper(match[2], match[1])}`;
-        }
-        return input;
-      }
-
-    function doEval(input) {
-        const code = preprocessEval(input);
-
-        return evalScript(code);
-    }
-
     function eval_and_print(expr) {
         var result;
 
-        try {
-            /* eval as a script */
-            result = doEval(expr);
+        /* eval as a script */
+        result = evalScript(expr);
+        result.then(res => {
+            result = res.value;
             stdout_write(colors[styles.result]);
             print(result);
             stdout_write('\n');
             stdout_write(colors.none);
             /* set the last result */
             g._ = result;
-        } catch (error) {
+        },
+        error => {
             dump_error(error);
-        }
+        })
+        .finally(() => {
+            level = 0;
+
+            /* run the garbage collector after each command */
+            tjs.gc();
+
+            cmd_readline_start();
+        });
     }
 
     function dump_error(error) {
@@ -1243,11 +1232,6 @@ function _run(g) {
         mexpr = '';
 
         eval_and_print(expr);
-
-        level = 0;
-
-        /* run the garbage collector after each command */
-        tjs.gc();
     }
 
     function colorize_js(str) {

diff --git a/src/sys.c b/src/sys.c
@@ -54,7 +54,7 @@ static JSValue tjs_evalScript(JSContext *ctx, JSValue this_val, int argc, JSValu
     str = JS_ToCStringLen(ctx, &len, argv[0]);
     if (!str)
         return JS_EXCEPTION;
-    ret = JS_Eval(ctx, str, len, "<evalScript>", JS_EVAL_TYPE_GLOBAL);
+    ret = JS_Eval(ctx, str, len, "<evalScript>", JS_EVAL_TYPE_GLOBAL | JS_EVAL_FLAG_ASYNC);
     JS_FreeCString(ctx, str);
     return ret;
 }