From a832d4ace1f126df1f59f62488b730d811b07d1b Mon Sep 17 00:00:00 2001 From: Li Jie Date: Wed, 9 Oct 2024 16:13:49 +0800 Subject: [PATCH] py: change go style funcs w/ varargs to c style to avoid #821 --- py/call.go | 18 +++++++++--------- py/module.go | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/py/call.go b/py/call.go index 807d09246..dc84039ce 100644 --- a/py/call.go +++ b/py/call.go @@ -82,11 +82,11 @@ func (o *Object) CallObject(args *Object) *Object { return nil } // // This is the equivalent of the Python expression: o(*args). // -// Note that if you only pass PyObject* args, (*Object).CallFunctionObjArgs is a +// Note that if you only pass PyObject* args, CallFunctionObjArgs is a // faster alternative. // -// llgo:link (*Object).CallFunction C.PyObject_CallFunction -func (o *Object) CallFunction(format *c.Char, __llgo_va_list ...any) *Object { return nil } +// llgo:link CallFunction C.PyObject_CallFunction +func CallFunction(o *Object, format *c.Char, __llgo_va_list ...any) *Object { return nil } // Call a callable Python object o, with a variable number of PyObject* arguments. // The arguments are provided as a variable number of parameters followed by nil. @@ -96,16 +96,16 @@ func (o *Object) CallFunction(format *c.Char, __llgo_va_list ...any) *Object { r // // This is the equivalent of the Python expression: o(arg1, arg2, ...). // -// llgo:link (*Object).CallFunctionObjArgs C.PyObject_CallFunctionObjArgs -func (o *Object) CallFunctionObjArgs(__llgo_va_list ...any) *Object { return nil } +// llgo:link CallFunctionObjArgs C.PyObject_CallFunctionObjArgs +func CallFunctionObjArgs(o *Object, __llgo_va_list ...any) *Object { return nil } -// llgo:link (*Object).CallMethod C.PyObject_CallMethod -func (o *Object) CallMethod(name *c.Char, format *c.Char, __llgo_va_list ...any) *Object { +// llgo:link CallMethod C.PyObject_CallMethod +func CallMethod(o *Object, name *c.Char, format *c.Char, __llgo_va_list ...any) *Object { return nil } -// llgo:link (*Object).CallMethodObjArgs C.PyObject_CallMethodObjArgs -func (o *Object) CallMethodObjArgs(name *Object, __llgo_va_list ...any) *Object { return nil } +// llgo:link CallMethodObjArgs C.PyObject_CallMethodObjArgs +func CallMethodObjArgs(o *Object, name *Object, __llgo_va_list ...any) *Object { return nil } // llgo:link (*Object).Vectorcall C.PyObject_Vectorcall func (o *Object) Vectorcall(args **Object, nargs uintptr, kwnames *Object) *Object { diff --git a/py/module.go b/py/module.go index 7166fd9d8..090e3e813 100644 --- a/py/module.go +++ b/py/module.go @@ -72,7 +72,7 @@ func Import(name *Object) *Object // llgo:link (*Object).ModuleGetDict C.PyModule_GetDict func (m *Object) ModuleGetDict() *Object { return nil } -// llgo:link (*Object).ModuleLoadSyms C.llgoLoadPyModSyms -func (m *Object) ModuleLoadSyms(__llgo_va_list ...any) {} +// llgo:link ModuleLoadSyms C.llgoLoadPyModSyms +func ModuleLoadSyms(o *Object, __llgo_va_list ...any) {} // -----------------------------------------------------------------------------