on master help sign in
Merge pull request #4101 from rbarreiro/js_ioref

Js IORef support

commitc3113e70656ec99fe2ef67f95300418699f0afeb authorAhmad Salim Al-Sibahi <asal@itu.dk> dateFri 6 Oct 2017, 21:34 (9 years ago) parent7e957d8ecc7beb
9 files changed+75−14
CHANGELOG.md+1−1 libs/base/Data/IORef.idr+37−11 test/TestData.hs+2−1 test/basic021/basic021_2.idr+13 test/basic021/expected+1 test/basic021/run+3−1 test/basic022/basic022.idr+13 test/basic022/expected+1 test/basic022/run+4
CHANGELOG.md+1−1
@@ -12,7 +12,7 @@
1212## Library Updates
1313
1414+ Added `Text.Literate`, a module for working with literate source files.
15−+ Added `Data.IORef`, for working with mutable references in `IO`.
15++ Added `Data.IORef`, for working with mutable references in `IO` and `JS_IO`.
1616+ Added `discriminate` and `construct` tactics to Pruviloj.
1717
1818## Tool Updates
libs/base/Data/IORef.idr+37−11
@@ -3,26 +3,52 @@ module Data.IORef
33export
44data IORef a = MkIORef a
55
6+public export
7+interface HasReference (ffi : FFI) where
8+ newIORef' : a -> IO' ffi (IORef a)
9+ readIORef' : IORef a -> IO' ffi a
10+ writeIORef' : IORef a -> a -> IO' ffi ()
11+
612export
7−newIORef : a -> IO (IORef a)
8−newIORef val
13+modifyIORef': HasReference ffi => IORef a -> (a -> a) -> IO' ffi ()
14+modifyIORef' ref fn =
15+ do
16+ val <- readIORef' ref
17+ writeIORef' ref (fn val)
18+
19+export
20+implementation HasReference FFI_C where
21+ newIORef' val
922 = do MkRaw ref <- foreign FFI_C "idris_newRef" (Raw a -> IO (Raw a)) (MkRaw val)
1023 pure (MkIORef ref)
24+ readIORef' (MkIORef ref)
25+ = do MkRaw val <- foreign FFI_C "idris_readRef" (Raw a -> IO (Raw a)) (MkRaw ref)
26+ pure val
27+ writeIORef' (MkIORef ref) val
28+ = foreign FFI_C "idris_writeRef" (Raw a -> Raw a -> IO ())
29+ (MkRaw ref) (MkRaw val)
30+
31+export
32+implementation HasReference FFI_JS where
33+ newIORef' val =
34+ (MkIORef . believe_me) <$> foreign FFI_JS "{val: %0}" (Ptr -> JS_IO Ptr) (believe_me val)
35+ readIORef' (MkIORef ref) =
36+ believe_me <$> foreign FFI_JS "%0.val" (Ptr -> JS_IO Ptr) (believe_me ref)
37+ writeIORef' (MkIORef ref) val =
38+ foreign FFI_JS "%0.val = %1" (Ptr -> Ptr -> JS_IO ()) (believe_me ref) (believe_me val)
39+
40+export
41+newIORef : a -> IO (IORef a)
42+newIORef = newIORef'
1143
1244export
1345readIORef : IORef a -> IO a
14−readIORef (MkIORef ref)
15− = do MkRaw val <- foreign FFI_C "idris_readRef" (Raw a -> IO (Raw a)) (MkRaw ref)
16− pure val
46+readIORef = readIORef'
1747
1848export
1949writeIORef : IORef a -> a -> IO ()
20−writeIORef (MkIORef old) val
21− = foreign FFI_C "idris_writeRef" (Raw a -> Raw a -> IO ())
22− (MkRaw old) (MkRaw val)
50+writeIORef = writeIORef'
2351
2452export
2553modifyIORef : IORef a -> (a -> a) -> IO ()
26−modifyIORef ref fn
27− = do val <- readIORef ref
28− writeIORef ref (fn val)
54+modifyIORef = modifyIORef'
test/TestData.hs+2−1
@@ -72,7 +72,8 @@ testFamiliesData = [
7272 ( 18, ANY ),
7373 ( 19, ANY ),
7474 ( 20, ANY ),
75− ( 21, C_CG )]),
75+ ( 21, C_CG ),
76+ ( 22, NODE_CG )]),
7677 ("bignum", "Bignum",
7778 [ ( 1, ANY ),
7879 ( 2, ANY )]),
test/basic021/basic021_2.idrnew file+13
@@ -0,0 +1,13 @@
1+import Data.IORef
2+
3+count : HasReference ffi => Nat -> IORef Integer -> IO' ffi ()
4+count Z ref
5+ = do x <- readIORef' ref
6+ printLn' x
7+count (S k) ref
8+ = do modifyIORef' ref (+1)
9+ count k ref
10+
11+main : IO ()
12+main = do r <- newIORef' 0
13+ count 1000 r
test/basic021/expected+1
@@ -1 +1,2 @@
111000000
2+1000
test/basic021/run+3−1
@@ -1,4 +1,6 @@
11#!/usr/bin/env bash
22${IDRIS:-idris} $@ basic021.idr -o basic021
3+${IDRIS:-idris} $@ basic021_2.idr -o basic021_2
34./basic021
4−rm -f basic021 *.ibc
5+./basic021_2
6+rm -f basic021 basic021_2 *.ibc
test/basic022/basic022.idrnew file+13
@@ -0,0 +1,13 @@
1+import Data.IORef
2+
3+count : HasReference ffi => Nat -> IORef Integer -> IO' ffi ()
4+count Z ref
5+ = do x <- readIORef' ref
6+ printLn' x
7+count (S k) ref
8+ = do modifyIORef' ref (+1)
9+ count k ref
10+
11+main : JS_IO ()
12+main = do r <- newIORef' 0
13+ count 1000 r
test/basic022/expectednew file+1
@@ -0,0 +1 @@
1+1000
test/basic022/runnew file+4
@@ -0,0 +1,4 @@
1+#!/usr/bin/env bash
2+${IDRIS:-idris} $@ basic022.idr -o basic022
3+./basic022
4+rm -f basic022 *.ibc