unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-09-25 01:08:30 +03:00
Code Issues Projects Releases Wiki Activity

fix parenthesization bug in prettyprinters

Browse Source
This commit is contained in:
Paul Chiusano 2015-12-01 23:19:24 -05:00
parent 3b059cd97a
commit 67264e748a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
shared/src/Unison/Views.hs
View File

@ -5,7 +5,6 @@
module Unison.Views where
import Data.List
import Data.Maybe
import Data.Map (Map)
import Data.Text (Text)
import Unison.Doc (Doc)
@ -94,12 +93,13 @@ term ref t = go no View.low t where
Symbol.Symbol _ name view = op fn
(taken, remaining) = splitAt (View.arity view) args
fmt (child,path) = (\p -> go (fn ==) p child, path)
applied = fromMaybe unsaturated (View.instantiate view fnP name (map fmt taken))
applied = maybe unsaturated (D.parenthesize (p > View.precedence view)) $
View.instantiate view fnP name (map fmt taken)
unsaturated = D.sub' fnP $ go no View.high fn
in
(if inChain fn then id else D.group) $ case remaining of
[] -> applied
args -> D.parenthesize (p > View.high) . D.group . D.docs $
args -> D.group . D.docs $
[ applied, D.breakable " "
, D.nest " " . D.group . D.delimit (D.breakable " ") $
[ D.sub' p (go no (View.increase View.high) s) | (s,p) <- args ] ]
@ -140,12 +140,13 @@ type' ref t = go no View.low t
Symbol _ name view = op fn
(taken, remaining) = splitAt (View.arity view) args
fmt (child,path) = (\p -> D.sub' path (go (fn ==) p child), path)
applied = fromMaybe unsaturated (View.instantiate view fnP name (map fmt taken))
applied = maybe unsaturated (D.parenthesize (p > View.precedence view))
(View.instantiate view fnP name (map fmt taken))
unsaturated = D.sub' fnP $ go no View.high fn
in
(if inChain fn then id else D.group) $ case remaining of
[] -> applied
args -> D.parenthesize (p > View.high) . D.group . D.docs $
args -> D.group . D.docs $
[ applied, D.breakable " "
, D.nest " " . D.group . D.delimit (D.breakable " ") $
[ D.sub' p (go no (View.increase View.high) s) | (s,p) <- args ] ]