github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-25 16:02:43 +03:00
Code Issues Projects Releases Wiki Activity

Rename unSource to toList.

Browse Source
This commit is contained in:
Rob Rix 2015-12-23 23:26:37 -05:00
parent e4225faa20
commit 0bb6462fad
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Source.hs
View File

@ -9,17 +9,17 @@ newtype Source a = Source { getVector :: Vector.Vector a }
makeSource :: [a] -> Source a makeSource :: [a] -> Source a
makeSource = Source . Vector.fromList makeSource = Source . Vector.fromList
unSource :: Source a -> [a] toList :: Source a -> [a]
unSource (Source vector) = Vector.toList vector toList = Vector.toList . getVector
slice :: Range -> Source a -> Source a slice :: Range -> Source a -> Source a
slice range (Source vector) = Source $ Vector.slice (start range) (end range - start range) vector slice range (Source vector) = Source $ Vector.slice (start range) (end range - start range) vector
toString :: Source Char -> String toString :: Source Char -> String
toString = unSource toString = toList
at :: Source a -> Int -> a at :: Source a -> Int -> a
at = (!!) . unSource at = (!!) . toList
null :: Source a -> Bool null :: Source a -> Bool
null (Source vector) = Vector.null vector null (Source vector) = Vector.null vector

6
test/SplitSpec.hs
View File

@ -48,11 +48,11 @@ spec = do
prop "preserves line counts in equal sources" $ prop "preserves line counts in equal sources" $
\ source -> \ source ->
length (splitAnnotatedByLines (source, source) (getTotalRange source, getTotalRange source) (mempty, mempty) (Indexed . fst $ foldl combineIntoLeaves ([], 0) source)) `shouldBe` length (filter (== '\n') $ unSource source) + 1 length (splitAnnotatedByLines (source, source) (getTotalRange source, getTotalRange source) (mempty, mempty) (Indexed . fst $ foldl combineIntoLeaves ([], 0) source)) `shouldBe` length (filter (== '\n') $ toList source) + 1
prop "produces the maximum line count in inequal sources" $ prop "produces the maximum line count in inequal sources" $
\ sourceA sourceB -> \ sourceA sourceB ->
length (splitAnnotatedByLines (sourceA, sourceB) (getTotalRange sourceA, getTotalRange sourceB) (mempty, mempty) (Indexed $ zipWith (leafWithRangesInSources sourceA sourceB) (actualLineRanges (getTotalRange sourceA) sourceA) (actualLineRanges (getTotalRange sourceB) sourceB))) `shouldBe` max (length (filter (== '\n') $ unSource sourceA) + 1) (length (filter (== '\n') $ unSource sourceB) + 1) length (splitAnnotatedByLines (sourceA, sourceB) (getTotalRange sourceA, getTotalRange sourceB) (mempty, mempty) (Indexed $ zipWith (leafWithRangesInSources sourceA sourceB) (actualLineRanges (getTotalRange sourceA) sourceA) (actualLineRanges (getTotalRange sourceB) sourceB))) `shouldBe` max (length (filter (== '\n') $ toList sourceA) + 1) (length (filter (== '\n') $ toList sourceB) + 1)
describe "adjoinRowsBy" $ do describe "adjoinRowsBy" $ do
prop "is identity on top of no rows" $ prop "is identity on top of no rows" $
@ -110,7 +110,7 @@ spec = do
combineIntoLeaves (leaves, start) char = (leaves ++ [ Free $ Annotated (Info (Range start $ start + 1) mempty, Info (Range start $ start + 1) mempty) (Leaf [ char ]) ], start + 1) combineIntoLeaves (leaves, start) char = (leaves ++ [ Free $ Annotated (Info (Range start $ start + 1) mempty, Info (Range start $ start + 1) mempty) (Leaf [ char ]) ], start + 1)
leafWithRangesInSources sourceA sourceB rangeA rangeB = Free $ Annotated (Info rangeA mempty, Info rangeB mempty) (Leaf $ unSource sourceA ++ unSource sourceB) leafWithRangesInSources sourceA sourceB rangeA rangeB = Free $ Annotated (Info rangeA mempty, Info rangeB mempty) (Leaf $ toList sourceA ++ toList sourceB)
openMaybe :: Maybe Bool -> Maybe (Maybe Bool) openMaybe :: Maybe Bool -> Maybe (Maybe Bool)
openMaybe (Just a) = Just (Just a) openMaybe (Just a) = Just (Just a)