From a3fd737dae1be704b5064c10f40c22a5de1462b3 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 4 May 2017 15:43:00 +1000 Subject: [PATCH] Tweak rendering tightness of "(", "+" and "-". --- lang/render/render.go | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/lang/render/render.go b/lang/render/render.go index 36535bdd..31383774 100644 --- a/lang/render/render.go +++ b/lang/render/render.go @@ -81,12 +81,17 @@ func RenderFile(w io.Writer, src []token.Token, m *token.IDMap) (err error) { // Render the lineTokens. numOpens := len(opens) - prevID := token.ID(0) + prevID, prevIsTightRight := token.ID(0), false for _, t := range lineTokens { - if prevID != 0 && !prevID.IsTightRight() && !t.IsTightLeft() { + const ( + flagsUB = token.FlagsUnaryOp | token.FlagsBinaryOp + flagsLIC = token.FlagsLiteral | token.FlagsIdent | token.FlagsClose + ) + + if prevID != 0 && !prevIsTightRight && !t.IsTightLeft() { // The "(" token's tight-left-ness is context dependent. For // "f(x)", the "(" is tight-left. For "a * (b + c)", it is not. - if t.ID != token.IDOpenParen || prevID.IsBinaryOp() { + if t.ID != token.IDOpenParen || prevID.Flags()&flagsLIC == 0 { buf = append(buf, ' ') } } @@ -105,6 +110,15 @@ func RenderFile(w io.Writer, src []token.Token, m *token.IDMap) (err error) { opens = opens[:len(opens)-1] } + prevIsTightRight = t.ID.IsTightRight() + // The "+" and "-" tokens' tight-right-ness is context dependent. + // The unary flavor is tight-right, the binary flavor is not. + if prevID != 0 && t.ID.Flags()&flagsUB == flagsUB { + // Token-based (not ast.Node-based) heuristic for whether the + // operator looks unary instead of binary. + prevIsTightRight = prevID.Flags() & flagsLIC == 0 + } + prevID = t.ID } if numOpens != len(opens) {