e213ef310f
* Fix minor FD leak in journal code. Closes: #754608 * direct: Fix handling of case where a work tree subdirectory cannot be written to due to permissions. * migrate: Avoid re-checksumming when migrating from hashE to hash backend. * uninit: Avoid failing final removal in some direct mode repositories due to file modes. * S3: Deal with AWS ACL configurations that do not allow creating or checking the location of a bucket, but only reading and writing content to it. * resolvemerge: New plumbing command that runs the automatic merge conflict resolver. * Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files. * sync: Fix git sync with local git remotes even when they don't have an annex.uuid set. (The assistant already did so.) * Set gcrypt-publish-participants when setting up a gcrypt repository, to avoid unncessary passphrase prompts. This is a security/usability tradeoff. To avoid exposing the gpg key ids who can decrypt the repository, users can unset gcrypt-publish-participants. * Install nautilus hooks even when ~/.local/share/nautilus/ does not yet exist, since it is not automatically created for Gnome 3 users. * Windows: Move .vbs files out of git\bin, to avoid that being in the PATH, which caused some weird breakage. (Thanks, divB) * Windows: Fix locking issue that prevented the webapp starting (since 5.20140707). # imported from the archive
57 lines
1.5 KiB
Haskell
57 lines
1.5 KiB
Haskell
{- Past and present tense text.
|
|
-
|
|
- Copyright 2012 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- License: BSD-2-clause
|
|
-}
|
|
|
|
{-# LANGUAGE OverloadedStrings #-}
|
|
|
|
module Utility.Tense where
|
|
|
|
import qualified Data.Text as T
|
|
import Data.Text (Text)
|
|
import GHC.Exts( IsString(..) )
|
|
|
|
data Tense = Present | Past
|
|
deriving (Eq)
|
|
|
|
data TenseChunk = Tensed Text Text | UnTensed Text
|
|
deriving (Eq, Ord, Show)
|
|
|
|
newtype TenseText = TenseText [TenseChunk]
|
|
deriving (Eq, Ord)
|
|
|
|
{- Allows OverloadedStrings to be used, to build UnTensed chunks. -}
|
|
instance IsString TenseChunk where
|
|
fromString = UnTensed . T.pack
|
|
|
|
{- Allows OverloadedStrings to be used, to provide UnTensed TenseText. -}
|
|
instance IsString TenseText where
|
|
fromString s = TenseText [fromString s]
|
|
|
|
renderTense :: Tense -> TenseText -> Text
|
|
renderTense tense (TenseText chunks) = T.concat $ map render chunks
|
|
where
|
|
render (Tensed present past)
|
|
| tense == Present = present
|
|
| otherwise = past
|
|
render (UnTensed s) = s
|
|
|
|
{- Builds up a TenseText, separating chunks with spaces.
|
|
-
|
|
- However, rather than just intersperse new chunks for the spaces,
|
|
- the spaces are appended to the end of the chunks.
|
|
-}
|
|
tenseWords :: [TenseChunk] -> TenseText
|
|
tenseWords = TenseText . go []
|
|
where
|
|
go c [] = reverse c
|
|
go c (w:[]) = reverse (w:c)
|
|
go c ((UnTensed w):ws) = go (UnTensed (addspace w) : c) ws
|
|
go c ((Tensed w1 w2):ws) =
|
|
go (Tensed (addspace w1) (addspace w2) : c) ws
|
|
addspace w = T.append w " "
|
|
|
|
unTensed :: Text -> TenseText
|
|
unTensed t = TenseText [UnTensed t]
|