hexagoxel
/
brittany
1
0
Fork 0
Code Issues 117 Pull Requests 5 Packages Projects Releases 5 Wiki Activity

Add whitespace around operator in section, Fixes #67

pull/75/head
Lennart Spitzner 2017-11-28 17:56:28 +01:00
parent fdd2f5f6dc
commit 6a97379b33
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src-literatetests/10-tests.blt
View File

@ -461,17 +461,16 @@ func = lakjsdlajsdljasdlkjasldjasldjasldjalsdjlaskjd lakjsdlajsdljas
### ###
#test left #test left
func = (1+) func = (1 +)
#test right #test right
func = (+1) func = (+ 1)
#test left inf #test left inf
## TODO: this could be improved.. func = (1 `abc`)
func = (1`abc`)
#test right inf #test right inf
func = (`abc`1) func = (`abc` 1)
### ###
#group tuples #group tuples

10
src-literatetests/15-regressions.blt
View File

@ -324,17 +324,17 @@ func = fooooooooooooooooooooooooooooooooo + foooooooooooooooooooooooooooooooo
parserPrim = parserPrim =
[ r [ r
| r <- | r <-
[ SGPPrimFloat $ bool id (0-) minus $ readGnok "parserPrim" [ SGPPrimFloat $ bool id (0 -) minus $ readGnok "parserPrim"
(d1 ++ d2 ++ d3 ++ d4) (d1 ++ d2 ++ d3 ++ d4)
| d2 <- string "." | d2 <- string "."
, d3 <- many1 (oneOf "0123456789") , d3 <- many1 (oneOf "0123456789")
, _ <- string "f" , _ <- string "f"
] ]
<|> [ SGPPrimFloat $ bool id (0-) minus $ fromIntegral <|> [ SGPPrimFloat $ bool id (0 -) minus $ fromIntegral
(readGnok "parserPrim" d1 :: Integer) (readGnok "parserPrim" d1 :: Integer)
| _ <- string "f" | _ <- string "f"
] ]
<|> [ SGPPrimInt $ bool id (0-) minus $ fromIntegral <|> [ SGPPrimInt $ bool id (0 -) minus $ fromIntegral
(readGnok "parserPrim" d1 :: Integer) (readGnok "parserPrim" d1 :: Integer)
| _ <- string "i" | _ <- string "i"
] ]
@ -486,3 +486,7 @@ func
-> Proxy (str :: [*]) -> Proxy (str :: [*])
-> m (Tagged str String) -> m (Tagged str String)
#test issue 67
fmapuv :: U.Unbox a => (a -> b) -> U.Vector a -> V.Vector b
fmapuv f xs = G.generate (G.length xs) (f . (xs G.!))

4
src/Language/Haskell/Brittany/Internal/Layouters/Expr.hs
View File

@ -321,11 +321,11 @@ layoutExpr lexpr@(L _ expr) = docWrapNode lexpr $ case expr of
SectionL left op -> do -- TODO: add to testsuite SectionL left op -> do -- TODO: add to testsuite
leftDoc <- docSharedWrapper layoutExpr left leftDoc <- docSharedWrapper layoutExpr left
opDoc <- docSharedWrapper layoutExpr op opDoc <- docSharedWrapper layoutExpr op
docSeq [leftDoc, opDoc] docSeq [leftDoc, docSeparator, opDoc]
SectionR op right -> do -- TODO: add to testsuite SectionR op right -> do -- TODO: add to testsuite
opDoc <- docSharedWrapper layoutExpr op opDoc <- docSharedWrapper layoutExpr op
rightDoc <- docSharedWrapper layoutExpr right rightDoc <- docSharedWrapper layoutExpr right
docSeq [opDoc, rightDoc] docSeq [opDoc, docSeparator, rightDoc]
ExplicitTuple args boxity ExplicitTuple args boxity
| Just argExprs <- args `forM` (\case (L _ (Present e)) -> Just e; _ -> Nothing) -> do | Just argExprs <- args `forM` (\case (L _ (Present e)) -> Just e; _ -> Nothing) -> do
argDocs <- docSharedWrapper layoutExpr `mapM` argExprs argDocs <- docSharedWrapper layoutExpr `mapM` argExprs