TrueCloudLab/neo-go
8
0
Fork 0
mirror of https://github.com/nspcc-dev/neo-go.git synced 2024-11-22 19:29:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

compiler: process index expresstions in a generic way

Browse source 
All type errors such as string index in slice will be catched during parse phase.
This commit is contained in:
Evgenii Stratonikov 2020-05-19 15:35:57 +03:00
parent aeaa4a8210
commit 87f6ba34db
1 changed files with 4 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pkg/compiler/codegen.go
View file

@ -10,7 +10,6 @@ import (
"go/types"
"math"
"sort"
"strconv"
"strings"
"github.com/nspcc-dev/neo-go/pkg/encoding/address"
@ -446,23 +445,9 @@ func (c *codegen) Visit(node ast.Node) ast.Visitor {
ast.Walk(c, n.Rhs[i])
name := t.X.(*ast.Ident).Name
c.emitLoadVar(name)
switch ind := t.Index.(type) {
case *ast.BasicLit:
indexStr := ind.Value
index, err := strconv.Atoi(indexStr)
if err != nil {
c.prog.Err = fmt.Errorf("failed to convert slice index to integer")
return nil
}
c.emitStoreStructField(index)
case *ast.Ident:
c.emitLoadVar(ind.Name)
emit.Opcode(c.prog.BinWriter, opcode.ROT)
emit.Opcode(c.prog.BinWriter, opcode.SETITEM)
default:
c.prog.Err = fmt.Errorf("unsupported index expression")
return nil
}
ast.Walk(c, t.Index)
emit.Opcode(c.prog.BinWriter, opcode.ROT)
emit.Opcode(c.prog.BinWriter, opcode.SETITEM)
}
}
return nil
@ -832,14 +817,7 @@ func (c *codegen) Visit(node ast.Node) ast.Visitor {
// Walk the expression, this could be either an Ident or SelectorExpr.
// This will load local whatever X is.
ast.Walk(c, n.X)
switch n.Index.(type) {
case *ast.BasicLit:
c.emitLoadConst(c.typeAndValueOf(n.Index))
default:
ast.Walk(c, n.Index)
}
ast.Walk(c, n.Index)
emit.Opcode(c.prog.BinWriter, opcode.PICKITEM) // just pickitem here
return nil