From d141d68c1b613e8b327cfcbef07154c9118b622a Mon Sep 17 00:00:00 2001 From: Julien Dessaux Date: Wed, 6 Oct 2021 18:35:21 +0200 Subject: simplified some code --- pkg/pointer/exec.go | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/pkg/pointer/exec.go b/pkg/pointer/exec.go index aae7a81..e2c55e3 100644 --- a/pkg/pointer/exec.go +++ b/pkg/pointer/exec.go @@ -84,13 +84,11 @@ func (p *Pointer) eval(c int, f *field.Field) (done bool, returnValue *int) { } } case '!': - v := p.ss.head.Pop() - if v == 0 { - v = 1 + if p.ss.head.Pop() == 0 { + p.ss.head.Push(1) } else { - v = 0 + p.ss.head.Push(0) } - p.ss.head.Push(v) case '`': b, a := p.ss.head.Pop(), p.ss.head.Pop() if a > b { @@ -100,12 +98,12 @@ func (p *Pointer) eval(c int, f *field.Field) (done bool, returnValue *int) { } p.ss.head.Push(a) case '_': - v := p.ss.head.Pop() - if v == 0 { - p.Redirect('>') + if p.ss.head.Pop() == 0 { + p.dx = 1 } else { - p.Redirect('<') + p.dx = -1 } + p.dy = 0 case '|': v := p.ss.head.Pop() if v == 0 { @@ -133,16 +131,16 @@ func (p *Pointer) eval(c int, f *field.Field) (done bool, returnValue *int) { b, a := p.ss.head.Pop(), p.ss.head.Pop() if b == 0 { p.ss.head.Push(0) - return + } else { + p.ss.head.Push(a / b) } - p.ss.head.Push(a / b) case '%': b, a := p.ss.head.Pop(), p.ss.head.Pop() if b == 0 { p.ss.head.Push(0) - return + } else { + p.ss.head.Push(a % b) } - p.ss.head.Push(a % b) case '"': p.stringMode = true case '\'': -- cgit v1.2.3