todos 0.5 → 0.5.1

raw patch · 17 files changed

+34/−59 lines, 17 filesdep +base-unicode-symbols

Dependencies added: base-unicode-symbols

Files

Todos.hs +3/−2
Todos/CommandParser.hs +2/−1
Todos/Config.hs +1/−1
Todos/Dates.hs +1/−1
Todos/Default/CmdLine.hs +2/−2
Todos/Default/Instances.hs +2/−1
Todos/Default/Print.hs +1/−1
Todos/Dot/Render.hs +1/−1
Todos/Formatters.hs +1/−1
Todos/Loader.hs +4/−4
Todos/Main.hs +1/−1
Todos/Parser.hs +4/−4
Todos/ReadConfig.hs +2/−2
Todos/Tree.hs +5/−5
Todos/Types.hs +2/−1
Todos/Unicode.hs +0/−27
todos.cabal +2/−4

Todos.hs view

@@ -1,10 +1,11 @@ module Todos -  (module Todos.Unicode,+  (module Prelude.Unicode,    module Todos.Types,    module Todos.Main,    getCurrentDateTime) where -import Todos.Unicode+import Prelude.Unicode+ import Todos.Types import Todos.Dates (getCurrentDateTime) import Todos.Main

Todos/CommandParser.hs view

@@ -2,7 +2,8 @@  module Todos.CommandParser where -import Todos.Unicode+import Prelude.Unicode+ import Todos.Types  -- | Format item info

Todos/Config.hs view

@@ -2,9 +2,9 @@  module Todos.Config where +import Prelude.Unicode import Control.Monad.Reader -import Todos.Unicode import Todos.Types import Todos.Dot import qualified System.Console.ANSI as ANSI

Todos/Dates.hs view

@@ -5,6 +5,7 @@    pSpecDates)   where +import Prelude.Unicode import Data.Char (toUpper) import Data.List import Data.Time.Calendar@@ -12,7 +13,6 @@ import Text.ParserCombinators.Parsec  import Todos.Types-import Todos.Unicode  getCurrentDateTime ∷  IO DateTime getCurrentDateTime = do

Todos/Default/CmdLine.hs view

@@ -11,13 +11,13 @@   where  import Prelude hiding (putStrLn,readFile,getContents,print)-import Todos.IO+import Prelude.Unicode import System.Console.GetOpt import System.FilePath.Glob import Data.Maybe import Data.List (sort) -import Todos.Unicode+import Todos.IO import Todos.Types import Todos.Tree import Todos.Default.Config

Todos/Default/Instances.hs view

@@ -2,7 +2,8 @@ -- | This module contains instances of RuntimeConfig class for DefaultConfig and PrintConfig module Todos.Default.Instances where -import Todos.Unicode+import Prelude.Unicode+ import Todos.Config import Todos.Default.Config import Todos.Default.CmdLine

Todos/Default/Print.hs view

@@ -5,6 +5,7 @@   (defaultPrintTodos, showTodos)   where +import Prelude.Unicode import Control.Monad import Control.Monad.Reader import Data.List@@ -12,7 +13,6 @@ import Data.Function (on) import System.Console.ANSI -import Todos.Unicode import Todos.Types import Todos.Default.Config import Todos.Default.Instances ()

Todos/Dot/Render.hs view

@@ -4,11 +4,11 @@   (showAsDot)   where +import Prelude.Unicode import Data.List import Data.Tree import Text.Printf -import Todos.Unicode import Todos.Types import Todos.Dot.Color import Todos.Dot.Shapes

Todos/Formatters.hs view

@@ -8,11 +8,11 @@    ConfigAdd (..)   ) where +import Prelude.Unicode import Control.Monad import Control.Monad.Reader import System.Console.ANSI -import Todos.Unicode import Todos.Types import Todos.Config -- import Todos.Default.ConfigInstances ()

Todos/Loader.hs view

@@ -5,7 +5,7 @@   where  import Prelude hiding (putStrLn,readFile,getContents,print)-import Todos.IO+import Prelude.Unicode import Control.Monad (forM) import qualified Data.Map as M import System.FilePath@@ -13,13 +13,13 @@ import Data.Tree import Data.List (nub, sort) -import Todos.Unicode+import Todos.IO import Todos.Types import Todos.Config import Todos.Parser  todoName ∷ Todo → String-todoName todo = itemName ⋄ rootLabel todo+todoName todo = itemName $ rootLabel todo  getDepends ∷ TodoMap → TodoItem → [Todo] getDepends m item = catMaybes [M.lookup name m | name ← depends item] @@ -84,7 +84,7 @@ mkTodo' ∷ [TodoItem] → Todo mkTodo' [] = error "Internal error: mkTodo' does not sense for empty list!" mkTodo' (x:xs) = Node x other-    where other = mkTodo ⋄ map (~-lvl) xs+    where other = mkTodo $ map (~-lvl) xs           lvl = itemLevel (head xs)            consTodoMap ∷ [Todo] → TodoMap

Todos/Main.hs view

@@ -8,6 +8,7 @@   ) where  import Prelude hiding (putStrLn,readFile,getContents,print)+import Prelude.Unicode import IO import Data.Tree import System.Exit@@ -16,7 +17,6 @@ import Config.Dyre  import Todos.Types-import Todos.Unicode import Todos.Dates import Todos.Dot import Todos.Tree

Todos/Parser.hs view

@@ -4,12 +4,12 @@     where  import Prelude hiding (putStrLn,readFile,getContents,print)+import Prelude.Unicode import Data.List import Text.ParserCombinators.Parsec import Data.Char import Text.Regex.PCRE -import Todos.Unicode import Todos.Types import Todos.Dates import Todos.Config@@ -35,7 +35,7 @@ pDeps ∷ TParser [String] pDeps = do     string "("-    ws ← (many1 ⋄ noneOf ",)\n\r") `sepBy` (char ',')+    ws ← (many1 $ noneOf ",)\n\r") `sepBy` (char ',')     string ")"     return $ map strip ws @@ -76,8 +76,8 @@     pSpaces     descr ← many (noneOf "\n\r")     pSpaces-    many ⋄ oneOf "\n\r"-    return ⋄ Item {+    many $ oneOf "\n\r"+    return $ Item {         itemLevel = fromIntegral $ length s,         itemPrefix = pr,         itemName = unwords namew,

Todos/ReadConfig.hs view

@@ -6,13 +6,13 @@   where  import Prelude hiding (putStrLn,readFile,getContents,print)-import Todos.IO+import Prelude.Unicode import System.Environment import System.FilePath  import System.Directory (doesFileExist, getCurrentDirectory) import Text.ParserCombinators.Parsec -import Todos.Unicode+import Todos.IO  word ∷ Parser String word = choice $ map try [quotedOption, simpleOption, quoted, simpleWord]

Todos/Tree.hs view

@@ -11,6 +11,7 @@   where  import Prelude hiding (putStrLn,readFile,getContents,print)+import Prelude.Unicode import Control.Monad import Control.Monad.State import qualified Data.Traversable as T@@ -23,12 +24,11 @@ import System.Cmd (system)  import Todos.Types-import Todos.Unicode import Todos.Config import Todos.CommandParser  mapTags ∷  ([String] → [String]) → [Todo] → [Todo]-mapTags f = map ⋄ everywhere (mkT changeTags :: Data a => a -> a)+mapTags f = map $ everywhere (mkT changeTags :: Data a => a -> a)   where     changeTags ∷ TodoItem → TodoItem     changeTags item@(Item {itemTags=ts}) = item {itemTags = f ts}@@ -48,9 +48,9 @@ pruneSelector' ∷ ℤ → ℤ → (TodoItem → 𝔹) → (Todo → [Todo]) pruneSelector' n m pred = select n 0 False     where-        select k t b (Node item trees) | t < m       = [Node item ⋄ concatMap (select (n-1) (t+1) True) trees]-                                       | pred item   = [Node item ⋄ concatMap (select (n-1) (t+1) True) trees]-                                       | (k > 0) ∧ b = [Node item ⋄ concatMap (select (k-1) (t+1) True) trees]+        select k t b (Node item trees) | t < m       = [Node item $ concatMap (select (n-1) (t+1) True) trees]+                                       | pred item   = [Node item $ concatMap (select (n-1) (t+1) True) trees]+                                       | (k > 0) ∧ b = [Node item $ concatMap (select (k-1) (t+1) True) trees]                                        | k > 0       = concatMap (select (k-1) (t+1) False) trees                                        | otherwise   = []

Todos/Types.hs view

@@ -3,6 +3,7 @@ module Todos.Types where  import Prelude hiding (putStr, putStrLn,readFile,getContents,print)+import Prelude.Unicode import Data.Hash  import Data.Function @@ -15,7 +16,7 @@ import Text.ParserCombinators.Parsec import Numeric -import Todos.Unicode+type 𝔹 = Bool  -- | Kind of date data DateType = StartDate

− Todos/Unicode.hs

@@ -1,27 +0,0 @@-{-# LANGUAGE UnicodeSyntax #-}-module Todos.Unicode where--type ℝ = Float-type ℤ = Integer-type 𝔹 = Bool---- | Concatenate lists -(⧺) ∷ [a] → [a] → [a]-(⧺) = (++)--(⋄) ∷ (a -> b) -> a -> b-(⋄) = ($)-infixr 0 ⋄--(∘) :: (b -> c) -> (a -> b) -> a -> c-(∘) = (.)--(∨) :: Bool -> Bool -> Bool-(∨) = (||)--(∧) :: Bool -> Bool -> Bool-(∧) = (&&)--(∈) :: (Eq a) => a -> [a] -> Bool-x ∈ lst = elem x lst-

todos.cabal view

@@ -1,5 +1,5 @@ Name:           todos-Version:        0.5+Version:        0.5.1 Cabal-Version:  >= 1.6 License:        BSD3 License-File:   LICENSE@@ -40,12 +40,11 @@                    Todos.Loader                    Todos.Tree                    Todos.Types-                   Todos.Unicode                    Todos.Formatters    Build-Depends:  base >= 3 && <= 5, haskell98, containers, parsec >= 3,                   syb, mtl, ansi-terminal, Glob, time, regex-pcre, directory, filepath,-                  process, data-hash, dyre, utf8-string+                  process, data-hash, dyre, utf8-string, base-unicode-symbols >= 0.2.2.1    if flag(with_curses)     Exposed-Modules: Todos.Default.Curses@@ -77,7 +76,6 @@                  Todos.Loader                  Todos.Tree                  Todos.Types-                 Todos.Unicode                  Todos.Formatters  Source-repository head