Merge branch 'master' of https://gitee.com/lyon1998/pikapython

Author: pikasTech

examples/builtins/strformat.py

@@ -0,0 +1,9 @@
+assert "1" == "%d" % (1)
+assert "None" == "%s" % (None)
+assert "1.0" == "%0.1f" % (1.0)
+assert "1" == "%r" % (1)
+assert "None" == "%r" % (None)
+assert "True" == "%r" % (True)
+assert "1, 2" == "%s, %s" % (1, 2)
+assert "1, False" == "%s, %s" % (1, False)
+print("PASS")

port/linux/.vscode/launch.json

@@ -34,7 +34,7 @@
                 // "--gtest_filter=jrpc.cmd"
                 // "--gtest_filter=jrpc.exec_get_val"
                 // "--gtest_filter=jrpc.exec_get_val"
-                "--gtest_filter=thread.issue1"
+                // "--gtest_filter=thread.issue1"
                 // "--gtest_filter=except.isinstance"
                 // "--gtest_filter=builtin.isinstance"
                 // "--gtest_filter=bytes.bytes_split"
@@ -43,7 +43,8 @@
                 // "--gtest_filter=except.try1"
                 // "--gtest_filter=except.for_loop"
                 // "--gtest_filter=builtin.init_raise"
-                // "--gtest_filter=event.event_thread"
+                // "--gtest_filter=builtin.strformat"
+                "--gtest_filter=except.typeerr"
             ],
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}",

port/linux/test/python/builtins/strformat.py

@@ -0,0 +1,9 @@
+assert "1" == "%d" % (1)
+assert "None" == "%s" % (None)
+assert "1.0" == "%0.1f" % (1.0)
+assert "1" == "%r" % (1)
+assert "None" == "%r" % (None)
+assert "True" == "%r" % (True)
+assert "1, 2" == "%s, %s" % (1, 2)
+assert "1, False" == "%s, %s" % (1, False)
+print("PASS")

src/PikaVM.c

@@ -3305,7 +3305,7 @@ static Arg* VM_instruction_handler_RIS(PikaObj* self,
     Arg* err_arg = stack_popArg_alloc(&(vm->stack));
     if (ARG_TYPE_INT == arg_getType(err_arg)) {
         PIKA_RES err = (PIKA_RES)arg_getInt(err_arg);
-        if (PIKA_RES_ERR_RUNTIME_ERROR != err) {
+        if (err > 0) {
             PikaVMFrame_setErrorCode(vm, PIKA_RES_ERR_INVALID_PARAM);
             PikaVMFrame_setSysOut(
                 vm, "TypeError: exceptions must derive from BaseException");

src/PikaVersion.h

@@ -2,4 +2,4 @@
 #define PIKA_VERSION_MINOR 13
 #define PIKA_VERSION_MICRO 4
 
-#define PIKA_EDIT_TIME "2024/08/09 03:29:21"
+#define PIKA_EDIT_TIME "2024/08/11 01:43:35"

src/dataArgs.c

@@ -532,6 +532,8 @@ char* strsFormatArg(Args* out_buffs, char* fmt, Arg* arg) {
             if (type == ARG_TYPE_POINTER) {
                 fmt = strsReplace(&buffs, fmt, sym, "%p");
                 break;
+            } else {
+                fmt = strsReplace(&buffs, fmt, sym, "%s");
             }
         }
     }
@@ -553,6 +555,13 @@ char* strsFormatArg(Args* out_buffs, char* fmt, Arg* arg) {
     if (ARG_TYPE_NONE == type) {
         res = strsFormat(&buffs, PIKA_SPRINTF_BUFF_SIZE, fmt, "None");
         goto __exit;
+    } else {
+        Arg* arg_str = arg_toStrArg(arg);
+        if (NULL != arg_str) {
+            res = strsFormat(&buffs, PIKA_SPRINTF_BUFF_SIZE, fmt,
+                             arg_getStr(arg_str));
+            arg_deinit(arg_str);
+        }
     }
 __exit:
     if (NULL != res) {