Merge pull request #2 from MichaelXavier/modify-return

Add modifyRef that returns a pure value

Author: paf31

README.md

@@ -13,6 +13,8 @@
 
     modifyRef :: forall s r. RefVal s -> (s -> s) -> Eff (ref :: Ref | r) Unit
 
+    modifyRef' :: forall s b r. RefVal s -> (s -> { retVal :: b, newState :: s }) -> Eff (ref :: Ref | r) b
+
     newRef :: forall s r. s -> Eff (ref :: Ref | r) (RefVal s)
 
     readRef :: forall s r. RefVal s -> Eff (ref :: Ref | r) s

src/Control/Monad/Eff/Ref.purs

@@ -6,37 +6,45 @@ foreign import data Ref :: !
 
 foreign import data RefVal :: * -> *
 
-foreign import newRef 
-  "function newRef(val) {\
-  \  return function () {\
-  \    return { value: val };\
-  \  };\
-  \}" :: forall s r. s -> Eff (ref :: Ref | r) (RefVal s)
-
-foreign import readRef 
-  "function readRef(ref) {\
-  \  return function() {\
-  \    return ref.value;\
-  \  };\
-  \}" :: forall s r. RefVal s -> Eff (ref :: Ref | r) s
-
-
-foreign import modifyRef 
-  "function modifyRef(ref) {\
-  \  return function(f) {\
-  \    return function() {\
-  \      ref.value = f(ref.value);\
-  \      return {};\
-  \    };\
-  \  };\
-  \}" :: forall s r. RefVal s -> (s -> s) -> Eff (ref :: Ref | r) Unit
-
-foreign import writeRef 
-  "function writeRef(ref) {\
-  \  return function(val) {\
-  \    return function() {\
-  \      ref.value = val;\
-  \      return {};\
-  \    };\
-  \  };\
-  \}" :: forall s r. RefVal s -> s -> Eff (ref :: Ref | r) Unit
+foreign import newRef """
+  function newRef(val) {
+    return function () {
+      return { value: val };
+    };
+  }
+""" :: forall s r. s -> Eff (ref :: Ref | r) (RefVal s)
+
+foreign import readRef """
+  function readRef(ref) {
+    return function() {
+      return ref.value;
+    };
+  }
+""" :: forall s r. RefVal s -> Eff (ref :: Ref | r) s
+
+
+foreign import modifyRef' """
+  function modifyRef$prime(ref) {
+    return function(f) {
+      return function() {
+        var t = f(ref.value);
+        ref.value = t.newState;
+        return t.retVal;
+      };
+    };
+  }
+""" :: forall s b r. RefVal s -> (s -> {newState :: s, retVal :: b}) -> Eff (ref :: Ref | r) b
+
+modifyRef :: forall s r. RefVal s -> (s -> s) -> Eff (ref :: Ref | r) Unit
+modifyRef ref f = modifyRef' ref (\s -> {newState: f s, retVal: unit})
+
+foreign import writeRef """
+  function writeRef(ref) {
+    return function(val) {
+      return function() {
+        ref.value = val;
+        return {};
+      };
+    };
+  }
+""" :: forall s r. RefVal s -> s -> Eff (ref :: Ref | r) Unit