From 8ee56a7911bc5f0dea11f5f19870f8cb15384319 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 21 Oct 2017 14:33:29 +1100 Subject: [PATCH] Tweak puffsfmt'ing "iterate.8 (etc)". --- lang/render/render.go | 7 ++++--- std/flate/decode_zlib.puffs | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lang/render/render.go b/lang/render/render.go index 12f97db0..bc9a3e3f 100644 --- a/lang/render/render.go +++ b/lang/render/render.go @@ -108,14 +108,15 @@ func Render(w io.Writer, tm *token.Map, src []token.Token, comments []string) (e prevID, prevIsTightRight := token.ID(0), false for _, t := range lineTokens { const ( + flagsCIL = token.FlagsClose | token.FlagsIdent | token.FlagsLiteral + flagsCIS = token.FlagsClose | token.FlagsIdent | token.FlagsStrLiteral 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.Key() != token.KeyOpenParen || prevID.Flags()&flagsLIC == 0 { + if t.ID.Key() != token.KeyOpenParen || prevID.Flags()&flagsCIS == 0 { buf = append(buf, ' ') } } @@ -140,7 +141,7 @@ func Render(w io.Writer, tm *token.Map, src []token.Token, comments []string) (e 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 + prevIsTightRight = prevID.Flags()&flagsCIL == 0 } prevID = t.ID diff --git a/std/flate/decode_zlib.puffs b/std/flate/decode_zlib.puffs index 4e4c91f0..1ca4d180 100644 --- a/std/flate/decode_zlib.puffs +++ b/std/flate/decode_zlib.puffs @@ -72,7 +72,7 @@ pri func adler32.update(x[] u8)(checksum u32) { in.x = in.x[:5552] } - iterate.8(p ptr u8:in.x) { + iterate.8 (p ptr u8:in.x) { s1 ~+= deref p as u32 s2 ~+= s1 }