Add choose

wuffs_png_decode_filter_1_sub/clang9       905MB/s ± 0%  1339MB/s ± 0%  +48.05%  (p=0.008 n=5+5)
wuffs_png_decode_filter_1_sub/gcc10       1.12GB/s ± 0%  1.85GB/s ± 0%  +64.80%  (p=0.016 n=5+4)
This commit is contained in:
Nigel Tao committed 2021-01-06 23:16:16 +11:00
1 parent 364c396ae8
commit beaf3ef11f
11 files changed
+235 -22

No files matched your search

+35 -2
View File
@@ -309,7 +309,7 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) {
implements := []*a.Node(nil)
if p.peek1() == t.IDImplements {
p.src = p.src[1:]
implements, err = p.parseList(t.IDOpenParen, (*parser).parseQualifiedIdentNode)
implements, err = p.parseList(t.IDOpenParen, (*parser).parseQualifiedIdentAsTypeExprNode)
if err != nil {
return nil, err
}
@@ -340,7 +340,7 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) {
return nil, fmt.Errorf(`parse: unrecognized top level declaration at %s:%d`, p.filename, line)
}
func (p *parser) parseQualifiedIdentNode() (*a.Node, error) {
func (p *parser) parseQualifiedIdentAsTypeExprNode() (*a.Node, error) {
pkg, name, err := p.parseQualifiedIdent()
if err != nil {
return nil, err
@@ -367,6 +367,14 @@ func (p *parser) parseQualifiedIdent() (t.ID, t.ID, error) {
return x, y, nil
}
func (p *parser) parseIdentAsExprNode() (*a.Node, error) {
id, err := p.parseIdent()
if err != nil {
return nil, err
}
return a.NewExpr(0, 0, id, nil, nil, nil, nil).AsNode(), nil
}
func (p *parser) parseIdent() (t.ID, error) {
if len(p.src) == 0 {
return 0, fmt.Errorf(`parse: expected identifier at %s:%d`, p.filename, p.line())
@@ -790,6 +798,31 @@ func (p *parser) parseStatement1() (*a.Node, error) {
n.SetJumpTarget(loop)
return n.AsNode(), nil
case t.IDChoose:
p.src = p.src[1:]
if p.funcEffect.Pure() {
return nil, fmt.Errorf(`parse: choose within pure function at %s:%d`, p.filename, p.line())
}
name, err := p.parseIdent()
if err != nil {
return nil, err
}
if x := p.peek1(); x != t.IDEq {
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:]
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:]
args, err := p.parseList(t.IDCloseBracket, (*parser).parseIdentAsExprNode)
if err != nil {
return nil, err
}
return a.NewChoose(name, args).AsNode(), nil
case t.IDIOBind, t.IDIOLimit:
return p.parseIOBindNode()