compiler: allow variables in byte-slice literals

This commit is contained in:
Evgenii Stratonikov 2020-09-24 20:20:34 +03:00
parent e4d82f5956
commit 5f3b8c6d51
2 changed files with 24 additions and 2 deletions

View file

@ -1594,13 +1594,24 @@ func (c *codegen) emitConvert(typ stackitem.Type) {
func (c *codegen) convertByteArray(lit *ast.CompositeLit) { func (c *codegen) convertByteArray(lit *ast.CompositeLit) {
buf := make([]byte, len(lit.Elts)) buf := make([]byte, len(lit.Elts))
varIndices := []int{}
for i := 0; i < len(lit.Elts); i++ { for i := 0; i < len(lit.Elts); i++ {
t := c.typeAndValueOf(lit.Elts[i]) t := c.typeAndValueOf(lit.Elts[i])
if t.Value != nil {
val, _ := constant.Int64Val(t.Value) val, _ := constant.Int64Val(t.Value)
buf[i] = byte(val) buf[i] = byte(val)
} else {
varIndices = append(varIndices, i)
}
} }
emit.Bytes(c.prog.BinWriter, buf) emit.Bytes(c.prog.BinWriter, buf)
c.emitConvert(stackitem.BufferT) c.emitConvert(stackitem.BufferT)
for _, i := range varIndices {
emit.Opcode(c.prog.BinWriter, opcode.DUP)
emit.Int(c.prog.BinWriter, int64(i))
ast.Walk(c, lit.Elts[i])
emit.Opcode(c.prog.BinWriter, opcode.SETITEM)
}
} }
func (c *codegen) convertMap(lit *ast.CompositeLit) { func (c *codegen) convertMap(lit *ast.CompositeLit) {

View file

@ -310,6 +310,17 @@ var sliceTestCases = []testCase{
`, `,
big.NewInt(2), big.NewInt(2),
}, },
{
"literal byte-slice with variable values",
`package foo
const sym1 = 's'
func Main() []byte {
sym2 := byte('t')
sym4 := byte('i')
return []byte{sym1, sym2, 'r', sym4, 'n', 'g'}
}`,
[]byte("string"),
},
} }
func TestSliceOperations(t *testing.T) { func TestSliceOperations(t *testing.T) {