Merge pull request #367 from reflex-frp/ignore-traverse_

Change "traverse" to "traverse_" (includes #363)

Author: Ericson2314

ChangeLog.md

@@ -1,5 +1,11 @@
 # Revision history for reflex
 
+## Unreleased
+
+* Data.WeakBag.traverse and Data.FastWeakBag.traverse have been
+  renamed to Data.WeakBag.traverse_ and Data.FastWeakBag.traverse_
+  respectively.
+
 ## 0.6.2.4
 
 * Update to monoidal-containers 0.6

default.nix

@@ -7,13 +7,18 @@
 , transformers-compat, unbounded-delays, prim-uniq
 , data-default, filepath, directory, filemanip, ghcjs-base
 , monoidal-containers, witherable, profunctors
-, semialign ? null, splitThese ? (semialign != null)
+, splitThese ? (semialign != null), semialign ? null, these-lens ? null
 , useTemplateHaskell ? true
 }:
 mkDerivation {
   pname = "reflex";
   version = "0.6.2.4";
-  src = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [ ".git" "dist" ])) ./.;
+  src = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [
+    "default.nix"
+    "release.nix"
+    ".git"
+    "dist"
+  ])) ./.;
   libraryHaskellDepends = [
     base bifunctors containers dependent-map dependent-sum
     exception-transformers lens
@@ -30,6 +35,7 @@ mkDerivation {
     haskell-src-exts haskell-src-meta
   ]) ++ (if splitThese then [
     semialign
+    these-lens
   ] else []);
   testHaskellDepends = if ghc.isGhcjs or false then [] else [
     hlint filepath directory filemanip

dep/reflex-platform/default.nix

@@ -0,0 +1,7 @@
+# DO NOT HAND-EDIT THIS FILE
+import ((import <nixpkgs> {}).fetchFromGitHub (
+  let json = builtins.fromJSON (builtins.readFile ./github.json);
+  in { inherit (json) owner repo rev sha256;
+       private = json.private or false;
+     }
+))

dep/reflex-platform/github.json

@@ -0,0 +1,7 @@
+{
+  "owner": "reflex-frp",
+  "repo": "reflex-platform",
+  "branch": "jailbreakTheselens",
+  "rev": "4284ed527c96c373538dc7e31776d9a50ca6aa91",
+  "sha256": "1m1nkxq7ng9wnqbd77xn8d81f2iz8g61y5m0r3gp0gi0q59jm8ay"
+}

hydra.json

@@ -1,9 +1,38 @@
-{ rp ? import ./reflex-platform.nix {}
+{ reflex-platform-fun ? import ./dep/reflex-platform
 }:
+
 let
-  inherit (rp.nixpkgs) lib;
-  compilers = ["ghc8_4" "ghc8_0" "ghcjs8_4" "ghcjs8_0"];
-in lib.attrValues (lib.genAttrs compilers (ghc: {
-  reflex-useTemplateHaskell = rp.${ghc}.callPackage ./. { useTemplateHaskell = true; splitThese = false; };
-  reflex = rp.${ghc}.callPackage ./. { useTemplateHaskell = false; splitThese = false; };
-}))
+  native-reflex-platform = reflex-platform-fun {};
+  inherit (native-reflex-platform.nixpkgs) lib;
+  systems = ["x86_64-linux" "x86_64-darwin"];
+
+  perPlatform = lib.genAttrs systems (system: let
+    reflex-platform = reflex-platform-fun { inherit system; };
+    compilers = [
+      "ghc"
+      "ghcjs"
+    ] ++ lib.optionals (reflex-platform.androidSupport) [
+      "ghcAndroidAarch64"
+      "ghcAndroidAarch32"
+    ] ++ lib.optionals (reflex-platform.iosSupport) [
+      "ghcIosAarch64"
+    ];
+    hsPkgs = lib.genAttrs compilers (ghc: let
+      ghc' = reflex-platform.${ghc}.override {
+        overrides = self: super: {
+          reflex-dontUseTemplateHaskell = self.callPackage ./. { useTemplateHaskell = false; };
+          reflex = self.callPackage ./. { useTemplateHaskell = true; };
+        };
+      };
+    in {
+      inherit (ghc') reflex reflex-dontUseTemplateHaskell;
+    });
+  in hsPkgs // {
+    cache = reflex-platform.pinBuildInputs "reflex-${system}"
+      (lib.concatLists (map builtins.attrValues (builtins.attrValues hsPkgs)));
+  });
+
+  metaCache = native-reflex-platform.pinBuildInputs "reflex-everywhere"
+    (map (a: a.cache) (builtins.attrValues perPlatform));
+
+in perPlatform // { inherit metaCache; }

jobsets.nix

@@ -18,6 +18,7 @@ module Data.FastWeakBag
   , isEmpty
   , insert
   , traverse
+  , traverse_
   , remove
   -- * Internal functions
   -- These will not always be available.
@@ -116,14 +117,14 @@ foreign import javascript unsafe "(function(){ for(var i = 0; i < $1.tickets.len
 isEmpty bag = {-# SCC "isEmpty" #-} IntMap.null <$> readIORef (_weakBag_children bag)
 #endif
 
-{-# INLINE traverse #-}
+{-# INLINE traverse_ #-}
 -- | Visit every node in the given list.  If new nodes are appended during the
 -- traversal, they will not be visited.  Every live node that was in the list
 -- when the traversal began will be visited exactly once; however, no guarantee
 -- is made about the order of the traversal.
-traverse :: forall a m. MonadIO m => FastWeakBag a -> (a -> m ()) -> m ()
+traverse_ :: forall a m. MonadIO m => FastWeakBag a -> (a -> m ()) -> m ()
 #ifdef GHCJS_FAST_WEAK
-traverse wb f = do
+traverse_ wb f = do
   let go cursor = when (not $ js_isNull cursor) $ do
         val <- liftIO $ js_getTicketValue cursor
         f $ unsafeFromRawJSVal val
@@ -134,13 +135,17 @@ foreign import javascript unsafe "$r = $1.val;" js_getTicketValue :: JSVal -> IO
 --TODO: Fix the race condition where if a cursor is deleted (presumably using 'remove', below) while we're holding it, it can't find its way back to the correct bag
 foreign import javascript unsafe "(function(){ for(var i = $1.pos - 1; i >= 0; i--) { if($1.bag.tickets[i] !== null) { return $1.bag.tickets[i]; } }; return null; })()" js_getNext :: FastWeakBagTicket a -> IO JSVal --TODO: Clean up as we go along so this isn't O(n) every time -- Result can be null or a FastWeakBagTicket a
 #else
-traverse (FastWeakBag _ children) f = {-# SCC "traverse" #-} do
+traverse_ (FastWeakBag _ children) f = {-# SCC "traverse_" #-} do
   cs <- liftIO $ readIORef children
   forM_ cs $ \c -> do
     ma <- liftIO $ deRefWeak c
     mapM_ f ma
 #endif
 
+{-# DEPRECATED traverse "Use 'traverse_' instead" #-}
+traverse :: forall a m. MonadIO m => FastWeakBag a -> (a -> m ()) -> m ()
+traverse = traverse_
+
 -- | Remove an item from the 'FastWeakBag'; does nothing if invoked multiple times
 -- on the same 'FastWeakBagTicket'.
 {-# INLINE remove #-}

reflex-platform.nix

@@ -15,6 +15,7 @@ module Data.WeakBag
   , singleton
   , insert
   , traverse
+  , traverse_
   , remove
   -- * Internal functions
   -- These will not always be available.
@@ -99,18 +100,22 @@ singleton a wbRef finalizer = {-# SCC "singleton" #-} do
   ticket <- insert a bag wbRef finalizer
   return (bag, ticket)
 
-{-# INLINE traverse #-}
+{-# INLINE traverse_ #-}
 -- | Visit every node in the given list.  If new nodes are appended during the
 -- traversal, they will not be visited.  Every live node that was in the list
 -- when the traversal began will be visited exactly once; however, no guarantee
 -- is made about the order of the traversal.
-traverse :: MonadIO m => WeakBag a -> (a -> m ()) -> m ()
-traverse (WeakBag _ children) f = {-# SCC "traverse" #-} do
+traverse_ :: MonadIO m => WeakBag a -> (a -> m ()) -> m ()
+traverse_ (WeakBag _ children) f = {-# SCC "traverse" #-} do
   cs <- liftIO $ readIORef children
   forM_ cs $ \c -> do
     ma <- liftIO $ deRefWeak c
     mapM_ f ma
 
+{-# DEPRECATED traverse "Use 'traverse_' instead" #-}
+traverse :: MonadIO m => WeakBag a -> (a -> m ()) -> m ()
+traverse = traverse_
+
 -- | Remove an item from the 'WeakBag'; does nothing if invoked multiple times
 -- on the same 'WeakBagTicket'.
 {-# INLINE remove #-}