TrueCloudLab/neoneo-go
7
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

vm: add Value() method to Element

Browse source 
It gives access to the internal value's Value() which is essential for interop
functions that need to get something from InteropItems. And it also simplifies
some already existing code along the way.
This commit is contained in:
Roman Khimov 2019-10-03 16:12:24 +03:00
parent 0c963875af
commit d62a367900
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/vm/interop.go
View file

@ -10,13 +10,13 @@ type InteropFunc func(vm *VM) error
// runtimeLog will handle the syscall "Neo.Runtime.Log" for printing and logging stuff. // runtimeLog will handle the syscall "Neo.Runtime.Log" for printing and logging stuff.
func runtimeLog(vm *VM) error { func runtimeLog(vm *VM) error {
item := vm.Estack().Pop() item := vm.Estack().Pop()
fmt.Printf("NEO-GO-VM (log) > %s\n", item.value.Value()) fmt.Printf("NEO-GO-VM (log) > %s\n", item.Value())
return nil return nil
} }
// runtimeNotify will handle the syscall "Neo.Runtime.Notify" for printing and logging stuff. // runtimeNotify will handle the syscall "Neo.Runtime.Notify" for printing and logging stuff.
func runtimeNotify(vm *VM) error { func runtimeNotify(vm *VM) error {
item := vm.Estack().Pop() item := vm.Estack().Pop()
fmt.Printf("NEO-GO-VM (notify) > %s\n", item.value.Value()) fmt.Printf("NEO-GO-VM (notify) > %s\n", item.Value())
return nil return nil
} }

5
pkg/vm/stack.go
View file

@ -58,6 +58,11 @@ func (e *Element) Prev() *Element {
return nil return nil
} }
// Value returns value of the StackItem contained in the element.
func (e *Element) Value() interface{} {
return e.value.Value()
}
// BigInt attempts to get the underlying value of the element as a big integer. // BigInt attempts to get the underlying value of the element as a big integer.
// Will panic if the assertion failed which will be caught by the VM. // Will panic if the assertion failed which will be caught by the VM.
func (e *Element) BigInt() *big.Int { func (e *Element) BigInt() *big.Int {

4
pkg/vm/vm.go
View file

@ -181,7 +181,7 @@ func (v *VM) Context() *Context {
if v.istack.Len() == 0 { if v.istack.Len() == 0 {
return nil return nil
} }
return v.istack.Peek(0).value.Value().(*Context) return v.istack.Peek(0).Value().(*Context)
} }
// PopResult is used to pop the first item of the evaluation stack. This allows // PopResult is used to pop the first item of the evaluation stack. This allows
@ -827,7 +827,7 @@ func (v *VM) execute(ctx *Context, op Instruction) {
elem := v.estack.Pop() elem := v.estack.Pop()
// Cause there is no native (byte) item type here, hence we need to check // Cause there is no native (byte) item type here, hence we need to check
// the type of the item for array size operations. // the type of the item for array size operations.
switch t := elem.value.Value().(type) { switch t := elem.Value().(type) {
case []StackItem: case []StackItem:
v.estack.PushVal(len(t)) v.estack.PushVal(len(t))
case map[interface{}]StackItem: case map[interface{}]StackItem: