Skip to content

Commit 9b102a8

Browse files
committed
Removed effect for fromArray and fromString
1 parent 26c0eed commit 9b102a8

File tree

3 files changed

+13
-17
lines changed

3 files changed

+13
-17
lines changed

src/Data/ArrayBuffer/ArrayBuffer.js

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,14 @@ exports.sliceImpl = function(s, e, a) {
1919
}
2020

2121
exports.fromArray = function(s) {
22-
return function() {
23-
return (new Uint8Array(s)).buffer;
24-
};
22+
return (new Uint8Array(s)).buffer;
2523
}
2624

2725
exports.fromString = function(s) {
28-
return function() {
29-
var l = s.length;
30-
var ab = new ArrayBuffer(l * 2);
31-
var a = new Uint16Array(ab);
32-
for (var i = 0; i < l; i++)
33-
a[i] = s.charCodeAt(i);
34-
return ab;
35-
};
26+
var l = s.length;
27+
var ab = new ArrayBuffer(l * 2);
28+
var a = new Uint16Array(ab);
29+
for (var i = 0; i < l; i++)
30+
a[i] = s.charCodeAt(i);
31+
return a.buffer;
3632
}

src/Data/ArrayBuffer/ArrayBuffer.purs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ slice :: forall e. ByteOffset -> ByteOffset -> ArrayBuffer -> Eff (arrayBuffer :
2525
slice = runFn3 sliceImpl
2626

2727
-- | Convert an array into an `ArrayBuffer` representation.
28-
foreign import fromArray :: forall e. Array Number -> Eff (arrayBuffer :: ARRAY_BUFFER | e) ArrayBuffer
28+
foreign import fromArray :: Array Number -> ArrayBuffer
2929

3030
-- | Convert a string into an `ArrayBuffer` representation.
31-
foreign import fromString :: forall e. String -> Eff (arrayBuffer :: ARRAY_BUFFER | e) ArrayBuffer
31+
foreign import fromString :: String -> ArrayBuffer
3232

test/Main.purs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,20 @@ main = do
4242
assertEquals Nothing $ DV.byteLength <$> DV.slice 0 200 ab4
4343
assertEquals (Just 2) $ DV.byteLength <$> DV.slice 0 2 ab4
4444
assertEquals (Just 2) $ DV.byteLength <$> DV.slice 2 2 ab4
45-
assertEffEquals 4 $ pure <<< AB.byteLength =<< AB.fromArray [1.0, 2.0, 3.0, 4.0]
46-
assertEffEquals 8 $ pure <<< AB.byteLength =<< AB.fromString "hola"
45+
assertEquals 4 $ AB.byteLength $ AB.fromArray [1.0, 2.0, 3.0, 4.0]
46+
assertEquals 8 $ AB.byteLength $ AB.fromString "hola"
4747
assertEquals 8 $ AB.byteLength $ DV.buffer $ DV.whole ab8
4848
assertEquals 8 $ AB.byteLength $ DV.buffer $ TA.dataView $ TA.asInt8Array $ DV.whole ab8
4949

5050
assertEquals (Just 8) $ DV.byteLength <$> DV.slice 0 8 ab8
5151
assertEquals true $ isNothing $ DV.slice 0 40 ab8
5252

53-
fourElementInt8Array <- pure <<< TA.asInt8Array <<< DV.whole =<< AB.fromArray [1.0, 2.0, 3.0, 4.0]
53+
fourElementInt8Array <- pure <<< TA.asInt8Array <<< DV.whole $ AB.fromArray [1.0, 2.0, 3.0, 4.0]
5454
assertEffEquals (Just 2.0) $ TA.at fourElementInt8Array 1
5555
assertEffEquals Nothing $ TA.at fourElementInt8Array 4
5656
assertEffEquals Nothing $ TA.at fourElementInt8Array (-1)
5757

58-
assertEffEquals [1.0, 2.0, 3.0] $ TA.toArray <<< TA.asInt8Array <<< DV.whole =<< AB.fromArray [1.0, 2.0, 3.0]
58+
assertEffEquals [1.0, 2.0, 3.0] $ TA.toArray <<< TA.asInt8Array <<< DV.whole $ AB.fromArray [1.0, 2.0, 3.0]
5959

6060
twoElementDataView <- do
6161
ab' <- AB.create 2

0 commit comments

Comments
 (0)