update

Author: g.ph

PyLong.go

@@ -0,0 +1,35 @@
+package py3
+
+import (
+	"github.com/aadog/py3-go/cpy3"
+	"unsafe"
+)
+
+type PyLong struct {
+	PyObject
+}
+
+// PyLongFromInst
+// 新建一个对象来自已经存在的对象实例指针。
+//
+// Create a new object from an existing object instance pointer.
+func PyLongFromInst(inst uintptr) *PyLong {
+	dl := new(PyLong)
+	dl.instance = inst
+	dl.ptr = unsafe.Pointer(dl.instance)
+	return dl
+}
+func PyLongFromObj(obj *PyObject) *PyLong {
+	dl := new(PyLong)
+	dl.PyObject = *obj
+	return dl
+}
+func PyLongFromLong(n int) *PyLong {
+	return PyLongFromInst(cpy3.PyLong_FromLong(n))
+}
+func PyLongFromLongLong(n int64) *PyLong {
+	return PyLongFromInst(cpy3.PyLong_FromLongLong(n))
+}
+func PyLong_FromDouble(n float64) *PyLong {
+	return PyLongFromInst(cpy3.PyLong_FromDouble(n))
+}

PyMethodDef.go

@@ -8,10 +8,11 @@ type PyMethodDef struct {
 }
 
 func NewMethodDef(name string, meth func(self *PyObject, args *PyObject) *PyObject, doc string, flags int) *PyMethodDef {
-	return &PyMethodDef{
+	def := &PyMethodDef{
 		Name:   name,
 		Method: meth,
 		flags:  flags,
 		Doc:    doc,
 	}
+	return def
 }

PyModule.go

@@ -8,17 +8,20 @@ import (
 	"unsafe"
 )
 
+var ModuleMethodsDef = sync.Map{}
+var ModuleDefMap = sync.Map{}
 var PyMethodMap = sync.Map{}
 var pyModuleInitMap = sync.Map{}
+
 var PyMethodCallBack = syscall.NewCallback(func(self uintptr, args uintptr) uintptr {
 	pyArgs := PyTupleFromInst(args)
 	pyArgsLen := pyArgs.Size()
 	if pyArgsLen < 1 {
 		return Py_RETURN_NONE().instance
 	}
-	code := pyArgs.GetItem(0)
+	code := pyArgs.GetItem(0).Str()
 
-	ifn, ok := PyMethodMap.Load(code.Str())
+	ifn, ok := PyMethodMap.Load(code)
 	if ok == false {
 		return Py_RETURN_NONE().Instance()
 	}
@@ -102,20 +105,31 @@ func CreateModule(def *PyModuleDef) *PyObject {
 	methods := make([]cpy3.PyMethodDef, 0)
 	for _, method := range def.MethodDefs {
 		methodName := method.Name
-		methods = append(methods, cpy3.PyMethodDef{
-			Ml_name:  cpy3.GoStrToCStr(method.Name),
-			Ml_meth:  NewMethodCallBack(moduleName, methodName, method.Method),
-			Ml_flags: method.flags,
-			Ml_doc:   cpy3.GoStrToCStr(method.Doc),
-		})
+		NewMethodCallBack(moduleName,methodName,method.Method)
+		//methodDef := cpy3.PyMethodDef{
+		//	Ml_name:  cpy3.GoStrToCStr(method.Name),
+		//	Ml_meth:  NewMethodCallBack(moduleName, methodName, method.Method),
+		//	Ml_flags: method.flags,
+		//	Ml_doc:   cpy3.GoStrToCStr(method.Doc),
+		//}
+		//methods = append(methods, methodDef)
 	}
-	methods = append(methods, cpy3.PyMethodDef{
+	methodCallDef := cpy3.PyMethodDef{
+		Ml_name:  cpy3.GoStrToCStr("Call"),
+		Ml_meth:  PyMethodCallBack,
+		Ml_flags: 1,
+		Ml_doc:   cpy3.GoStrToCStr("跳转程序"),
+	}
+	methods = append(methods, methodCallDef)
+	moduleNullMethodDef := cpy3.PyMethodDef{
 		Ml_name:  0,
 		Ml_meth:  0,
 		Ml_flags: 0,
 		Ml_doc:   0,
-	})
+	}
+	methods = append(methods, moduleNullMethodDef)
 
+	ModuleMethodsDef.Store(fmt.Sprintf("%s", moduleName), methods)
 	moduleDef := cpy3.PyModuleDef{
 		M_base: cpy3.PyModuleDef_Base{
 			Ob_base: cpy3.PyObject_HEAD_INIT(0),
@@ -129,6 +143,10 @@ func CreateModule(def *PyModuleDef) *PyObject {
 		M_clear:    0,
 		M_free:     0,
 	}
-	ptr := cpy3.PyModule_Create2(uintptr(unsafe.Pointer(&moduleDef)), 1013)
-	return PyObjectFromInst(ptr)
+	ModuleDefMap.Store(moduleName, def)
+
+	pyObj := PyObjectFromInst(cpy3.PyModule_Create2(uintptr(unsafe.Pointer(&moduleDef)), 1013))
+	//不知道为啥非要IncRef一次才不会崩溃
+	pyObj.IncRef()
+	return pyObj
 }

ModuleDef.go renamed to PyModuleDef.go

@@ -7,7 +7,8 @@ type PyModuleDef struct {
 }
 
 func NewModuleDef(name string, doc string) *PyModuleDef {
-	return &PyModuleDef{Name: name, Doc: doc}
+	def := &PyModuleDef{Name: name, Doc: doc}
+	return def
 }
 func (m *PyModuleDef) AddMethodDef(methodDef *PyMethodDef) {
 	m.MethodDefs = append(m.MethodDefs, methodDef)

PyObject.go

@@ -16,6 +16,16 @@ type PyObject struct {
 func (p *PyObject) String() string {
 	return p.Str()
 }
+func (p *PyObject) CallNoArgs() *PyObject {
+	return PyObjectFromInst(cpy3.PyObject_CallNoArgs(p.Instance()))
+}
+func (p *PyObject) CallObject(args *PyObject) *PyObject {
+	return PyObjectFromInst(cpy3.PyObject_CallObject(p.Instance(), args.instance))
+}
+func (p *PyObject) PyObject_Call(args *PyObject, kwargs *PyObject) *PyObject {
+	return PyObjectFromInst(cpy3.PyObject_Call(p.Instance(), args.instance, kwargs.instance))
+}
+
 func (p *PyObject) GetAttr(attr_name string) *PyObject {
 	name := PyUnicode_FromString(attr_name)
 	defer name.DecRef()
@@ -35,9 +45,24 @@ func (o *PyObject) IncRef() {
 		cpy3.Py_IncRef(o.instance)
 	}
 }
+func (p *PyObject) RefCount() int {
+	return int(cpy3.PyObjectFromPtr(p.instance).Ob_refcnt)
+}
 func (p *PyObject) AsObj() *PyObject {
 	return p
 }
+func (p *PyObject) AsInt() int {
+	return int(p.AsLong())
+}
+func (p *PyObject) AsDouble() float64 {
+	return cpy3.PyLong_AsDouble(p.instance)
+}
+func (p *PyObject) AsLong() int {
+	return cpy3.PyLong_AsLong(p.instance)
+}
+func (p *PyObject) AsLongLong() int64 {
+	return cpy3.PyLong_AsLongLong(p.instance)
+}
 
 // PyObjectFromInst
 // 新建一个对象来自已经存在的对象实例指针。

README.MD

@@ -0,0 +1,8 @@
+
+### go python bind
+
+#### cgo-less 
+
+```
+go get github.com/aadog/py3-go
+```

RegModule.go

@@ -1,14 +1,9 @@
 package py3
 
 import (
-	"github.com/aadog/py3-go/cpy3"
 	"reflect"
-	"sync"
-	"unsafe"
 )
 
-var ModuleDef = sync.Map{}
-
 func RegPyModule(moduleName string, structV any) *PyObject {
 	val := reflect.ValueOf(structV)
 	inval := reflect.Indirect(val)
@@ -24,43 +19,20 @@ func RegPyModule(moduleName string, structV any) *PyObject {
 	if docV.Kind() == reflect.String {
 		doc = docV.String()
 	}
+	moduleDef := NewModuleDef(moduleName, doc)
+
 
-	methods := make([]cpy3.PyMethodDef, 0)
 	for i := 0; i < tp.NumMethod(); i++ {
 		method := tp.Method(i)
 		methodVal := val.Method(i)
 		fn, fnOk := methodVal.Interface().(PyMethodType)
 		if !fnOk {
-			break
+			continue
 		}
 		methodName := method.Name
-		methods = append(methods, cpy3.PyMethodDef{
-			Ml_name:  cpy3.GoStrToCStr(methodName),
-			Ml_meth:  NewMethodCallBack(moduleName, methodName, fn),
-			Ml_flags: 1,
-			Ml_doc:   cpy3.GoStrToCStr(""),
-		})
+		moduleDef.AddMethodDef(NewMethodDef(methodName, fn, "", 1))
 	}
-	methods = append(methods, cpy3.PyMethodDef{
-		Ml_name:  0,
-		Ml_meth:  0,
-		Ml_flags: 0,
-		Ml_doc:   0,
-	})
 
-	moduleDef := cpy3.PyModuleDef{
-		M_base: cpy3.PyModuleDef_Base{
-			Ob_base: cpy3.PyObject_HEAD_INIT(0),
-		},
-		M_name:     cpy3.GoStrToCStr(moduleName),
-		M_doc:      cpy3.GoStrToCStr(doc),
-		M_size:     -1,
-		M_methods:  uintptr(unsafe.Pointer(&methods[0])),
-		M_slots:    0,
-		M_traverse: 0,
-		M_clear:    0,
-		M_free:     0,
-	}
-	ptr := cpy3.PyModule_Create2(uintptr(unsafe.Pointer(&moduleDef)), 1013)
-	return PyObjectFromInst(ptr)
+	obj := CreateModule(moduleDef)
+	return obj
 }

cpy3/PyLong.go

@@ -0,0 +1,33 @@
+package cpy3
+
+func PyLong_AsDouble(obj uintptr) float64 {
+	r, _, _ := pyLong_AsDouble.Call(obj)
+	return float64(r)
+}
+func PyLong_AsLong(obj uintptr) int {
+	r, _, _ := pyLong_AsLong.Call(obj)
+	return int(r)
+}
+func PyLong_AsLongLong(obj uintptr) int64 {
+	r, _, _ := pyLong_AsLongLong.Call(obj)
+	return int64(r)
+}
+
+func PyLong_FromLong(n int) uintptr {
+	r, _, _ := pyLong_FromLong.Call(uintptr(n))
+	return r
+}
+
+func PyLong_FromLongLong(n int64) uintptr {
+	r, _, _ := pyLong_FromLong.Call(uintptr(n))
+	return r
+}
+func PyLong_FromDouble(n float64) uintptr {
+	r, _, _ := pyLong_FromLong.Call(uintptr(n))
+	return r
+}
+
+//func PyLong_FromString(n float64) uintptr {
+//	r, _, _ := pyLong_FromLong.Call(uintptr(n))
+//	return r
+//}

cpy3/PyModule.go

@@ -1,5 +1,7 @@
 package cpy3
 
+import "unsafe"
+
 type PyMethodDef struct {
 	Ml_name  uintptr
 	Ml_meth  uintptr
@@ -12,6 +14,7 @@ type PyObject struct {
 	Ob_refcnt uintptr
 	Ob_type   uintptr
 }
+
 type PyModuleDef_Base struct {
 	Ob_base PyObject
 	M_init  uintptr
@@ -30,6 +33,10 @@ type PyModuleDef struct {
 	M_free     uintptr
 }
 
+func PyObjectFromPtr(ptr uintptr) *PyObject {
+	return (*PyObject)(unsafe.Pointer(ptr))
+}
+
 func PyObject_HEAD_INIT(ob_type uintptr) PyObject {
 	return PyObject{
 		Ob_refcnt: 1,

cpy3/PyObject.go

@@ -9,3 +9,16 @@ func PyObject_GetAttr(obj uintptr, attr_name uintptr) uintptr {
 	r, _, _ := pyObject_GetAttr.Call(obj, attr_name)
 	return r
 }
+
+func PyObject_Call(obj uintptr, args uintptr, kwargs uintptr) uintptr {
+	r, _, _ := pyObject_Call.Call(obj, args, kwargs)
+	return r
+}
+func PyObject_CallObject(obj uintptr, args uintptr) uintptr {
+	r, _, _ := pyObject_CallObject.Call(obj, args)
+	return r
+}
+func PyObject_CallNoArgs(obj uintptr) uintptr {
+	r, _, _ := pyObject_CallNoArgs.Call(obj)
+	return r
+}