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

Fix layouting special-case (getSpacing(s) internals)

pull/35/head
Lennart Spitzner 2017-06-04 18:15:22 +02:00
parent 5e3cc0a7c3
commit 6d472315e3
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src-literatetests/tests.blt
View File

@ -881,6 +881,11 @@ parserPrim =
] ]
] ]
#test another-parspacing-testcase
samples = (SV.unpackaaaaadat) <&> \f ->
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
############################################################################### ###############################################################################
############################################################################### ###############################################################################

15
src/Language/Haskell/Brittany/Internal/Transformations/Alt.hs
View File

@ -1,4 +1,5 @@
#define INSERTTRACESALT 0 #define INSERTTRACESALT 0
#define INSERTTRACESALTVISIT 0
#define INSERTTRACESGETSPACING 0 #define INSERTTRACESGETSPACING 0
{-# LANGUAGE TypeOperators #-} {-# LANGUAGE TypeOperators #-}
@ -117,7 +118,7 @@ transformAlts briDoc =
rec :: BriDocNumbered -> Memo.MemoT Int [VerticalSpacing] (MultiRWSS.MultiRWS r w (AltCurPos ': s)) BriDocNumbered rec :: BriDocNumbered -> Memo.MemoT Int [VerticalSpacing] (MultiRWSS.MultiRWS r w (AltCurPos ': s)) BriDocNumbered
rec bdX@(brDcId, brDc) = do rec bdX@(brDcId, brDc) = do
#if INSERTTRACESALT #if INSERTTRACESALTVISIT
do do
acp :: AltCurPos <- mGet acp :: AltCurPos <- mGet
tellDebugMess $ "transformAlts: visiting: " ++ case brDc of tellDebugMess $ "transformAlts: visiting: " ++ case brDc of
@ -219,7 +220,7 @@ transformAlts briDoc =
#if INSERTTRACESALT #if INSERTTRACESALT
zip spacings options `forM_` \(vs, (_, bd)) -> zip spacings options `forM_` \(vs, (_, bd)) ->
tellDebugMess $ " " ++ "spacing=" ++ show vs tellDebugMess $ " " ++ "spacing=" ++ show vs
++ ",hasSpace=" ++ show (hasSpace1 lconf acp vs) ++ ",hasSpace1=" ++ show (hasSpace1 lconf acp vs)
++ ",lineCheck=" ++ show (lineCheck vs) ++ ",lineCheck=" ++ show (lineCheck vs)
++ " " ++ show (toConstr bd) ++ " " ++ show (toConstr bd)
#endif #endif
@ -256,7 +257,7 @@ transformAlts briDoc =
#if INSERTTRACESALT #if INSERTTRACESALT
zip spacings options `forM_` \(vs, (_, bd)) -> zip spacings options `forM_` \(vs, (_, bd)) ->
tellDebugMess $ " " ++ "spacing=" ++ show vs tellDebugMess $ " " ++ "spacing=" ++ show vs
++ ",hasSpace=" ++ show (hasSpace2 lconf acp <$> vs) ++ ",hasSpace2=" ++ show (hasSpace2 lconf acp <$> vs)
++ ",lineCheck=" ++ show (lineCheck <$> vs) ++ ",lineCheck=" ++ show (lineCheck <$> vs)
++ " " ++ show (toConstr bd) ++ " " ++ show (toConstr bd)
tellDebugMess $ " " ++ show (Data.Maybe.mapMaybe (fmap fst) checkedOptions) tellDebugMess $ " " ++ show (Data.Maybe.mapMaybe (fmap fst) checkedOptions)
@ -419,7 +420,7 @@ getSpacing !bridoc = rec bridoc
VerticalSpacingParNone -> 0 VerticalSpacingParNone -> 0
VerticalSpacingParSome i -> i VerticalSpacingParSome i -> i
VerticalSpacingParAlways i -> min colMax i) VerticalSpacingParAlways i -> min colMax i)
, _vs_paragraph = VerticalSpacingParAlways 0 , _vs_paragraph = VerticalSpacingParSome 0
} }
BDFBaseYPop bd -> rec bd BDFBaseYPop bd -> rec bd
BDFIndentLevelPushCur bd -> rec bd BDFIndentLevelPushCur bd -> rec bd
@ -654,7 +655,7 @@ getSpacings limit bridoc = preFilterLimit <$> rec bridoc
VerticalSpacingParAlways i -> min colMax i) VerticalSpacingParAlways i -> min colMax i)
, _vs_paragraph = case _vs_paragraph vs of , _vs_paragraph = case _vs_paragraph vs of
VerticalSpacingParNone -> VerticalSpacingParNone VerticalSpacingParNone -> VerticalSpacingParNone
VerticalSpacingParSome i -> VerticalSpacingParAlways i -- TODO: is this correct? VerticalSpacingParSome i -> VerticalSpacingParSome i
VerticalSpacingParAlways i -> VerticalSpacingParAlways i VerticalSpacingParAlways i -> VerticalSpacingParAlways i
} }
BDFBaseYPop bd -> rec bd BDFBaseYPop bd -> rec bd
@ -766,8 +767,8 @@ getSpacings limit bridoc = preFilterLimit <$> rec bridoc
case brdc of case brdc of
BDFAnnotationPrior{} -> return () BDFAnnotationPrior{} -> return ()
BDFAnnotationRest{} -> return () BDFAnnotationRest{} -> return ()
_ -> mTell $ Seq.fromList ["getSpacing: visiting: " _ -> mTell $ Seq.fromList ["getSpacings: visiting: "
++ show {-(toConstr $ brdc)-} (briDocToDoc $ unwrapBriDocNumbered (0, brdc)) ++ show (toConstr $ brdc) -- (briDocToDoc $ unwrapBriDocNumbered (0, brdc))
, " -> " , " -> "
++ show (take 9 result) ++ show (take 9 result)
] ]