Skip to content
This repository was archived by the owner on Apr 30, 2019. It is now read-only.

Introduce ValueError and use it for panic messages #16

Merged
merged 1 commit into from
Jul 15, 2018
Merged

Introduce ValueError and use it for panic messages #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions js/js_notwasm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,9 @@ func ValueOf(x interface{}) Value {
}

func (v Value) Bool() bool {
if vType := v.Type(); vType != TypeBoolean {
panic(&ValueError{"Value.Bool", vType})
}
return v.v.Bool()
}

Expand All @@ -202,10 +205,19 @@ func convertArgs(args []interface{}) []interface{} {
}

func (v Value) Call(m string, args ...interface{}) Value {
if vType := v.Type(); vType != TypeObject && vType != TypeFunction {
panic(&ValueError{"Value.Call", vType})
}
if propType := v.Get(m).Type(); propType != TypeFunction {
panic("js: Value.Call: property " + m + " is not a function, got " + propType.String())
}
return Value{v: v.v.Call(m, convertArgs(args)...)}
}

func (v Value) Float() float64 {
if vType := v.Type(); vType != TypeNumber {
panic(&ValueError{"Value.Float", vType})
}
return v.v.Float()
}

Expand All @@ -218,10 +230,16 @@ func (v Value) Index(i int) Value {
}

func (v Value) Int() int {
if vType := v.Type(); vType != TypeNumber {
panic(&ValueError{"Value.Int", vType})
}
return v.v.Int()
}

func (v Value) Invoke(args ...interface{}) Value {
if vType := v.Type(); vType != TypeFunction {
panic(&ValueError{"Value.Invoke", vType})
}
return Value{v: v.v.Invoke(convertArgs(args)...)}
}

Expand Down Expand Up @@ -273,3 +291,12 @@ func (t *TypedArray) Release() {
func GetInternalObject(v Value) interface{} {
return v.v
}

type ValueError struct {
Method string
Type Type
}

func (e *ValueError) Error() string {
return "syscall/js: call of " + e.Method + " on " + e.Type.String()
}
6 changes: 6 additions & 0 deletions js/js_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ func TestString(t *testing.T) {
if want := "Hello"; got != want {
t.Errorf("got %#v, want %#v", got, want)
}

obj = js.Global().Call("eval", "123")
got = obj.String()
if want := "123"; got != want {
t.Errorf("got %#v, want %#v", got, want)
}
}

func TestInt64(t *testing.T) {
Expand Down