blueloveTH 1 год назад
Родитель
Сommit
3bbcb384bd
2 измененных файлов с 8 добавлено и 8 удалено
  1. 6 6
      include/pocketpy/pocketpy.h
  2. 2 2
      src/public/values.c

+ 6 - 6
include/pocketpy/pocketpy.h

@@ -38,10 +38,10 @@ typedef py_TValue* py_TmpRef;
 /// @return true if the function is successful.
 typedef bool (*py_CFunction)(int argc, py_StackRef argv);
 
-enum BindType {
-    BindType_FUNCTION,
-    BindType_STATICMETHOD,
-    BindType_CLASSMETHOD,
+enum py_BindType {
+    py_FUNCTION,
+    py_STATICMETHOD,
+    py_CLASSMETHOD,
 };
 
 enum py_CompileMode { EXEC_MODE, EVAL_MODE, REPL_MODE, CELL_MODE };
@@ -153,13 +153,13 @@ void py_bind(py_Ref obj, const char* sig, py_CFunction f);
 py_ObjectRef py_bind2(py_Ref obj,
                       const char* sig,
                       py_CFunction f,
-                      enum BindType bt,
+                      enum py_BindType bt,
                       const char* docstring,
                       int slots);
 
 // old style argc-based bindings
 void py_bindmethod(py_Type type, const char* name, py_CFunction f);
-void py_bindmethod2(py_Type type, const char* name, py_CFunction f, enum BindType bt);
+void py_bindmethod2(py_Type type, const char* name, py_CFunction f, enum py_BindType bt);
 void py_bindfunc(py_Ref obj, const char* name, py_CFunction f);
 
 /// Get the reference to the i-th register.

+ 2 - 2
src/public/values.c

@@ -49,10 +49,10 @@ void py_newnativefunc(py_Ref out, py_CFunction f) {
 }
 
 void py_bindmethod(py_Type type, const char* name, py_CFunction f) {
-    py_bindmethod2(type, name, f, BindType_FUNCTION);
+    py_bindmethod2(type, name, f, py_FUNCTION);
 }
 
-void py_bindmethod2(py_Type type, const char* name, py_CFunction f, enum BindType bt) {
+void py_bindmethod2(py_Type type, const char* name, py_CFunction f, enum py_BindType bt) {
     py_TValue tmp;
     py_newnativefunc(&tmp, f);
     py_setdict(py_tpobject(type), py_name(name), &tmp);