Rename parentAbs to parent

This commit is contained in:
Chris Done 2015-05-11 18:29:15 +02:00
parent c0e93d2167
commit ef8503f38f
3 changed files with 12 additions and 12 deletions

View File

@ -1,5 +1,5 @@
name: path
version: 0.1.0
version: 0.2.0
synopsis: Path
description: Path
license: BSD3

View File

@ -27,7 +27,7 @@ module Path
,(</>)
,stripDir
,isParentOf
,parentAbs
,parent
,filename
-- * Conversion
,toFilePath
@ -234,17 +234,17 @@ isParentOf p l =
--
-- The following properties hold:
--
-- @parentAbs (parent \<\/> child) == parent@
-- @parent (parent \<\/> child) == parent@
--
-- On the root, getting the parent is idempotent:
--
-- @parentAbs (parentAbs \"\/\") = \"\/\"@
-- @parent (parent \"\/\") = \"\/\"@
--
parentAbs :: Path Abs t -> Path Abs Dir
parentAbs (Path fp) =
parent :: Path Abs t -> Path Abs Dir
parent (Path fp) =
Path (normalizeDir (FilePath.takeDirectory (FilePath.dropTrailingPathSeparator fp)))
-- | Extract the relative filename from a given location.
-- | Extract the file part of a path.
--
-- The following properties hold:
--

View File

@ -42,14 +42,14 @@ operationFilename =
operationParentAbs :: Spec
operationParentAbs =
do it "parentAbs (parent </> child) == parent"
(parentAbs ($(mkAbsDir "/foo") </>
(parent ($(mkAbsDir "/foo") </>
$(mkRelDir "bar")) ==
$(mkAbsDir "/foo"))
it "parentAbs \"\" == \"\""
(parentAbs $(mkAbsDir "/") ==
it "parent \"\" == \"\""
(parent $(mkAbsDir "/") ==
$(mkAbsDir "/"))
it "parentAbs (parentAbs \"\") == \"\""
(parentAbs (parentAbs $(mkAbsDir "/")) ==
it "parent (parent \"\") == \"\""
(parent (parent $(mkAbsDir "/")) ==
$(mkAbsDir "/"))
-- | The 'isParentOf' operation.