Merge pull request #5 from haskell-works/switch-from-CsPoppy-to-CsPoppy1

Switch from CsPoppy to CsPoppy1
haskell-works · Jul 5, 2019 · d9226c8 · d9226c8
2 parents 0650f61 + 39abd7c
commit d9226c8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/HaskellWorks/Data/Json/Standard/Cursor/Fast.hs b/src/HaskellWorks/Data/Json/Standard/Cursor/Fast.hs
@@ -10,7 +10,7 @@ module HaskellWorks.Data.Json.Standard.Cursor.Fast
 import Foreign.ForeignPtr
 import HaskellWorks.Data.Json.Standard.Cursor.Generic
 import HaskellWorks.Data.Json.Standard.Cursor.Specific
-import HaskellWorks.Data.RankSelect.CsPoppy
+import HaskellWorks.Data.RankSelect.CsPoppy1
 
 import qualified Data.ByteString                                      as BS
 import qualified Data.ByteString.Char8                                as BSC
@@ -24,7 +24,7 @@ data Fast
 instance SpecificCursor Fast where
   type CursorOf Fast = Cursor
 
-type Cursor = GenericCursor BS.ByteString CsPoppy (RM.RangeMin CsPoppy)
+type Cursor = GenericCursor BS.ByteString CsPoppy1 (RM.RangeMin CsPoppy1)
 
 fromByteString :: BS.ByteString -> Cursor
 fromByteString bs = GenericCursor

diff --git a/src/HaskellWorks/Data/Json/Standard/Cursor/Load/Cursor.hs b/src/HaskellWorks/Data/Json/Standard/Cursor/Load/Cursor.hs
@@ -11,7 +11,7 @@ import Data.Word
 import HaskellWorks.Data.BalancedParens.Simple
 import HaskellWorks.Data.Json.Standard.Cursor.Generic
 import HaskellWorks.Data.Json.Standard.Cursor.Load.Raw
-import HaskellWorks.Data.RankSelect.CsPoppy
+import HaskellWorks.Data.RankSelect.CsPoppy1
 
 import qualified Data.ByteString.Internal                    as BSI
 import qualified Data.Vector.Storable                        as DVS
@@ -30,15 +30,15 @@ loadCursorWithIndex filename = do
   let cursor = GenericCursor jsonBS jsonIb (SimpleBalancedParens jsonBp) 1
   return cursor
 
-loadCursorWithCsPoppyIndex :: String -> IO (GenericCursor BSI.ByteString CsPoppy (SimpleBalancedParens (DVS.Vector Word64)))
+loadCursorWithCsPoppyIndex :: String -> IO (GenericCursor BSI.ByteString CsPoppy1 (SimpleBalancedParens (DVS.Vector Word64)))
 loadCursorWithCsPoppyIndex filename = do
   (jsonBS, jsonIb, jsonBp) <- loadRawWithIndex filename
   let cursor = GenericCursor jsonBS (makeCsPoppy jsonIb) (SimpleBalancedParens jsonBp) 1
   return cursor
 
-loadCursorWithCsPoppyIndex2 :: String -> IO (GenericCursor BSI.ByteString CsPoppy (SimpleBalancedParens CsPoppy))
+loadCursorWithCsPoppyIndex2 :: String -> IO (GenericCursor BSI.ByteString CsPoppy1 (SimpleBalancedParens CsPoppy1))
 loadCursorWithCsPoppyIndex2 filename = do
   (jsonBS, jsonIb, jsonBp) <- loadRawWithIndex filename
   let cursor = GenericCursor jsonBS (makeCsPoppy jsonIb) (SimpleBalancedParens (makeCsPoppy jsonBp)) 1
-                :: GenericCursor BSI.ByteString CsPoppy (SimpleBalancedParens CsPoppy)
+                :: GenericCursor BSI.ByteString CsPoppy1 (SimpleBalancedParens CsPoppy1)
   return cursor
diff --git a/test/HaskellWorks/Data/Json/Standard/Cursor/TypeSpec.hs b/test/HaskellWorks/Data/Json/Standard/Cursor/TypeSpec.hs
@@ -38,7 +38,7 @@ ns = TC.nextSibling
 spec :: Spec
 spec = describe "HaskellWorks.Data.Json.Succinct.CursorSpec" $ do
   genSpec "DVS.Vector Word64" SLOW.fromString
-  genSpec "CsPoppy"           FAST.fromString
+  genSpec "CsPoppy1"          FAST.fromString
 
 genSpec :: forall t u.
   ( Eq                t

diff --git a/test/HaskellWorks/Data/Json/Standard/CursorSpec.hs b/test/HaskellWorks/Data/Json/Standard/CursorSpec.hs
@@ -24,4 +24,4 @@ import qualified HaskellWorks.Data.Json.Standard.Cursor.Slow as SLOW
 spec :: Spec
 spec = describe "HaskellWorks.Data.Json.Succinct.CursorSpec" $ do
   genTest "DVS.Vector Word64" SLOW.fromString
-  genTest "CsPoppy"           FAST.fromString
+  genTest "CsPoppy1"          FAST.fromString