converting to Effect.Uncurried, using exception catching, naming

anonymous foreign functions for stack traces

Author: athanclark

src/Data/ArrayBuffer/DataView.js

@@ -3,43 +3,31 @@
 // module Data.ArrayBuffer.DataView
 
 
-exports.whole = function(b) {
-  return new DataView(b);
-}
-
-exports.sliceImpl = function(just, nothing, s, l, b) {
-  return ((s + l)>>>0) <= b.byteLength ? just(new DataView(b, s, l)) : nothing;
-}
-
-exports.buffer = function(v) {
-  return v.buffer;
-}
-
-exports.byteOffset = function(v) {
-  return v.byteOffset;
-}
-
-exports.byteLength = function(v) {
-  return v.byteLength;
-}
-
-exports.getterImpl = function(just, nothing, s, l, e, v, o) {
-  return function() {
-    return ((o + l)>>>0) <= v.byteLength? just(v[s].call(v,o,e)) : nothing;
-  };
-}
-
-exports.setter = function(s) {
-  return function(e) {
-    return function(v) {
-      var f = v[s];
-      return function(n) {
-        return function(o) {
-            return function() {
-            f.call(v,o,n,e);
-          };
-        };
-      };
-    };
-  };
-}
+exports.whole = function whole (b) {
+    return new DataView(b);
+};
+
+exports.partImpl = function partImpl (b,i,j) {
+    return new DataView(b,i,j);
+};
+
+exports.buffer = function buffer (v) {
+    return v.buffer;
+};
+
+exports.byteOffset = function byteOffset (v) {
+    return v.byteOffset;
+};
+
+exports.byteLength = function byteLength (v) {
+    return v.byteLength;
+};
+
+exports.getterImpl = function getterImpl (s, l, e, v, o) {
+    return v[s].call(v,o,e);
+};
+
+exports.setterImpl = function setterImpl (s,e,v,n,o) {
+    var f = v[s];
+    f.call(v,o,n,e);
+};

src/Data/ArrayBuffer/DataView.purs

@@ -1,45 +1,47 @@
-module Data.ArrayBuffer.DataView( whole
-                                , slice
-                                , buffer
-                                , byteOffset
-                                , byteLength
-                                , Getter()
-                                , getInt8
-                                , getInt16be
-                                , getInt32be
-                                , getUint8
-                                , getUint16be
-                                , getUint32be
-                                , getFloat32be
-                                , getFloat64be
-                                , getInt16le
-                                , getInt32le
-                                , getUint16le
-                                , getUint32le
-                                , getFloat32le
-                                , getFloat64le
-                                , Setter()
-                                , setInt8
-                                , setInt16be
-                                , setInt32be
-                                , setUint8
-                                , setUint16be
-                                , setUint32be
-                                , setFloat32be
-                                , setFloat64be
-                                , setInt16le
-                                , setInt32le
-                                , setUint16le
-                                , setUint32le
-                                , setFloat32le
-                                , setFloat64le
-                                ) where
+module Data.ArrayBuffer.DataView
+  ( whole
+  , part
+  , buffer
+  , byteOffset
+  , byteLength
+  , Getter()
+  , getInt8
+  , getInt16be
+  , getInt32be
+  , getUint8
+  , getUint16be
+  , getUint32be
+  , getFloat32be
+  , getFloat64be
+  , getInt16le
+  , getInt32le
+  , getUint16le
+  , getUint32le
+  , getFloat32le
+  , getFloat64le
+  , Setter()
+  , setInt8
+  , setInt16be
+  , setInt32be
+  , setUint8
+  , setUint16be
+  , setUint32be
+  , setFloat32be
+  , setFloat64be
+  , setInt16le
+  , setInt32le
+  , setUint16le
+  , setUint32le
+  , setFloat32le
+  , setFloat64le
+  ) where
 
 import Prelude
 import Data.ArrayBuffer.Types (ByteOffset, DataView, ByteLength, ArrayBuffer)
-import Data.Function.Uncurried (Fn5, Fn7, runFn5, runFn7)
 import Data.Maybe (Maybe(..))
 import Effect (Effect)
+import Effect.Exception (catchException)
+import Effect.Uncurried (EffectFn5, EffectFn3, runEffectFn5, runEffectFn3)
 import Data.UInt (UInt)
 
 -- | Type for all fetching functions.
@@ -51,11 +53,11 @@ type Setter r = DataView -> r -> ByteOffset -> Effect Unit
 -- | View mapping the whole `ArrayBuffer`.
 foreign import whole :: ArrayBuffer -> DataView
 
-foreign import sliceImpl :: Fn5 (DataView -> Maybe DataView) (Maybe DataView) ByteOffset ByteLength ArrayBuffer (Maybe DataView)
+foreign import partImpl :: EffectFn3 ArrayBuffer ByteOffset ByteLength DataView
 
 -- | View mapping a region of the `ArrayBuffer`.
-slice :: ByteOffset -> ByteLength -> ArrayBuffer -> (Maybe DataView)
-slice = runFn5 sliceImpl Just Nothing
+part :: ArrayBuffer -> ByteOffset -> ByteLength -> Effect DataView
+part = runEffectFn3 partImpl
 
 -- | `ArrayBuffer` being mapped by the view.
 foreign import buffer :: DataView -> ArrayBuffer
@@ -69,13 +71,18 @@ foreign import byteLength :: DataView -> ByteLength
 
 type Endianness = Boolean
 
-foreign import getterImpl :: forall r. Fn7 (r -> Maybe r) (Maybe r) String ByteLength Endianness DataView ByteOffset (Effect (Maybe r))
+foreign import getterImpl :: forall r. EffectFn5 String ByteLength Endianness DataView ByteOffset r
 
-getter :: forall r. String ->  ByteLength -> Endianness -> DataView -> ByteOffset -> Effect (Maybe r)
-getter = runFn7 getterImpl Just Nothing
+getter :: forall r. String -> ByteLength -> Endianness -> Getter r
+getter p l e d o =
+  let x = runEffectFn5 getterImpl p l e d o
+  in  catchException (const (pure Nothing)) (Just <$> x)
 
+foreign import setterImpl :: forall r. EffectFn5 String Endianness DataView r ByteOffset Unit
 
-foreign import setter :: forall r. String -> Endianness -> DataView -> r -> ByteOffset -> Effect Unit
+setter :: forall r. String -> Endianness -> Setter r
+setter p e d x o =
+  runEffectFn5 setterImpl p e d x o
 
 
 -- | Fetch int8 value at a certain index in a `DataView`.