git.iko.soy/vty
on master help sign in
spelling cleanup: effected -> affected
commit0e1fc0e916ff940d93586335c53e92e5442db4fc authorJonathan Daugherty <cygnus@foobox.com> dateWed 28 Nov 2018, 11:39 (8 years ago) parent222f2bd
5 files changed+22−22
compare with master
unifiedsplit
src/Graphics/Vty/Debug.hs+6−6 src/Graphics/Vty/PictureToSpans.hs+2−2 src/Graphics/Vty/Span.hs+5−5 test/Verify/Graphics/Vty/Span.hs+1−1 test/VerifySimpleSpanGeneration.hs+8−8
src/Graphics/Vty/Debug.hs+6−6
@@ -12,16 +12,16 @@ import Graphics.Vty.Span
1212
1313import qualified Data.Vector as Vector
1414
15−rowOpsEffectedColumns :: DisplayOps -> [Int]
16−rowOpsEffectedColumns ops
17− = Vector.toList $ Vector.map spanOpsEffectedColumns ops
15+rowOpsAffectedColumns :: DisplayOps -> [Int]
16+rowOpsAffectedColumns ops
17+ = Vector.toList $ Vector.map spanOpsAffectedColumns ops
1818
1919allSpansHaveWidth :: DisplayOps -> Int -> Bool
2020allSpansHaveWidth ops expected
21− = all (== expected) $ Vector.toList $ Vector.map spanOpsEffectedColumns ops
21+ = all (== expected) $ Vector.toList $ Vector.map spanOpsAffectedColumns ops
2222
23−spanOpsEffectedRows :: DisplayOps -> Int
24−spanOpsEffectedRows ops
23+spanOpsAffectedRows :: DisplayOps -> Int
24+spanOpsAffectedRows ops
2525 = toEnum $ length (filter (not . null . Vector.toList) (Vector.toList ops))
2626
2727type SpanConstructLog = [SpanConstructEvent]
src/Graphics/Vty/PictureToSpans.hs+2−2
@@ -331,7 +331,7 @@ addRowCompletion :: DisplayRegion -> Int -> BlitM s ()
331331addRowCompletion displayRegion row = do
332332 allRowOps <- view mrowOps
333333 rowOps <- lift $ lift $ MVector.read allRowOps row
334− let endX = spanOpsEffectedColumns rowOps
334+ let endX = spanOpsAffectedColumns rowOps
335335 when (endX < regionWidth displayRegion) $ do
336336 let ow = regionWidth displayRegion - endX
337337 snocOp (Skip ow) row
@@ -344,6 +344,6 @@ snocOp !op !row = do
344344 lift $ lift $ do
345345 ops <- MVector.read theMrowOps row
346346 let ops' = Vector.snoc ops op
347− when (spanOpsEffectedColumns ops' > regionWidth theRegion)
347+ when (spanOpsAffectedColumns ops' > regionWidth theRegion)
348348 $ fail $ "row " ++ show row ++ " now exceeds region width"
349349 MVector.write theMrowOps row ops'
src/Graphics/Vty/Span.hs+5−5
@@ -110,12 +110,12 @@ affectedRegion :: DisplayOps -> DisplayRegion
110110affectedRegion ops = (displayOpsColumns ops, displayOpsRows ops)
111111
112112-- | The number of columns a SpanOps affects.
113−spanOpsEffectedColumns :: SpanOps -> Int
114−spanOpsEffectedColumns inOps = Vector.foldl' spanOpsEffectedColumns' 0 inOps
113+spanOpsAffectedColumns :: SpanOps -> Int
114+spanOpsAffectedColumns inOps = Vector.foldl' spanOpsAffectedColumns' 0 inOps
115115 where
116− spanOpsEffectedColumns' t (TextSpan _ w _ _ ) = t + w
117− spanOpsEffectedColumns' t (Skip w) = t + w
118− spanOpsEffectedColumns' t (RowEnd w) = t + w
116+ spanOpsAffectedColumns' t (TextSpan _ w _ _ ) = t + w
117+ spanOpsAffectedColumns' t (Skip w) = t + w
118+ spanOpsAffectedColumns' t (RowEnd w) = t + w
119119
120120-- | The width of a single SpanOp in columns.
121121spanOpHasWidth :: SpanOp -> Maybe (Int, Int)
test/Verify/Graphics/Vty/Span.hs+1−1
@@ -20,7 +20,7 @@ isAttrSpanOp TextSpan {} = True
2020isAttrSpanOp _ = False
2121
2222verifyAllSpansHaveWidth i spans w
23− = let v = map (\s -> (spanOpsEffectedColumns s /= w, s)) (Vector.toList spans)
23+ = let v = map (\s -> (spanOpsAffectedColumns s /= w, s)) (Vector.toList spans)
2424 in case any ((== True) . fst) v of
2525 False -> succeeded
2626 True -> failed { reason = "Not all spans contained operations defining exactly "
test/VerifySimpleSpanGeneration.hs+8−8
@@ -25,7 +25,7 @@ unitImageAndZeroWindow1 :: UnitImage -> EmptyWindow -> Bool
2525unitImageAndZeroWindow1 (UnitImage _ i) (EmptyWindow w) =
2626 let p = picForImage i
2727 ops = displayOpsForPic p (regionForWindow w)
28− in ( spanOpsEffectedRows ops == 0 ) && ( allSpansHaveWidth ops 0 )
28+ in ( spanOpsAffectedRows ops == 0 ) && ( allSpansHaveWidth ops 0 )
2929
3030horizSpanImageAndZeroWindow0 :: SingleRowSingleAttrImage -> EmptyWindow -> Bool
3131horizSpanImageAndZeroWindow0 (SingleRowSingleAttrImage { rowImage = i }) (EmptyWindow w) =
@@ -37,7 +37,7 @@ horizSpanImageAndZeroWindow1 :: SingleRowSingleAttrImage -> EmptyWindow -> Bool
3737horizSpanImageAndZeroWindow1 (SingleRowSingleAttrImage { rowImage = i }) (EmptyWindow w) =
3838 let p = picForImage i
3939 ops = displayOpsForPic p (regionForWindow w)
40− in ( spanOpsEffectedRows ops == 0 ) && ( allSpansHaveWidth ops 0 )
40+ in ( spanOpsAffectedRows ops == 0 ) && ( allSpansHaveWidth ops 0 )
4141
4242horizSpanImageAndEqualWindow0 :: SingleRowSingleAttrImage -> Result
4343horizSpanImageAndEqualWindow0 (SingleRowSingleAttrImage { rowImage = i, expectedColumns = c }) =
@@ -51,7 +51,7 @@ horizSpanImageAndEqualWindow1 (SingleRowSingleAttrImage { rowImage = i, expected
5151 let p = picForImage i
5252 w = MockWindow c 1
5353 ops = displayOpsForPic p (regionForWindow w)
54− in spanOpsEffectedRows ops == 1
54+ in spanOpsAffectedRows ops == 1
5555
5656horizSpanImageAndLesserWindow0 :: SingleRowSingleAttrImage -> Result
5757horizSpanImageAndLesserWindow0 (SingleRowSingleAttrImage { rowImage = i, expectedColumns = c }) =
@@ -74,7 +74,7 @@ singleAttrSingleSpanStackCropped1 stack =
7474 expectedRowCount = stackHeight stack `div` 2
7575 w = MockWindow (stackWidth stack) expectedRowCount
7676 ops = displayOpsForPic p (regionForWindow w)
77− actualRowCount = spanOpsEffectedRows ops
77+ actualRowCount = spanOpsAffectedRows ops
7878 in expectedRowCount == actualRowCount
7979
8080singleAttrSingleSpanStackCropped2 :: SingleAttrSingleSpanStack -> SingleAttrSingleSpanStack -> Result
@@ -90,7 +90,7 @@ singleAttrSingleSpanStackCropped3 stack0 stack1 =
9090 w = MockWindow (imageWidth (picImage p)) expectedRowCount
9191 ops = displayOpsForPic p (regionForWindow w)
9292 expectedRowCount = imageHeight (picImage p) `div` 2
93− actualRowCount = spanOpsEffectedRows ops
93+ actualRowCount = spanOpsAffectedRows ops
9494 in expectedRowCount == actualRowCount
9595
9696singleAttrSingleSpanStackCropped4 :: SingleAttrSingleSpanStack -> SingleAttrSingleSpanStack -> Result
@@ -107,7 +107,7 @@ singleAttrSingleSpanStackCropped5 stack0 stack1 =
107107 w = MockWindow (imageWidth (picImage p)) (stackHeight stack0)
108108 ops = displayOpsForPic p (regionForWindow w)
109109 expectedRowCount = stackHeight stack0
110− actualRowCount = spanOpsEffectedRows ops
110+ actualRowCount = spanOpsAffectedRows ops
111111 in expectedRowCount == actualRowCount
112112
113113horizSpanImageAndGreaterWindow0 :: SingleRowSingleAttrImage -> Result
@@ -123,13 +123,13 @@ arbImageIsCropped :: DefaultImage -> MockWindow -> Bool
123123arbImageIsCropped (DefaultImage image) win@(MockWindow w h) =
124124 let pic = picForImage image
125125 ops = displayOpsForPic pic (regionForWindow win)
126− in ( spanOpsEffectedRows ops == h ) && ( allSpansHaveWidth ops w )
126+ in ( spanOpsAffectedRows ops == h ) && ( allSpansHaveWidth ops w )
127127
128128spanOpsActuallyFillRows :: DefaultPic -> Bool
129129spanOpsActuallyFillRows (DefaultPic pic win) =
130130 let ops = displayOpsForPic pic (regionForWindow win)
131131 expectedRowCount = regionHeight (regionForWindow win)
132− actualRowCount = spanOpsEffectedRows ops
132+ actualRowCount = spanOpsAffectedRows ops
133133 in expectedRowCount == actualRowCount
134134
135135spanOpsActuallyFillColumns :: DefaultPic -> Bool