compiler: implement assignment to a variable index

Fixes #564.
This commit is contained in:
Evgenii Stratonikov 2019-12-19 10:48:06 +03:00
parent 735b937608
commit 891a878af1
2 changed files with 68 additions and 7 deletions

View file

@ -269,15 +269,23 @@ func (c *codegen) Visit(node ast.Node) ast.Visitor {
ast.Walk(c, n.Rhs[i]) ast.Walk(c, n.Rhs[i])
name := t.X.(*ast.Ident).Name name := t.X.(*ast.Ident).Name
c.emitLoadLocal(name) c.emitLoadLocal(name)
// For now storm only supports basic index operations. Hence we switch ind := t.Index.(type) {
// cast this to an *ast.BasicLit (1, 2 , 3) case *ast.BasicLit:
indexStr := t.Index.(*ast.BasicLit).Value indexStr := ind.Value
index, err := strconv.Atoi(indexStr) index, err := strconv.Atoi(indexStr)
if err != nil { if err != nil {
c.prog.Err = fmt.Errorf("failed to convert slice index to integer") c.prog.Err = fmt.Errorf("failed to convert slice index to integer")
return nil
}
c.emitStoreStructField(index)
case *ast.Ident:
c.emitLoadLocal(ind.Name)
emitOpcode(c.prog.BinWriter, opcode.ROT)
emitOpcode(c.prog.BinWriter, opcode.SETITEM)
default:
c.prog.Err = fmt.Errorf("unsupported index expression")
return nil return nil
} }
c.emitStoreStructField(index)
} }
} }
return nil return nil

View file

@ -0,0 +1,53 @@
package vm_test
import (
"math/big"
"testing"
)
var sliceTestCases = []testCase{
{
"constant index",
`
package foo
func Main() int {
a := []int{0,0}
a[1] = 42
return a[1]+0
}
`,
big.NewInt(42),
},
{
"variable index",
`
package foo
func Main() int {
a := []int{0,0}
i := 1
a[i] = 42
return a[1]+0
}
`,
big.NewInt(42),
},
{
"complex test",
`
package foo
func Main() int {
a := []int{1,2,3}
x := a[0]
a[x] = a[x] + 4
a[x] = a[x] + a[2]
return a[1]
}
`,
big.NewInt(9),
},
}
func TestSliceOperations(t *testing.T) {
runTestCases(t, sliceTestCases)
}