Merge pull request #23 from cpunion/reduce-types

reduce exported types

bool.go

@@ -9,7 +9,7 @@ type Bool struct {
 	Object
 }
 
-func newBool(obj *PyObject) Bool {
+func newBool(obj *cPyObject) Bool {
 	return Bool{newObject(obj)}
 }
 

bytes.go

@@ -12,7 +12,7 @@ type Bytes struct {
 	Object
 }
 
-func newBytes(obj *PyObject) Bytes {
+func newBytes(obj *cPyObject) Bytes {
 	return Bytes{newObject(obj)}
 }
 

complex.go

@@ -9,7 +9,7 @@ type Complex struct {
 	Object
 }
 
-func newComplex(obj *PyObject) Complex {
+func newComplex(obj *cPyObject) Complex {
 	return Complex{newObject(obj)}
 }
 

convert.go

@@ -14,7 +14,7 @@ import (
 func From(from any) Object {
 	switch v := from.(type) {
 	case Objecter:
-		return newObject(v.Obj())
+		return newObject(v.cpyObj())
 	case int8:
 		return newObject(C.PyLong_FromLong(C.long(v)))
 	case int16:
@@ -181,11 +181,11 @@ func ToValue(from Object, to reflect.Value) bool {
 			}
 		} else {
 			maps := getGlobalData()
-			tyMeta := maps.typeMetas[from.Type().Obj()]
+			tyMeta := maps.typeMetas[from.Type().cpyObj()]
 			if tyMeta == nil {
 				return false
 			}
-			wrapper := (*wrapperType)(unsafe.Pointer(from.Obj()))
+			wrapper := (*wrapperType)(unsafe.Pointer(from.cpyObj()))
 			to.Set(reflect.ValueOf(wrapper.goObj).Elem())
 			return true
 		}

convert_test.go

@@ -180,15 +180,15 @@ func TestFromSpecialCases(t *testing.T) {
 	}()
 
 	func() {
-		// Test From with Object.Obj()
+		// Test From with Object.cpyObj()
 		original := From(42)
-		obj := From(original.Obj())
+		obj := From(original.cpyObj())
 
 		if !obj.IsLong() {
-			t.Error("From(Object.Obj()) did not create Long object")
+			t.Error("From(Object.cpyObj()) did not create Long object")
 		}
 		if got := obj.AsLong().Int64(); got != 42 {
-			t.Errorf("From(Object.Obj()) = %d, want 42", got)
+			t.Errorf("From(Object.cpyObj()) = %d, want 42", got)
 		}
 
 		// Test that the new object is independent
@@ -281,7 +281,7 @@ func TestFromWithCustomType(t *testing.T) {
 		obj := From(p)
 
 		// Verify the type
-		if obj.Type().Obj() != pointClass.Obj() {
+		if obj.Type().cpyObj() != pointClass.cpyObj() {
 			t.Error("From(Point) created object with wrong type")
 		}
 		// Verify the values
@@ -311,7 +311,7 @@ func TestFromWithCustomType(t *testing.T) {
 		obj := From(p)
 
 		// Verify the type
-		if obj.Type().Obj() != pointClass.Obj() {
+		if obj.Type().cpyObj() != pointClass.cpyObj() {
 			t.Error("From(*Point) created object with wrong type")
 		}
 

dict.go

@@ -13,7 +13,7 @@ type Dict struct {
 	Object
 }
 
-func newDict(obj *PyObject) Dict {
+func newDict(obj *cPyObject) Dict {
 	return Dict{newObject(obj)}
 }
 
@@ -44,19 +44,19 @@ func (d Dict) HasKey(key any) bool {
 }
 
 func (d Dict) Get(key Objecter) Object {
-	v := C.PyDict_GetItem(d.obj, key.Obj())
+	v := C.PyDict_GetItem(d.obj, key.cpyObj())
 	C.Py_IncRef(v)
 	return newObject(v)
 }
 
 func (d Dict) Set(key, value Objecter) {
-	keyObj := key.Obj()
-	valueObj := value.Obj()
+	keyObj := key.cpyObj()
+	valueObj := value.cpyObj()
 	C.PyDict_SetItem(d.obj, keyObj, valueObj)
 }
 
 func (d Dict) SetString(key string, value Objecter) {
-	valueObj := value.Obj()
+	valueObj := value.cpyObj()
 	ckey := AllocCStr(key)
 	r := C.PyDict_SetItemString(d.obj, ckey, valueObj)
 	C.free(unsafe.Pointer(ckey))
@@ -72,7 +72,7 @@ func (d Dict) GetString(key string) Object {
 }
 
 func (d Dict) Del(key Objecter) {
-	C.PyDict_DelItem(d.obj, key.Obj())
+	C.PyDict_DelItem(d.obj, key.cpyObj())
 }
 
 func (d Dict) Iter() *DictIter {

extension.go

@@ -31,7 +31,7 @@ func CreateFunc(name string, fn any, doc string) Func {
 }
 
 type wrapperType struct {
-	PyObject
+	cPyObject
 	goObj  any
 	holder *objectHolder
 }
@@ -139,7 +139,7 @@ func getterMethod(self *C.PyObject, _closure unsafe.Pointer, methodId C.int) *C.
 			return (*C.PyObject)(unsafe.Pointer(newWrapper))
 		}
 	}
-	return From(field.Interface()).Obj()
+	return From(field.Interface()).cpyObj()
 }
 
 //export setterMethod
@@ -307,17 +307,17 @@ func wrapperMethod_(typeMeta *typeMeta, methodMeta *slotMeta, self, args *C.PyOb
 	}
 
 	if len(results) == 0 {
-		return None().Obj()
+		return None().cpyObj()
 	}
 	if len(results) == 1 {
-		return From(results[0].Interface()).Obj()
+		return From(results[0].Interface()).cpyObj()
 	}
 
 	tuple := MakeTupleWithLen(len(results))
 	for i := range results {
 		tuple.Set(i, From(results[i].Interface()))
 	}
-	return tuple.Obj()
+	return tuple.cpyObj()
 }
 
 func goNameToPythonName(name string) string {

extension_test.go

@@ -700,7 +700,7 @@ func TestAddTypeDuplicate(t *testing.T) {
 		t.Fatal("Failed to get type on second registration")
 	}
 
-	if typ1.Obj() != typ2.Obj() {
+	if typ1.cpyObj() != typ2.cpyObj() {
 		t.Fatal("Expected same type object on second registration")
 	}
 
@@ -721,7 +721,7 @@ assert obj1.value == 42
 		t.Fatal("Failed to get type on registration with pointer")
 	}
 
-	if typ1.Obj() != typ3.Obj() {
+	if typ1.cpyObj() != typ3.cpyObj() {
 		t.Fatal("Expected same type object on second registration")
 	}
 }

float.go

@@ -11,7 +11,7 @@ type Float struct {
 	Object
 }
 
-func newFloat(obj *PyObject) Float {
+func newFloat(obj *cPyObject) Float {
 	return Float{newObject(obj)}
 }
 

function.go

@@ -6,7 +6,7 @@ package gp
 import "C"
 
 type Objecter interface {
-	Obj() *PyObject
+	cpyObj() *cPyObject
 	object() Object
 	Ensure()
 }
@@ -15,7 +15,7 @@ type Func struct {
 	Object
 }
 
-func newFunc(obj *PyObject) Func {
+func newFunc(obj *cPyObject) Func {
 	return Func{newObject(obj)}
 }
 
@@ -32,7 +32,7 @@ func (f Func) callNoArgs() Object {
 }
 
 func (f Func) callOneArg(arg Objecter) Object {
-	return newObject(C.PyObject_CallOneArg(f.obj, arg.Obj()))
+	return newObject(C.PyObject_CallOneArg(f.obj, arg.cpyObj()))
 }
 
 func (f Func) CallObject(args Tuple) Object {

list.go

@@ -10,7 +10,7 @@ type List struct {
 	Object
 }
 
-func newList(obj *PyObject) List {
+func newList(obj *cPyObject) List {
 	return List{newObject(obj)}
 }
 
@@ -30,7 +30,7 @@ func (l List) GetItem(index int) Object {
 }
 
 func (l List) SetItem(index int, item Objecter) {
-	itemObj := item.Obj()
+	itemObj := item.cpyObj()
 	C.Py_IncRef(itemObj)
 	r := C.PyList_SetItem(l.obj, C.Py_ssize_t(index), itemObj)
 	check(r == 0, fmt.Sprintf("failed to set item %d in list", index))
@@ -41,6 +41,6 @@ func (l List) Len() int {
 }
 
 func (l List) Append(obj Objecter) {
-	r := C.PyList_Append(l.obj, obj.Obj())
+	r := C.PyList_Append(l.obj, obj.cpyObj())
 	check(r == 0, "failed to append item to list")
 }

long.go

@@ -10,7 +10,7 @@ type Long struct {
 	Object
 }
 
-func newLong(obj *PyObject) Long {
+func newLong(obj *cPyObject) Long {
 	return Long{newObject(obj)}
 }
 
@@ -30,7 +30,7 @@ func LongFromString(s string, base int) Long {
 }
 
 func LongFromUnicode(u Object, base int) Long {
-	return newLong(C.PyLong_FromUnicodeObject(u.Obj(), C.int(base)))
+	return newLong(C.PyLong_FromUnicodeObject(u.cpyObj(), C.int(base)))
 }
 
 func (l Long) Int() int {

math/math.go

@@ -14,5 +14,5 @@ func math() gp.Module {
 }
 
 func Sqrt(x gp.Float) gp.Float {
-	return math().Call("sqrt", x.Obj()).AsFloat()
+	return math().Call("sqrt", x).AsFloat()
 }

module.go

@@ -10,7 +10,7 @@ type Module struct {
 	Object
 }
 
-func newModule(obj *PyObject) Module {
+func newModule(obj *cPyObject) Module {
 	return Module{newObject(obj)}
 }
 

object.go

@@ -18,7 +18,7 @@ type pyObject struct {
 	g   *globalData
 }
 
-func (o *pyObject) Obj() *PyObject {
+func (o *pyObject) cpyObj() *cPyObject {
 	if o == nil {
 		return nil
 	}
@@ -42,20 +42,20 @@ type Object struct {
 	*pyObject
 }
 
-func FromPy(obj *PyObject) Object {
+func FromPy(obj *cPyObject) Object {
 	return newObject(obj)
 }
 
 func (o Object) object() Object {
 	return o
 }
 
-func newObjectRef(obj *PyObject) Object {
+func newObjectRef(obj *cPyObject) Object {
 	C.Py_IncRef(obj)
 	return newObject(obj)
 }
 
-func newObject(obj *PyObject) Object {
+func newObject(obj *cPyObject) Object {
 	if obj == nil {
 		C.PyErr_Print()
 		panic("nil Python object")
@@ -73,7 +73,7 @@ func (o Object) Dir() List {
 }
 
 func (o Object) Equals(other Objecter) bool {
-	return C.PyObject_RichCompareBool(o.obj, other.Obj(), C.Py_EQ) != 0
+	return C.PyObject_RichCompareBool(o.obj, other.cpyObj(), C.Py_EQ) != 0
 }
 
 func (o Object) Attr(name string) Object {
@@ -222,14 +222,14 @@ func (o Object) Repr() string {
 }
 
 func (o Object) Type() Object {
-	return newObject(C.PyObject_Type(o.Obj()))
+	return newObject(C.PyObject_Type(o.cpyObj()))
 }
 
 func (o Object) String() string {
 	return newStr(C.PyObject_Str(o.obj)).String()
 }
 
-func (o Object) Obj() *PyObject {
+func (o Object) cpyObj() *cPyObject {
 	if o.Nil() {
 		return nil
 	}

object_test.go

@@ -185,16 +185,16 @@ func TestObjectString(t *testing.T) {
 
 func TestPyObjectMethods(t *testing.T) {
 	setupTest(t)
-	// Test pyObject.Obj()
+	// Test pyObject.cpyObj()
 	obj := From(42)
-	if obj.pyObject.Obj() == nil {
-		t.Error("pyObject.Obj() returned nil for valid object")
+	if obj.pyObject.cpyObj() == nil {
+		t.Error("pyObject.cpyObj() returned nil for valid object")
 	}
 
 	func() {
 		var nilObj *pyObject
-		if nilObj.Obj() != nil {
-			t.Error("pyObject.Obj() should return nil for nil object")
+		if nilObj.cpyObj() != nil {
+			t.Error("pyObject.cpyObj() should return nil for nil object")
 		}
 	}()
 
@@ -365,17 +365,17 @@ def make_tuple():
 	}()
 
 	func() {
-		// Test Object.Obj()
+		// Test Object.cpyObj()
 		obj := From(42)
-		if obj.Obj() == nil {
-			t.Error("Object.Obj() returned nil for valid object")
+		if obj.cpyObj() == nil {
+			t.Error("Object.cpyObj() returned nil for valid object")
 		}
 	}()
 
 	func() {
 		var nilObj Object
-		if nilObj.Obj() != nil {
-			t.Error("Object.Obj() should return nil for nil object")
+		if nilObj.cpyObj() != nil {
+			t.Error("Object.cpyObj() should return nil for nil object")
 		}
 	}()