From ec201dbc4576bbcd662c84cdbe4d5454aa92f7eb Mon Sep 17 00:00:00 2001
From: BLUELOVETH <blueloveTH@foxmail.com>
Date: Fri, 14 Jul 2023 18:19:37 +0800
Subject: [PATCH] ...

---
 include/pocketpy/pocketpy_c.h |  8 ++++----
 src/pocketpy_c.cpp            | 11 ++++-------
 src2/main.cpp                 |  4 +---
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/include/pocketpy/pocketpy_c.h b/include/pocketpy/pocketpy_c.h
index 94a72427..3ba4ca62 100644
--- a/include/pocketpy/pocketpy_c.h
+++ b/include/pocketpy/pocketpy_c.h
@@ -70,10 +70,10 @@ PK_EXPORT bool pkpy_push_function(pkpy_vm*, const char*, pkpy_CFunction);
 PK_EXPORT bool pkpy_push_module(pkpy_vm*, const char*);
 
 // some opt
-PK_EXPORT bool pkpy_load_attr(pkpy_vm*, pkpy_CName);
-PK_EXPORT bool pkpy_store_attr(pkpy_vm*, pkpy_CName);
-PK_EXPORT bool pkpy_load_global(pkpy_vm*, pkpy_CName);
-PK_EXPORT bool pkpy_store_global(pkpy_vm*, pkpy_CName);
+PK_EXPORT bool pkpy_getattr(pkpy_vm*, pkpy_CName);
+PK_EXPORT bool pkpy_setattr(pkpy_vm*, pkpy_CName);
+PK_EXPORT bool pkpy_getglobal(pkpy_vm*, pkpy_CName);
+PK_EXPORT bool pkpy_setglobal(pkpy_vm*, pkpy_CName);
 PK_EXPORT bool pkpy_eval(pkpy_vm*, const char* source);
 PK_EXPORT bool pkpy_unpack_sequence(pkpy_vm*, int size);
 PK_EXPORT bool pkpy_get_unbound_method(pkpy_vm*, pkpy_CName);
diff --git a/src/pocketpy_c.cpp b/src/pocketpy_c.cpp
index 20ad4218..9e36b5f8 100644
--- a/src/pocketpy_c.cpp
+++ b/src/pocketpy_c.cpp
@@ -1,7 +1,4 @@
 #include "pocketpy.h"
-#include "pocketpy/obj.h"
-#include "pocketpy/pocketpy_c.h"
-#include "pocketpy/tuplelist.h"
 #include "pocketpy_c.h"
 
 using namespace pkpy;
@@ -350,7 +347,7 @@ bool pkpy_push_module(pkpy_vm* vm_handle, const char* name) {
 }
 
 // some opt
-bool pkpy_load_attr(pkpy_vm* vm_handle, pkpy_CName name) {
+bool pkpy_getattr(pkpy_vm* vm_handle, pkpy_CName name) {
     VM* vm = (VM*) vm_handle;
     PK_ASSERT_NO_ERROR()
     PK_ASSERT_N_EXTRA_ELEMENTS(1)
@@ -362,7 +359,7 @@ bool pkpy_load_attr(pkpy_vm* vm_handle, pkpy_CName name) {
     return true;
 }
 
-bool pkpy_store_attr(pkpy_vm* vm_handle, pkpy_CName name) {
+bool pkpy_setattr(pkpy_vm* vm_handle, pkpy_CName name) {
     VM* vm = (VM*) vm_handle;
     PK_ASSERT_NO_ERROR()
     PK_ASSERT_N_EXTRA_ELEMENTS(2)
@@ -376,7 +373,7 @@ bool pkpy_store_attr(pkpy_vm* vm_handle, pkpy_CName name) {
 }
 
 //get global will also get bulitins
-bool pkpy_load_global(pkpy_vm* vm_handle, const char* name) {
+bool pkpy_getglobal(pkpy_vm* vm_handle, const char* name) {
     VM* vm = (VM*) vm_handle;
     PK_ASSERT_NO_ERROR()
     PyObject* o = vm->_main->attr().try_get(name);
@@ -391,7 +388,7 @@ bool pkpy_load_global(pkpy_vm* vm_handle, const char* name) {
     return true;
 }
 
-bool pkpy_store_global(pkpy_vm* vm_handle, const char* name) {
+bool pkpy_setglobal(pkpy_vm* vm_handle, const char* name) {
     VM* vm = (VM*) vm_handle;
     PK_ASSERT_NO_ERROR()
     PK_ASSERT_N_EXTRA_ELEMENTS(1)
diff --git a/src2/main.cpp b/src2/main.cpp
index dd02c0d3..1405c34b 100644
--- a/src2/main.cpp
+++ b/src2/main.cpp
@@ -65,9 +65,7 @@ int main(int argc, char** argv){
 
     pkpy_push_function(vm, "input() -> str", f_input);
     pkpy_eval(vm, "__import__('builtins')");
-    pkpy_store_attr(vm, pkpy_name("input"));
-
-    PK_ASSERT(pkpy_stack_size(vm) == 0);
+    pkpy_setattr(vm, pkpy_name("input"));
 
     if(argc == 1){
         void* repl = pkpy_new_repl(vm);