From a511e927a181e0eb0fa0b5c25ea14677cedc61fc Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 4 May 2018 09:05:33 +1000 Subject: [PATCH] Factor out a parser.parseIterateNode method --- lang/parse/parse.go | 148 +++++++++++++++++++++++--------------------- 1 file changed, 78 insertions(+), 70 deletions(-) diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 052cbf1c..956895b3 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -622,76 +622,7 @@ func (p *parser) parseStatement1() (*a.Node, error) { return o.Node(), err case t.IDIterate: - p.src = p.src[1:] - label, err := p.parseLabel() - if err != nil { - return nil, err - } - - if x := p.peek1(); x != t.IDOpenBracket { - got := p.tm.ByID(x) - return nil, fmt.Errorf(`parse: expected "[", got %q at %s:%d`, got, p.filename, p.line()) - } - p.src = p.src[1:] - - unroll := p.peek1() - if unroll.SmallPowerOf2Value() == 0 { - return nil, fmt.Errorf(`parse: expected power-of-2 unroll count in [1..256], got %q at %s:%d`, - p.tm.ByID(unroll), p.filename, p.line()) - } - p.src = p.src[1:] - - if x := p.peek1(); x != t.IDComma { - got := p.tm.ByID(x) - return nil, fmt.Errorf(`parse: expected ",", got %q at %s:%d`, got, p.filename, p.line()) - } - p.src = p.src[1:] - - step := p.peek1() - if step.SmallPowerOf2Value() == 0 { - return nil, fmt.Errorf(`parse: expected power-of-2 step count in [1..256], got %q at %s:%d`, - p.tm.ByID(step), p.filename, p.line()) - } - p.src = p.src[1:] - - if x := p.peek1(); x != t.IDCloseBracket { - got := p.tm.ByID(x) - return nil, fmt.Errorf(`parse: expected "]", got %q at %s:%d`, got, p.filename, p.line()) - } - p.src = p.src[1:] - - vars, err := p.parseList(t.IDCloseParen, (*parser).parseIterateVarNode) - if err != nil { - return nil, err - } - asserts, err := p.parseAsserts() - if err != nil { - return nil, err - } - body, err := p.parseBlock() - if err != nil { - return nil, err - } - - tail := ([]*a.Node)(nil) - if step == t.ID1 { - if x := p.peek1(); x == t.IDElse { - got := p.tm.ByID(x) - return nil, fmt.Errorf(`parse: expected non-"else", got %q at %s:%d`, got, p.filename, p.line()) - } - } else { - if x := p.peek1(); x != t.IDElse { - got := p.tm.ByID(x) - return nil, fmt.Errorf(`parse: expected "else", got %q at %s:%d`, got, p.filename, p.line()) - } - p.src = p.src[1:] - tail, err = p.parseBlock() - if err != nil { - return nil, err - } - } - - return a.NewIterate(unroll, step, label, vars, asserts, body, tail).Node(), nil + return p.parseIterateNode() case t.IDReturn, t.IDYield: p.src = p.src[1:] @@ -793,6 +724,83 @@ func (p *parser) parseIf() (*a.If, error) { return a.NewIf(condition, elseIf, bodyIfTrue, bodyIfFalse), nil } +func (p *parser) parseIterateNode() (*a.Node, error) { + if x := p.peek1(); x != t.IDIterate { + got := p.tm.ByID(x) + return nil, fmt.Errorf(`parse: expected "if", got %q at %s:%d`, got, p.filename, p.line()) + } + p.src = p.src[1:] + label, err := p.parseLabel() + if err != nil { + return nil, err + } + + if x := p.peek1(); x != t.IDOpenBracket { + got := p.tm.ByID(x) + return nil, fmt.Errorf(`parse: expected "[", got %q at %s:%d`, got, p.filename, p.line()) + } + p.src = p.src[1:] + + unroll := p.peek1() + if unroll.SmallPowerOf2Value() == 0 { + return nil, fmt.Errorf(`parse: expected power-of-2 unroll count in [1..256], got %q at %s:%d`, + p.tm.ByID(unroll), p.filename, p.line()) + } + p.src = p.src[1:] + + if x := p.peek1(); x != t.IDComma { + got := p.tm.ByID(x) + return nil, fmt.Errorf(`parse: expected ",", got %q at %s:%d`, got, p.filename, p.line()) + } + p.src = p.src[1:] + + step := p.peek1() + if step.SmallPowerOf2Value() == 0 { + return nil, fmt.Errorf(`parse: expected power-of-2 step count in [1..256], got %q at %s:%d`, + p.tm.ByID(step), p.filename, p.line()) + } + p.src = p.src[1:] + + if x := p.peek1(); x != t.IDCloseBracket { + got := p.tm.ByID(x) + return nil, fmt.Errorf(`parse: expected "]", got %q at %s:%d`, got, p.filename, p.line()) + } + p.src = p.src[1:] + + vars, err := p.parseList(t.IDCloseParen, (*parser).parseIterateVarNode) + if err != nil { + return nil, err + } + asserts, err := p.parseAsserts() + if err != nil { + return nil, err + } + body, err := p.parseBlock() + if err != nil { + return nil, err + } + + tail := ([]*a.Node)(nil) + if step == t.ID1 { + if x := p.peek1(); x == t.IDElse { + got := p.tm.ByID(x) + return nil, fmt.Errorf(`parse: expected non-"else", got %q at %s:%d`, got, p.filename, p.line()) + } + } else { + if x := p.peek1(); x != t.IDElse { + got := p.tm.ByID(x) + return nil, fmt.Errorf(`parse: expected "else", got %q at %s:%d`, got, p.filename, p.line()) + } + p.src = p.src[1:] + tail, err = p.parseBlock() + if err != nil { + return nil, err + } + } + + return a.NewIterate(unroll, step, label, vars, asserts, body, tail).Node(), nil +} + func (p *parser) parseArgNode() (*a.Node, error) { name, err := p.parseIdent() if err != nil {