Normalize usage of try/catch

Author: natefaubion

src/Control/Monad/Aff.js

@@ -82,16 +82,12 @@ exports._forkAll = function (nonCanceler, foldl, affs) {
   var voidF = function () {};
 
   return function (success, error) {
-    try {
-      var cancelers = foldl(function (acc) {
-        return function (aff) {
-          acc.push(aff(voidF, voidF));
-          return acc;
-        };
-      })([])(affs);
-    } catch (err) {
-      error(err);
-    }
+    var cancelers = foldl(function (acc) {
+      return function (aff) {
+        acc.push(aff(voidF, voidF));
+        return acc;
+      };
+    })([])(affs);
 
     var canceler = function (e) {
       return function (success, error) {
@@ -147,7 +143,7 @@ exports._makeAff = function (cb) {
 };
 
 exports._pure = function (nonCanceler, v) {
-  return function (success) {
+  return function (success, error) {
     success(v);
     return nonCanceler;
   };
@@ -162,18 +158,9 @@ exports._throwError = function (nonCanceler, e) {
 
 exports._fmap = function (f, aff) {
   return function (success, error) {
-    try {
-      return aff(function (v) {
-        try {
-          var v2 = f(v);
-        } catch (err) {
-          error(err);
-        }
-        success(v2);
-      }, error);
-    } catch (err) {
-      error(err);
-    }
+    return aff(function (v) {
+      success(f(v));
+    }, error);
   };
 };
 
@@ -223,16 +210,12 @@ exports._bind = function (alwaysCanceler, aff, f) {
 };
 
 exports._attempt = function (Left, Right, aff) {
-  return function (success) {
-    try {
-      return aff(function (v) {
-        success(Right(v));
-      }, function (e) {
-        success(Left(e));
-      });
-    } catch (err) {
-      success(Left(err));
-    }
+  return function (success, error) {
+    return aff(function (v) {
+      success(Right(v));
+    }, function (e) {
+      success(Left(e));
+    });
   };
 };
 
@@ -284,11 +267,7 @@ exports._tailRecM = function (isLeft, f, a) {
           if (isLeft(v)) {
             go(v.value0);
           } else {
-            try {
-              success(v.value0);
-            } catch (err) {
-              error(err);
-            }
+            success(v.value0);
           }
         }
       };
@@ -307,11 +286,7 @@ exports._tailRecM = function (isLeft, f, a) {
             acc = result.value0;
             continue;
           } else {
-            try {
-              success(result.value0);
-            } catch (err) {
-              error(err);
-            }
+            success(result.value0);
           }
         } else {
           // If the status has not resolved yet, then we have observed an

src/Control/Monad/Aff/Internal.js

@@ -2,16 +2,11 @@
 
 exports._makeVar = function (nonCanceler) {
   return function (success, error) {
-    try {
-      success({
-        consumers: [],
-        producers: [],
-        error: undefined
-      });
-    } catch (err) {
-      error(err);
-    }
-
+    success({
+      consumers: [],
+      producers: [],
+      error: undefined
+    });
     return nonCanceler;
   };
 };
@@ -21,9 +16,7 @@ exports._takeVar = function (nonCanceler, avar) {
     if (avar.error !== undefined) {
       error(avar.error);
     } else if (avar.producers.length > 0) {
-      var producer = avar.producers.shift();
-
-      producer(success, error);
+      avar.producers.shift()(success, error);
     } else {
       avar.consumers.push({ peek: false, success: success, error: error });
     }
@@ -37,8 +30,7 @@ exports._peekVar = function (nonCanceler, avar) {
     if (avar.error !== undefined) {
       error(avar.error);
     } else if (avar.producers.length > 0) {
-      var producer = avar.producers[0];
-      producer(success, error);
+      avar.producers[0](success, error);
     } else {
       avar.consumers.push({ peek: true, success: success, error: error });
     }
@@ -70,20 +62,13 @@ exports._putVar = function (nonCanceler, avar, a) {
 
       if (shouldQueue) {
         avar.producers.push(function (success, error) {
-          try {
-            success(a);
-          } catch (err) {
-            error(err);
-          }
+          success(a);
+          return nonCanceler;
         });
       }
 
       for (var i = 0; i < consumers.length; i++) {
-        try {
-          consumers[i].success(a);
-        } catch (err) {
-          consumers[i].error(err);
-        }
+        consumers[i].success(a);
       }
 
       success({});
@@ -93,27 +78,17 @@ exports._putVar = function (nonCanceler, avar, a) {
   };
 };
 
+
 exports._killVar = function (nonCanceler, avar, e) {
   return function (success, error) {
     if (avar.error !== undefined) {
       error(avar.error);
     } else {
-      var errors = [];
-
       avar.error = e;
-
-      while (avar.consumers.length > 0) {
-        var consumer = avar.consumers.shift();
-
-        try {
-          consumer.error(e);
-        } catch (err) {
-          errors.push(err);
-        }
+      while (avar.consumers.length) {
+        avar.consumers.shift().error(e);
       }
-
-      if (errors.length > 0) error(errors[0]);
-      else success({});
+      success({});
     }
 
     return nonCanceler;