summaryrefslogtreecommitdiff
path: root/src/Hakyll/Core
diff options
context:
space:
mode:
Diffstat (limited to 'src/Hakyll/Core')
-rw-r--r--src/Hakyll/Core/CompiledItem.hs2
-rw-r--r--src/Hakyll/Core/DirectedGraph/DependencySolver.hs5
-rw-r--r--src/Hakyll/Core/DirectedGraph/Internal.hs5
3 files changed, 9 insertions, 3 deletions
diff --git a/src/Hakyll/Core/CompiledItem.hs b/src/Hakyll/Core/CompiledItem.hs
index d12d172..a803971 100644
--- a/src/Hakyll/Core/CompiledItem.hs
+++ b/src/Hakyll/Core/CompiledItem.hs
@@ -36,4 +36,4 @@ unCompiledItem :: (Binary a, Typeable a, Writable a)
-> a
unCompiledItem (CompiledItem x) = case cast x of
Just x' -> x'
- Nothing -> error "unCompiledItem: Unsupported type"
+ Nothing -> error "Hakyll.Core.CompiledItem.unCompiledItem: Unsupported type"
diff --git a/src/Hakyll/Core/DirectedGraph/DependencySolver.hs b/src/Hakyll/Core/DirectedGraph/DependencySolver.hs
index 17a4b69..214211b 100644
--- a/src/Hakyll/Core/DirectedGraph/DependencySolver.hs
+++ b/src/Hakyll/Core/DirectedGraph/DependencySolver.hs
@@ -60,8 +60,11 @@ order temp stack set graph@(DirectedGraph graph')
-- one first...
(dep : _) -> if (nodeTag dep) `S.member` set
-- The dependency is already in our stack - cycle detected!
- then error "order: Cycle detected!" -- TODO: Dump cycle
+ then cycleError
-- Continue with the dependency
else order temp (dep : node : stackTail)
(S.insert (nodeTag dep) set)
graph
+ where
+ cycleError = error $ "Hakyll.Core.DirectedGraph.DependencySolver.order: "
+ ++ "Cycle detected!" -- TODO: Dump cycle
diff --git a/src/Hakyll/Core/DirectedGraph/Internal.hs b/src/Hakyll/Core/DirectedGraph/Internal.hs
index 52a712d..bc9cd92 100644
--- a/src/Hakyll/Core/DirectedGraph/Internal.hs
+++ b/src/Hakyll/Core/DirectedGraph/Internal.hs
@@ -24,8 +24,11 @@ data Node a = Node
--
appendNodes :: Ord a => Node a -> Node a -> Node a
appendNodes (Node t1 n1) (Node t2 n2)
- | t1 /= t2 = error "appendNodes: Appending differently tagged nodes"
+ | t1 /= t2 = error'
| otherwise = Node t1 (n1 `S.union` n2)
+ where
+ error' = error $ "Hakyll.Core.DirectedGraph.Internal.appendNodes: "
+ ++ "Appending differently tagged nodes"
-- | Type used to represent a directed graph
--