Remove token ID/Key distinction, part 2 of N

This commit is contained in:
Nigel Tao committed 2018-04-15 10:58:53 +10:00
1 parent afd7429e9a
commit 7007682182
6 files changed
+67 -61

No files matched your search

+8 -21
View File
@@ -57,28 +57,15 @@ func (g *gen) writeExpr(b *buffer, n *a.Expr, rp replacementPolicy, pp parenthes
return nil
}
switch n.Operator().Flags() & (t.FlagsUnaryOp | t.FlagsBinaryOp | t.FlagsAssociativeOp) {
case 0:
if err := g.writeExprOther(b, n, rp, pp, depth); err != nil {
return err
}
case t.FlagsUnaryOp:
if err := g.writeExprUnaryOp(b, n, rp, pp, depth); err != nil {
return err
}
case t.FlagsBinaryOp:
if err := g.writeExprBinaryOp(b, n, rp, pp, depth); err != nil {
return err
}
case t.FlagsAssociativeOp:
if err := g.writeExprAssociativeOp(b, n, rp, pp, depth); err != nil {
return err
}
default:
return fmt.Errorf("unrecognized token.Key (0x%X) for writeExpr", n.Operator().Key())
switch op := n.Operator(); {
case op.IsXUnaryOp():
return g.writeExprUnaryOp(b, n, rp, pp, depth)
case op.IsXBinaryOp():
return g.writeExprBinaryOp(b, n, rp, pp, depth)
case op.IsXAssociativeOp():
return g.writeExprAssociativeOp(b, n, rp, pp, depth)
}
return nil
return g.writeExprOther(b, n, rp, pp, depth)
}
func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp parenthesesPolicy, depth uint32) error {