You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2015/04/07 02:03:51 UTC
[6/9] lucy-clownfish git commit: Change interface/struct Go model.
Change interface/struct Go model.
Instead of mapping abstract classes to Go interfaces and concrete classes
to Go structs, create one Go interface and one Go struct for each
class.
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/cbd99b0b
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/cbd99b0b
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/cbd99b0b
Branch: refs/heads/master
Commit: cbd99b0b5ba8b1ef57d82ce940ffd9e041ea3eee
Parents: 128a2ea
Author: Marvin Humphrey <ma...@rectangular.com>
Authored: Sat Mar 28 15:12:19 2015 -0700
Committer: Marvin Humphrey <ma...@rectangular.com>
Committed: Mon Apr 6 09:08:19 2015 -0700
----------------------------------------------------------------------
runtime/go/clownfish/clownfish.go | 77 ++++++++++++++++++++++------------
runtime/go/clownfish/err_test.go | 4 +-
2 files changed, 52 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/cbd99b0b/runtime/go/clownfish/clownfish.go
----------------------------------------------------------------------
diff --git a/runtime/go/clownfish/clownfish.go b/runtime/go/clownfish/clownfish.go
index bb3173e..d3cc331 100644
--- a/runtime/go/clownfish/clownfish.go
+++ b/runtime/go/clownfish/clownfish.go
@@ -72,54 +72,70 @@ type Obj interface {
ToPtr() uintptr
}
-type Err struct {
+type implObj struct {
+ ref *C.cfish_Obj
+}
+
+type Err interface {
+ Obj
+ Error() string
+}
+
+type implErr struct {
ref *C.cfish_Err
}
-type String struct {
+type String interface {
+ Obj
+}
+
+type implString struct {
ref *C.cfish_String
}
-type ByteBuf struct {
+type implByteBuf struct {
ref *C.cfish_ByteBuf
}
-type Hash struct {
+type implHash struct {
ref *C.cfish_Hash
}
-type VArray struct {
+type implVArray struct {
ref *C.cfish_VArray
}
-type Class struct {
+type implClass struct {
ref *C.cfish_Class
}
-type Method struct {
+type implMethod struct {
ref *C.cfish_Method
}
-type LockFreeRegistry struct {
+type implLockFreeRegistry struct {
ref *C.cfish_LockFreeRegistry
}
-func NewString(goString string) *String {
+func NewString(goString string) String {
str := C.CString(goString)
len := C.size_t(len(goString))
- obj := &String{
- C.cfish_Str_new_steal_utf8(str, len),
- }
- runtime.SetFinalizer(obj, (*String).finalize)
+ cfObj := C.cfish_Str_new_steal_utf8(str, len)
+ return WRAPString(unsafe.Pointer(cfObj))
+}
+
+func WRAPString(ptr unsafe.Pointer) String {
+ obj := &implString{((*C.cfish_String)(ptr))}
+ runtime.SetFinalizer(obj, (*implString).finalize)
return obj
}
-func (obj *String) finalize() {
+func (obj *implString) finalize() {
C.cfish_dec_refcount(unsafe.Pointer(obj.ref))
obj.ref = nil
}
-func (obj *String) ToPtr() uintptr {
+func (obj *implString) ToPtr() uintptr {
return uintptr(unsafe.Pointer(obj.ref))
}
@@ -137,30 +153,36 @@ func CFStringToGo(ptr unsafe.Pointer) string {
return C.GoStringN(data, size)
}
-// TODO: Err should be an interface.
-func NewError(mess string) error {
+func NewErr(mess string) Err {
str := C.CString(mess)
len := C.size_t(len(mess))
messC := C.cfish_Str_new_steal_utf8(str, len)
- obj := &Err{C.cfish_Err_new(messC)}
- runtime.SetFinalizer(obj, (*Err).finalize)
+ cfObj := C.cfish_Err_new(messC)
+ return WRAPErr(unsafe.Pointer(cfObj))
+}
+
+func WRAPErr(ptr unsafe.Pointer) Err {
+ obj := &implErr{((*C.cfish_Err)(ptr))}
+ runtime.SetFinalizer(obj, (*implErr).finalize)
return obj
}
-func (obj *Err) finalize() {
+func (obj *implErr) finalize() {
C.cfish_dec_refcount(unsafe.Pointer(obj.ref))
obj.ref = nil
}
-func (obj *Err) Error() string {
+func (obj *implErr) ToPtr() uintptr {
+ return uintptr(unsafe.Pointer(obj.ref))
+}
+
+func (obj *implErr) Error() string {
return CFStringToGo(unsafe.Pointer(C.CFISH_Err_Get_Mess(obj.ref)))
}
//export GoCfish_PanicErr_internal
func GoCfish_PanicErr_internal(cfErr *C.cfish_Err) {
- goErr := &Err{cfErr}
- C.cfish_inc_refcount(unsafe.Pointer(cfErr))
- runtime.SetFinalizer(goErr, (*Err).finalize)
+ goErr := WRAPErr(unsafe.Pointer(cfErr))
panic(goErr)
}
@@ -169,18 +191,19 @@ func GoCfish_TrapErr_internal(routine C.CFISH_Err_Attempt_t,
context unsafe.Pointer) *C.cfish_Err {
err := TrapErr(func() { C.GoCfish_RunRoutine(routine, context) })
if err != nil {
- return (err.(*Err)).ref
+ ptr := (err.(Err)).ToPtr()
+ return ((*C.cfish_Err)(unsafe.Pointer(ptr)))
}
return nil
}
-// Run the supplied routine, and if it panics with a *clownfish.Err, trap and
+// Run the supplied routine, and if it panics with a clownfish.Err, trap and
// return it.
func TrapErr(routine func()) (trapped error) {
defer func() {
if r := recover(); r != nil {
// TODO: pass whitelist of Err types to trap.
- myErr, ok := r.(*Err)
+ myErr, ok := r.(Err)
if ok {
trapped = myErr
} else {
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/cbd99b0b/runtime/go/clownfish/err_test.go
----------------------------------------------------------------------
diff --git a/runtime/go/clownfish/err_test.go b/runtime/go/clownfish/err_test.go
index 060cf1e..9bdbceb 100644
--- a/runtime/go/clownfish/err_test.go
+++ b/runtime/go/clownfish/err_test.go
@@ -22,10 +22,10 @@ import "errors"
func TestTrapErr(t *testing.T) {
err := clownfish.TrapErr(
- func() { panic(clownfish.NewError("mistakes were made")) },
+ func() { panic(clownfish.NewErr("mistakes were made")) },
)
if err == nil {
- t.Error("Failed to trap *clownfish.Err")
+ t.Error("Failed to trap clownfish.Err")
}
}