summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPéter Diviánszky <divipp@gmail.com>2016-11-29 00:41:04 +0100
committerPéter Diviánszky <divipp@gmail.com>2016-11-29 00:43:21 +0100
commitf1605a5c15776189d5d2c3888760904018e8ba9a (patch)
tree9bec1475eb4ee21f15bb08326c2e7f35d8cd0114
parente46d7ceccc201d9ae8cbc0491025898310382232 (diff)
fix #10 (haddock build failure)
-rw-r--r--lambdacube-compiler.cabal2
-rw-r--r--src/LambdaCube/Compiler/Core.hs2
-rw-r--r--src/LambdaCube/Compiler/DesugaredSource.hs3
3 files changed, 4 insertions, 3 deletions
diff --git a/lambdacube-compiler.cabal b/lambdacube-compiler.cabal
index 630286a5..544d9a70 100644
--- a/lambdacube-compiler.cabal
+++ b/lambdacube-compiler.cabal
@@ -2,7 +2,7 @@
2-- documentation, see http://haskell.org/cabal/users-guide/ 2-- documentation, see http://haskell.org/cabal/users-guide/
3 3
4name: lambdacube-compiler 4name: lambdacube-compiler
5version: 0.6.0.0 5version: 0.6.0.1
6homepage: http://lambdacube3d.com 6homepage: http://lambdacube3d.com
7synopsis: LambdaCube 3D is a DSL to program GPUs 7synopsis: LambdaCube 3D is a DSL to program GPUs
8description: LambdaCube 3D is a domain specific language and library that makes it 8description: LambdaCube 3D is a domain specific language and library that makes it
diff --git a/src/LambdaCube/Compiler/Core.hs b/src/LambdaCube/Compiler/Core.hs
index 181d07e8..91056dd9 100644
--- a/src/LambdaCube/Compiler/Core.hs
+++ b/src/LambdaCube/Compiler/Core.hs
@@ -442,7 +442,7 @@ instance MkDoc Neutral where
442 CstrT' t a b -> shCstr (mkDoc pr a) (mkDoc pr (ET b t)) 442 CstrT' t a b -> shCstr (mkDoc pr a) (mkDoc pr (ET b t))
443 Fun (FunName _ _ (ExpDef d) _) xs _ | body -> mkDoc (reduce, False) (foldlrev app_ d xs) 443 Fun (FunName _ _ (ExpDef d) _) xs _ | body -> mkDoc (reduce, False) (foldlrev app_ d xs)
444 FFix (getFixLam -> Just (s, xs)) | not body -> foldl DApp (pShow s) $ mkDoc pr <$> xs 444 FFix (getFixLam -> Just (s, xs)) | not body -> foldl DApp (pShow s) $ mkDoc pr <$> xs
445 FFix f {- | body -} -> foldl DApp "primFix" [{-pShow t -}"_", mkDoc pr f] 445 FFix f -> foldl DApp "primFix" [{-pShow t -}"_", mkDoc pr f]
446 Fun (FunName _ _ (DeltaDef n _) _) _ _ | body -> text $ "<<delta function with arity " ++ show n ++ ">>" 446 Fun (FunName _ _ (DeltaDef n _) _) _ _ | body -> text $ "<<delta function with arity " ++ show n ++ ">>"
447 Fun (FunName _ _ NoDef _) _ _ | body -> "<<builtin>>" 447 Fun (FunName _ _ NoDef _) _ _ | body -> "<<builtin>>"
448 ReducedN a | reduce -> mkDoc pr a 448 ReducedN a | reduce -> mkDoc pr a
diff --git a/src/LambdaCube/Compiler/DesugaredSource.hs b/src/LambdaCube/Compiler/DesugaredSource.hs
index 7bb5ba96..9e0949b0 100644
--- a/src/LambdaCube/Compiler/DesugaredSource.hs
+++ b/src/LambdaCube/Compiler/DesugaredSource.hs
@@ -102,7 +102,8 @@ instance PShow Range
102showRangeWithoutFileName (Range _ b e) = pShow b <> "-" <> pShow e 102showRangeWithoutFileName (Range _ b e) = pShow b <> "-" <> pShow e
103 103
104joinRange :: Range -> Range -> Range 104joinRange :: Range -> Range -> Range
105joinRange (Range n b e) (Range n' b' e') {- | n == n' -} = Range n (min b b') (max e e') 105joinRange (Range n b e) (Range n' b' e') = Range n (min b b') (max e e')
106-- TODO: check (n == n') ?
106 107
107-------------------------------------------------------------------------------- source info 108-------------------------------------------------------------------------------- source info
108 109