fix cmodule import issue

Author: pikasTech

examples/builtins/from_import_pyi.py

@@ -0,0 +1,3 @@
+from i18n import _
+import  _from_import_pyi
+print("PASS")

port/linux/.vscode/launch.json

@@ -20,7 +20,9 @@
                 // "--gtest_filter=stddata.encode_decode"
                 // "--gtest_filter=packtool.packfiles_txt"
                 // "--gtest_filter=cmodule.class_attr_obj"
-                "--gtest_filter=except.try_import_except"
+                // "--gtest_filter=except.try_import_except"
+                "--gtest_filter=vm.test_cmodule_import_as"
+                // "--gtest_filter=vm.subsrc_import"
             ],
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}",

port/linux/package/pikascript/_from_import_pyi.py

@@ -0,0 +1 @@
+from i18n import _

port/linux/package/pikascript/i18n.pyi

@@ -0,0 +1,2 @@
+
+def _(strid: str) -> str:...

port/linux/package/pikascript/module_list.txt

@@ -43,4 +43,5 @@ subsrc.mod1
 flashdb
 fuzzypid
 pika_lvgl
-import_err
+import_err
+_from_import_pyi

port/linux/package/pikascript/pikascript-lib/i18n/pika_i18n.c

@@ -0,0 +1,5 @@
+#include "i18n.h"
+
+char* i18n__(PikaObj* self, char* strid) {
+    return strid;
+}

port/linux/package/pikascript/pikascript-lib/pika_lvgl/pika_lvgl_canvas.c

@@ -1,4 +1,4 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
 #include "lvgl.h"
 #else
 #include "../../lvgl.h"

port/linux/package/pikascript/pikascript-lib/pika_lvgl/pika_lvgl_indev_t.c

@@ -1,4 +1,4 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
 #include "lvgl.h"
 #else
 #include "../../lvgl.h"

port/linux/package/pikascript/pikascript-lib/pika_lvgl/pika_lvgl_lv_event.c

@@ -1,4 +1,4 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
 #include "lvgl.h"
 #else
 #include "../../lvgl.h"

port/linux/package/pikascript/pikascript-lib/pika_lvgl/pika_lvgl_lv_obj.c

@@ -1,4 +1,4 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
 #include "lvgl.h"
 #else
 #include "../../lvgl.h"

port/linux/package/pikascript/pikascript-lib/pika_lvgl/pika_lvgl_lv_wegit.c

@@ -1,4 +1,4 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
 #include "lvgl.h"
 #else
 #include "../../lvgl.h"
@@ -1490,7 +1490,6 @@ int pika_lvgl_keyboard_get_selected_btn(PikaObj* self) {
     return lv_keyboard_get_selected_btn(lv_obj);
 }
 
-
 /*
 class ime_pinyin(lv_obj):
     def __init__(self, parent: lv_obj): ...
@@ -1534,5 +1533,4 @@ PikaObj* pika_lvgl_ime_pinyin_get_cand_panel(PikaObj* self) {
     return new_obj;
 }
 
-
 #endif

port/linux/package/pikascript/this.py

@@ -1,3 +1,4 @@
+from i18n import _
 print("Python之禅，Tim Peters著，blueloveTH译")
 print(' ')
 # Beautiful is better than ugly.

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

@@ -0,0 +1,3 @@
+from i18n import _
+import  _from_import_pyi
+print("PASS")

src/PikaVM.c

@@ -3473,9 +3473,14 @@ static Arg* VM_instruction_handler_IMP(PikaObj* self,
     if (obj_isArgExist(self, data)) {
         goto __exit;
     }
+    extern volatile PikaObj* __pikaMain;
+    /* the module is already imported to root object, import it to self. */
+    if (obj_isArgExist((PikaObj*)__pikaMain, data)) {
+        obj_setArg(self, data, obj_getArg((PikaObj*)__pikaMain, data));
+        goto __exit;
+    }
     if (NULL == sModuleNameRedirect) {
         /* find cmodule in root object */
-        extern volatile PikaObj* __pikaMain;
         char* cmodule_try = strsGetFirstToken(&buffs, data, '.');
         if (obj_isArgExist((PikaObj*)__pikaMain, cmodule_try)) {
             obj_setArg(self, cmodule_try,

src/PikaVersion.h

@@ -2,4 +2,4 @@
 #define PIKA_VERSION_MINOR 13
 #define PIKA_VERSION_MICRO 2
 
-#define PIKA_EDIT_TIME "2024/02/12 23:32:13"
+#define PIKA_EDIT_TIME "2024/02/18 20:58:13"