blueloveTH 2 лет назад
Родитель
Сommit
736d66fbae
2 измененных файлов с 5 добавлено и 5 удалено
  1. 2 2
      src/ceval.h
  2. 3 3
      src/vm.h

+ 2 - 2
src/ceval.h

@@ -218,13 +218,13 @@ __NEXT_STEP:;
         DISPATCH();
     TARGET(BUILD_DICT) {
         PyObject* t = VAR(STACK_VIEW(byte.arg).to_tuple());
-        PyObject* obj = call_(builtins->attr(m_dict), t);
+        PyObject* obj = call(builtins->attr(m_dict), t);
         STACK_SHRINK(byte.arg);
         PUSH(obj);
     } DISPATCH();
     TARGET(BUILD_SET) {
         PyObject* t = VAR(STACK_VIEW(byte.arg).to_tuple());
-        PyObject* obj = call_(builtins->attr(m_set), t);
+        PyObject* obj = call(builtins->attr(m_set), t);
         STACK_SHRINK(byte.arg);
         PUSH(obj);
     } DISPATCH();

+ 3 - 3
src/vm.h

@@ -141,7 +141,7 @@ public:
 
     PyObject* asList(PyObject* it){
         if(is_non_tagged_type(it, tp_list)) return it;
-        return call_(_t(tp_list), it);
+        return call(_t(tp_list), it);
     }
 
     PyObject* find_name_in_mro(PyObject* cls, StrName name){
@@ -214,7 +214,7 @@ public:
     }
 
     template<typename... Args>
-    PyObject* call_(PyObject* callable, Args&&... args){
+    PyObject* call(PyObject* callable, Args&&... args){
         PUSH(callable);
         PUSH(_py_null);
         int ARGC = sizeof...(args);
@@ -240,7 +240,7 @@ public:
     PyObject* property(NativeFuncRaw fget){
         PyObject* p = builtins->attr("property");
         PyObject* method = heap.gcnew(tp_native_func, NativeFunc(fget, 1, false));
-        return call_(p, method);
+        return call(p, method);
     }
 
     PyObject* new_type_object(PyObject* mod, StrName name, Type base){