emit: allow to emit nested arrays

This commit is contained in:
Evgenii Stratonikov 2020-11-24 11:08:52 +03:00
parent c849176be7
commit 4de233b339
2 changed files with 7 additions and 1 deletions

View file

@ -70,6 +70,8 @@ func Int(w *io.BinWriter, i int64) {
func Array(w *io.BinWriter, es ...interface{}) { func Array(w *io.BinWriter, es ...interface{}) {
for i := len(es) - 1; i >= 0; i-- { for i := len(es) - 1; i >= 0; i-- {
switch e := es[i].(type) { switch e := es[i].(type) {
case []interface{}:
Array(w, e...)
case int64: case int64:
Int(w, e) Int(w, e)
case string: case string:

View file

@ -143,7 +143,7 @@ func TestBytes(t *testing.T) {
func TestEmitArray(t *testing.T) { func TestEmitArray(t *testing.T) {
t.Run("good", func(t *testing.T) { t.Run("good", func(t *testing.T) {
buf := io.NewBufBinWriter() buf := io.NewBufBinWriter()
Array(buf.BinWriter, nil, int64(1), "str", true, []byte{0xCA, 0xFE}) Array(buf.BinWriter, []interface{}{int64(1), int64(2)}, nil, int64(1), "str", true, []byte{0xCA, 0xFE})
require.NoError(t, buf.Err) require.NoError(t, buf.Err)
res := buf.Bytes() res := buf.Bytes()
@ -156,6 +156,10 @@ func TestEmitArray(t *testing.T) {
assert.EqualValues(t, []byte("str"), res[7:10]) assert.EqualValues(t, []byte("str"), res[7:10])
assert.EqualValues(t, opcode.PUSH1, res[10]) assert.EqualValues(t, opcode.PUSH1, res[10])
assert.EqualValues(t, opcode.PUSHNULL, res[11]) assert.EqualValues(t, opcode.PUSHNULL, res[11])
assert.EqualValues(t, opcode.PUSH2, res[12])
assert.EqualValues(t, opcode.PUSH1, res[13])
assert.EqualValues(t, opcode.PUSH2, res[14])
assert.EqualValues(t, opcode.PACK, res[15])
}) })
t.Run("empty", func(t *testing.T) { t.Run("empty", func(t *testing.T) {