From b126056f04661b4fa8ca8cc272a41abd179ea23e Mon Sep 17 00:00:00 2001
From: Evgenii Stratonikov <evgeniy@nspcc.ru>
Date: Tue, 19 May 2020 18:01:41 +0300
Subject: [PATCH] compiler: use iterators in range loops
It is simpler than having some counters on stack and will help us to
support maps in future.
---
pkg/compiler/codegen.go | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/pkg/compiler/codegen.go b/pkg/compiler/codegen.go
index 6d4178636..68130a89b 100644
--- a/pkg/compiler/codegen.go
+++ b/pkg/compiler/codegen.go
@@ -900,20 +900,18 @@ func (c *codegen) Visit(node ast.Node) ast.Visitor {
c.currentSwitch = label
ast.Walk(c, n.X)
+ emit.Syscall(c.prog.BinWriter, "Neo.Iterator.Create")
- emit.Opcode(c.prog.BinWriter, opcode.SIZE)
- emit.Opcode(c.prog.BinWriter, opcode.PUSH0)
-
- c.pushStackLabel(label, 2)
+ c.pushStackLabel(label, 1)
c.setLabel(start)
- emit.Opcode(c.prog.BinWriter, opcode.OVER)
- emit.Opcode(c.prog.BinWriter, opcode.OVER)
- emit.Opcode(c.prog.BinWriter, opcode.LTE) // finish if len <= i
- emit.Jmp(c.prog.BinWriter, opcode.JMPIFL, end)
+ emit.Opcode(c.prog.BinWriter, opcode.DUP)
+ emit.Syscall(c.prog.BinWriter, "Neo.Enumerator.Next")
+ emit.Jmp(c.prog.BinWriter, opcode.JMPIFNOTL, end)
if n.Key != nil {
emit.Opcode(c.prog.BinWriter, opcode.DUP)
+ emit.Syscall(c.prog.BinWriter, "Neo.Iterator.Key")
c.emitStoreVar(n.Key.(*ast.Ident).Name)
}
@@ -921,7 +919,6 @@ func (c *codegen) Visit(node ast.Node) ast.Visitor {
c.setLabel(post)
- emit.Opcode(c.prog.BinWriter, opcode.INC)
emit.Jmp(c.prog.BinWriter, opcode.JMPL, start)
c.setLabel(end)