on develop help sign in
wip
commit84c1787a4390e44ce66d5eb46ab504c0b621aeb8 authorRyan Trinkle <ryan.trinkle@gmail.com> dateMon 24 Oct 2016, 10:40 (10 years ago) parentadfc860
3 files changed+17−24
default.nix+1−7 reflex.cabal+9−11 src/Reflex/Optimizer.hs+7−6
default.nix+1−7
@@ -4,7 +4,6 @@
44, monad-control, mtl, primitive, ref-tf, semigroupoids
55, semigroups, split, stdenv, stm, syb, template-haskell
66, these, transformers, transformers-compat, prim-uniq
7−, ghc_reflex ? null
87}:
98mkDerivation {
109 pname = "reflex";
@@ -16,13 +15,8 @@ mkDerivation {
1615 MemoTrie monad-control mtl primitive ref-tf semigroupoids
1716 semigroups stm syb template-haskell these transformers
1817 transformers-compat prim-uniq
19− ];
20− testHaskellDepends = [
2118 base bifunctors containers deepseq dependent-map dependent-sum
22− hlint mtl ref-tf split transformers
23− ];
24− buildDepends = [
25− ghc_reflex
19+ mtl ref-tf split transformers
2620 ];
2721 homepage = "https://github.com/reflex-frp/reflex";
2822 description = "Higher-order Functional Reactive Programming";
reflex.cabal+9−11
@@ -23,6 +23,7 @@ library
2323 dependent-map >= 0.2.2 && < 0.3,
2424 dependent-sum == 0.3.*,
2525 exception-transformers == 0.4.*,
26+ ghc,
2627 haskell-src-exts >= 1.16 && < 1.18,
2728 haskell-src-meta == 0.6.*,
2829 lens >= 4.7 && < 5,
@@ -50,6 +51,7 @@ library
5051 Reflex.Dynamic.Uniq,
5152 Reflex.DynamicWriter,
5253 Reflex.Host.Class,
54+ Reflex.Optimizer,
5355 Reflex.PerformEvent.Base,
5456 Reflex.PerformEvent.Class,
5557 Reflex.PostBuild.Class,
@@ -57,10 +59,6 @@ library
5759 Reflex.Spider,
5860 Reflex.Spider.Internal
5961
60− if !impl(ghcjs)
61− build-depends: ghc
62− exposed-modules: Reflex.Optimizer
63−
6462 other-extensions: TemplateHaskell
6563 ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2
6664 ghc-prof-options: -auto-all
@@ -83,13 +81,13 @@ test-suite semantics
8381 split,
8482 transformers >= 0.3
8583
86−test-suite hlint
87− type: exitcode-stdio-1.0
88− main-is: hlint.hs
89− hs-source-dirs: test
90− build-depends: base, hlint == 1.9.*
91− if impl(ghcjs)
92− buildable: False
84+--test-suite hlint
85+-- type: exitcode-stdio-1.0
86+-- main-is: hlint.hs
87+-- hs-source-dirs: test
88+-- build-depends: base, hlint == 1.9.*
89+-- if impl(ghcjs)
90+-- buildable: False
9391
9492benchmark spider-bench
9593 type: exitcode-stdio-1.0
src/Reflex/Optimizer.hs+7−6
@@ -1,8 +1,14 @@
11{-# LANGUAGE CPP #-}
22{-# LANGUAGE LambdaCase #-}
33module Reflex.Optimizer (plugin) where
4+#ifdef ghcjs_HOST_OS
45
5−#ifndef ghcjs_HOST_OS
6+import Plugins
7+
8+plugin :: Plugin
9+plugin = undefined
10+
11+#else
612
713import GhcPlugins
814import Control.Arrow
@@ -25,9 +31,4 @@ makeInlinable = CoreDoPluginPass "MakeInlinable" $ \modGuts -> do
2531 Rec bes -> Rec $ map (first f) bes
2632 return $ modGuts { mg_binds = newBinds }
2733
28−#else
29−
30−plugin :: ()
31−plugin = ()
32−
3334#endif