diff --git a/src/ceval.h b/src/ceval.h index 01f42a1b..622e6999 100644 --- a/src/ceval.h +++ b/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(); diff --git a/src/vm.h b/src/vm.h index 35f8a334..a3ad9d1b 100644 --- a/src/vm.h +++ b/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 - 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){