support '__getattribute__()'

pikasTech · pikasTech · commit 459da8ab5bac · 2022-09-23T16:34:14.000+08:00
support `__getattr__()`

disable proxy for PIKA_NANO_ENABLE

fix typo

support `__setattr__()`

proxy for cmodule is ok
diff --git a/port/linux/.vscode/launch.json b/port/linux/.vscode/launch.json
@@ -11,7 +11,7 @@
             "program": "${workspaceFolder}/build/test/pikascript_test",
             // "program": "${workspaceFolder}/build/boot/demo06-pikamain/pikascript_demo06-pikamain",
             "args": [
-                // "--gtest_filter=stddata.list_pop_"
+                // "--gtest_filter=vm.getattribute"
             ],
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}",
diff --git a/port/linux/.vscode/settings.json b/port/linux/.vscode/settings.json
@@ -65,6 +65,7 @@
         "agile_modbus.h": "c",
         "_modbus__modbusrtu.h": "c",
         "_modbus__modbustcp.h": "c",
-        "pikastddata_string.h": "c"
+        "pikastddata_string.h": "c",
+        "gtesttask_proxytest.h": "c"
     }
 }
diff --git a/port/linux/package/pikascript/GTestTask.pyi b/port/linux/package/pikascript/GTestTask.pyi
@@ -14,3 +14,8 @@ class Task(PikaStdTask.Task):
 def test(a: int, b: object): ...
 def test_dict() -> dict: ...
 def test64(a: int64, b: int64) -> int64: ...
+
+
+class ProxyTest:
+    def __getattribute__(self, __name: str) -> any: ...
+    def __setattr__(self, __name: str, __value: any): ...
diff --git a/port/linux/package/pikascript/pikascript-lib/GTestTask/GTestTask.c b/port/linux/package/pikascript/pikascript-lib/GTestTask/GTestTask.c
@@ -1,4 +1,5 @@
 #include "GTestTask.h"
+#include "GTestTask_ProxyTest.h"
 #include "GTestTask_Task.h"
 #include "PikaStdData_Dict.h"
 
@@ -38,6 +39,17 @@ PikaObj* GTestTask_test_dict(PikaObj* self) {
     return dict;
 }
 
-int64_t GTestTask_test64(PikaObj *self, int64_t a, int64_t b){
+int64_t GTestTask_test64(PikaObj* self, int64_t a, int64_t b) {
     return a * b;
 }
+
+Arg* GTestTask_ProxyTest___getattribute__(PikaObj* self, char* __name) {
+    return arg_newStr(__name);
+}
+
+void GTestTask_ProxyTest___setattr__(PikaObj* self,
+                                     char* __name,
+                                     Arg* __value) {
+    __platform_printf("GTestTask_ProxyTest___setattr__: %s, %s\r\n", __name,
+                      arg_getStr(__value));
+}
diff --git a/port/linux/test/VM-test.cpp b/port/linux/test/VM-test.cpp
@@ -1781,4 +1781,104 @@ TEST(vm, call_dict_err) {
     obj_deinit(pikaMain);
     EXPECT_EQ(pikaMemNow(), 0);
 }
+
+TEST(vm, getattribute) {
+    /* init */
+    pikaMemInfo.heapUsedMax = 0;
+    PikaObj* pikaMain = newRootObj("pikaMain", New_PikaMain);
+    extern unsigned char pikaModules_py_a[];
+    obj_linkLibrary(pikaMain, pikaModules_py_a);
+    /* run */
+    __platform_printf("BEGIN\r\n");
+    obj_run(pikaMain,
+            "class test:\n"
+            "    def __getattribute__(self, name):\n"
+            "        return name\n"
+            "t = test()\n"
+            "t.a\n");
+    /* collect */
+    /* assert */
+    EXPECT_STREQ(log_buff[0], "'a'\r\n");
+    /* deinit */
+    obj_deinit(pikaMain);
+    EXPECT_EQ(pikaMemNow(), 0);
+}
+
+TEST(vm, getattr) {
+    /* init */
+    pikaMemInfo.heapUsedMax = 0;
+    PikaObj* pikaMain = newRootObj("pikaMain", New_PikaMain);
+    extern unsigned char pikaModules_py_a[];
+    obj_linkLibrary(pikaMain, pikaModules_py_a);
+    /* run */
+    __platform_printf("BEGIN\r\n");
+    obj_run(pikaMain,
+            "class test:\n"
+            "    a =  1\n"
+            "    def __getattr__(self, name):\n"
+            "        return name\n"
+            "t = test()\n"
+            "t.a\n"
+            "t.b\n");
+    /* collect */
+    /* assert */
+    EXPECT_STREQ(log_buff[0], "'b'\r\n");
+    EXPECT_STREQ(log_buff[1], "1\r\n");
+    EXPECT_STREQ(log_buff[2], "BEGIN\r\n");
+    /* deinit */
+    obj_deinit(pikaMain);
+    EXPECT_EQ(pikaMemNow(), 0);
+}
+
+TEST(vm, setattr) {
+    /* init */
+    pikaMemInfo.heapUsedMax = 0;
+    PikaObj* pikaMain = newRootObj("pikaMain", New_PikaMain);
+    extern unsigned char pikaModules_py_a[];
+    obj_linkLibrary(pikaMain, pikaModules_py_a);
+    /* run */
+    __platform_printf("BEGIN\r\n");
+    obj_run(pikaMain,
+            "class test:\n"
+            "    a =  1\n"
+            "    def __setattr__(self, name, val):\n"
+            "        print((name, val))\n"
+            "t = test()\n"
+            "t.a = 1\n"
+            "t.b = 'test'\n");
+    /* collect */
+    /* assert */
+    EXPECT_STREQ(log_buff[2], "BEGIN\r\n");
+    EXPECT_STREQ(log_buff[1], "('a', 1)\r\n");
+    EXPECT_STREQ(log_buff[0], "('b', 'test')\r\n");
+    /* deinit */
+    obj_deinit(pikaMain);
+    EXPECT_EQ(pikaMemNow(), 0);
+}
+
+TEST(vm, c_module_get_set_attr) {
+    /* init */
+    pikaMemInfo.heapUsedMax = 0;
+    PikaObj* pikaMain = newRootObj("pikaMain", New_PikaMain);
+    extern unsigned char pikaModules_py_a[];
+    obj_linkLibrary(pikaMain, pikaModules_py_a);
+    /* run */
+    __platform_printf("BEGIN\r\n");
+    obj_run(pikaMain,
+            "t = GTestTask.ProxyTest()\n"
+            "t.a\n"
+            "t.b\n"
+            "t.a = 'test1'\n"
+            "t.b = 'test2'\n");
+    /* collect */
+    /* assert */
+    EXPECT_STREQ(log_buff[3], "'a'\r\n");
+    EXPECT_STREQ(log_buff[2], "'b'\r\n");
+    EXPECT_STREQ(log_buff[1], "GTestTask_ProxyTest___setattr__: a, test1\r\n");
+    EXPECT_STREQ(log_buff[0], "GTestTask_ProxyTest___setattr__: b, test2\r\n");
+    /* deinit */
+    obj_deinit(pikaMain);
+    EXPECT_EQ(pikaMemNow(), 0);
+}
+
 #endif
diff --git a/port/linux/test/compile-test.cpp b/port/linux/test/compile-test.cpp
@@ -622,3 +622,21 @@ TEST(compiler, __list) {
     Parser_linesToArray(lines);
     EXPECT_EQ(pikaMemNow(), 0);
 }
+
+TEST(compiler, getattr) {
+    char* lines = "@res = __getattribute__(@name)";
+    Parser_linesToArray(lines);
+    EXPECT_EQ(pikaMemNow(), 0);
+}
+
+TEST(compiler, getattr2) {
+    char* lines = "@res = __getattr__(@name)";
+    Parser_linesToArray(lines);
+    EXPECT_EQ(pikaMemNow(), 0);
+}
+
+TEST(compiler, setattr) {
+    char* lines = "__setattr__(@name, @value)";
+    Parser_linesToArray(lines);
+    EXPECT_EQ(pikaMemNow(), 0);
+}
diff --git a/src/PikaObj.c b/src/PikaObj.c
@@ -197,14 +197,15 @@ int64_t obj_getInt(PikaObj* self, char* argPath) {
 }
 
 Arg* obj_getArg(PikaObj* self, char* argPath) {
-    PIKA_BOOL isClass = PIKA_FALSE;
-    PikaObj* obj = obj_getHostObjWithIsTemp(self, argPath, &isClass);
+    PIKA_BOOL is_temp = PIKA_FALSE;
+    PikaObj* obj = obj_getHostObjWithIsTemp(self, argPath, &is_temp);
     if (NULL == obj) {
         return NULL;
     }
+    Arg* res = NULL;
     char* argName = strPointToLastToken(argPath, '.');
-    Arg* res = args_getArg(obj->list, argName);
-    if (isClass) {
+    res = args_getArg(obj->list, argName);
+    if (is_temp) {
         obj_setArg(self, "_buf", res);
         res = obj_getArg(self, "_buf");
         obj_deinit(obj);
@@ -520,13 +521,13 @@ static PikaObj* __obj_getObjWithKeepDeepth(PikaObj* self,
 }
 
 PikaObj* obj_getObj(PikaObj* self, char* objPath) {
-    PIKA_BOOL isClass = PIKA_FALSE;
-    return __obj_getObjWithKeepDeepth(self, objPath, &isClass, 0);
+    PIKA_BOOL is_temp = PIKA_FALSE;
+    return __obj_getObjWithKeepDeepth(self, objPath, &is_temp, 0);
 }
 
 PikaObj* obj_getHostObj(PikaObj* self, char* objPath) {
-    PIKA_BOOL isClass = PIKA_FALSE;
-    return __obj_getObjWithKeepDeepth(self, objPath, &isClass, 1);
+    PIKA_BOOL is_temp = PIKA_FALSE;
+    return __obj_getObjWithKeepDeepth(self, objPath, &is_temp, 1);
 }
 
 PikaObj* obj_getHostObjWithIsTemp(PikaObj* self,
@@ -594,6 +595,30 @@ PikaObj* methodArg_getDefContext(Arg* method_arg) {
     return context;
 }
 
+void _update_proxy(PikaObj* self, char* name) {
+#if PIKA_NANO_ENABLE
+    return;
+#endif
+    if (!(self->proxy & PIKA_PROXY_GETATTRIBUTE)) {
+        if (strEqu(name, "__getattribute__")) {
+            self->proxy |= PIKA_PROXY_GETATTRIBUTE;
+            return;
+        }
+    }
+    if (!(self->proxy & PIKA_PROXY_GETATTR)) {
+        if (strEqu(name, "__getattr__")) {
+            self->proxy |= PIKA_PROXY_GETATTR;
+            return;
+        }
+    }
+    if (!(self->proxy & PIKA_PROXY_SETATTR)) {
+        if (strEqu(name, "__setattr__")) {
+            self->proxy |= PIKA_PROXY_SETATTR;
+            return;
+        }
+    }
+}
+
 static void obj_saveMethodInfo(PikaObj* self, MethodInfo* method_info) {
     Args buffs = {0};
     method_info->pars = method_info->dec;
@@ -612,6 +637,7 @@ static void obj_saveMethodInfo(PikaObj* self, MethodInfo* method_info) {
                      sizeof(method_info_def_context));
     arg = arg_append(arg, method_info->pars, size_pars + 1);
 
+    _update_proxy(self, method_info->name);
     args_setArg(self->list, arg);
     strsDeinit(&buffs);
 }
@@ -1001,6 +1027,7 @@ PikaObj* New_PikaObj(void) {
     self->list = New_args(NULL);
     self->refcnt = 0;
     self->constructor = NULL;
+    self->proxy = 0;
     return self;
 }
 
diff --git a/src/PikaObj.h b/src/PikaObj.h
@@ -71,8 +71,13 @@ struct PikaObj {
     Args* list;
     uint8_t refcnt;
     void* constructor;
+    uint8_t proxy;
 };
 
+#define PIKA_PROXY_GETATTRIBUTE 0x01
+#define PIKA_PROXY_GETATTR 0x02
+#define PIKA_PROXY_SETATTR 0x04
+
 typedef PikaObj* (*NewFun)(Args* args);
 typedef PikaObj* (*InitFun)(PikaObj* self, Args* args);
 typedef PikaObj VMParameters;
@@ -128,8 +133,8 @@ int32_t obj_addOther(PikaObj* self, char* subObjectName, void* new_projcetFun);
 PikaObj* obj_getObj(PikaObj* self, char* objPath);
 PikaObj* obj_getHostObj(PikaObj* self, char* objPath);
 PikaObj* obj_getHostObjWithIsTemp(PikaObj* self,
-                                   char* objPath,
-                                   PIKA_BOOL* pIsClass);
+                                  char* objPath,
+                                  PIKA_BOOL* pIsClass);
 
 // subProcess
 int32_t obj_freeObj(PikaObj* self, char* subObjectName);
diff --git a/src/PikaVM.c b/src/PikaVM.c

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@`
`65`	`65`	`"agile_modbus.h": "c",`
`66`	`66`	`"_modbus__modbusrtu.h": "c",`
`67`	`67`	`"_modbus__modbustcp.h": "c",`
`68`		`- "pikastddata_string.h": "c"`
	`68`	`+ "pikastddata_string.h": "c",`
	`69`	`+ "gtesttask_proxytest.h": "c"`
`69`	`70`	`}`
`70`	`71`	`}`