Merge branch 'compiler/0.12' into st-modify

Author: garyb

bower.json

@@ -17,12 +17,11 @@
     "package.json"
   ],
   "dependencies": {
-    "purescript-symbols": "^3.0.0",
-    "purescript-functions": "^3.0.0",
-    "purescript-typelevel-prelude": "^2.3.1",
-    "purescript-st": "^3.0.0"
+    "purescript-functions": "#compiler/0.12",
+    "purescript-typelevel-prelude": "#compiler/0.12",
+    "purescript-st": "#compiler/0.12"
   },
   "devDependencies": {
-    "purescript-assert": "^3.0.0"
+    "purescript-assert": "#compiler/0.12"
   }
 }

package.json

@@ -3,12 +3,12 @@
   "scripts": {
     "clean": "rimraf output && rimraf .pulp-cache",
     "build": "eslint src && pulp build -- --censor-lib --strict",
-    "test": "pulp test"
+    "test": "pulp test --check-main-type Effect.Effect"
   },
   "devDependencies": {
-    "eslint": "^3.17.1",
-    "purescript-psa": "^0.5.0",
-    "pulp": "^11.0.0",
-    "rimraf": "^2.6.1"
+    "eslint": "^4.19.1",
+    "purescript-psa": "^0.6.0",
+    "pulp": "^12.0.1",
+    "rimraf": "^2.6.2"
   }
 }

src/Data/Record/ST.purs

@@ -1,4 +1,4 @@
-module Data.Record
+module Record
   ( get
   , set
   , modify
@@ -10,11 +10,11 @@ module Data.Record
   , equalFields
   ) where
 
-import Data.Function.Uncurried (runFn2, runFn3)
-import Data.Record.Unsafe (unsafeGetFn, unsafeSetFn, unsafeDeleteFn)
+import Prelude
+
 import Data.Symbol (class IsSymbol, SProxy(..), reflectSymbol)
-import Prelude (class Eq, (&&), (==))
-import Type.Row (class RowLacks, class RowToList, Cons, Nil, RLProxy(RLProxy), kind RowList)
+import Record.Unsafe (unsafeDelete, unsafeGet, unsafeSet)
+import Type.Row (class Lacks, class Cons, class RowToList, Cons, Nil, RLProxy(RLProxy), kind RowList)
 
 -- | Get a property for a label which is specified using a value-level proxy for
 -- | a type-level string.
@@ -27,11 +27,11 @@ import Type.Row (class RowLacks, class RowToList, Cons, Nil, RLProxy(RLProxy), k
 get
   :: forall r r' l a
    . IsSymbol l
-  => RowCons l a r' r
+  => Cons l a r' r
   => SProxy l
   -> Record r
   -> a
-get l r = runFn2 unsafeGetFn (reflectSymbol l) r
+get l r = unsafeGet (reflectSymbol l) r
 
 -- | Set a property for a label which is specified using a value-level proxy for
 -- | a type-level string.
@@ -45,13 +45,13 @@ get l r = runFn2 unsafeGetFn (reflectSymbol l) r
 set
   :: forall r1 r2 r l a b
    . IsSymbol l
-  => RowCons l a r r1
-  => RowCons l b r r2
+  => Cons l a r r1
+  => Cons l b r r2
   => SProxy l
   -> b
   -> Record r1
   -> Record r2
-set l b r = runFn3 unsafeSetFn (reflectSymbol l) b r
+set l b r = unsafeSet (reflectSymbol l) b r
 
 -- | Modify a property for a label which is specified using a value-level proxy for
 -- | a type-level string.
@@ -65,8 +65,8 @@ set l b r = runFn3 unsafeSetFn (reflectSymbol l) b r
 modify
   :: forall r1 r2 r l a b
    . IsSymbol l
-  => RowCons l a r r1
-  => RowCons l b r r2
+  => Cons l a r r1
+  => Cons l b r r2
   => SProxy l
   -> (a -> b)
   -> Record r1
@@ -80,18 +80,18 @@ modify l f r = set l (f (get l r)) r
 -- |
 -- | ```purescript
 -- | insert (SProxy :: SProxy "x")
--- |   :: forall r a. RowLacks "x" r => a -> { | r } -> { x :: a | r }
+-- |   :: forall r a. Lacks "x" r => a -> { | r } -> { x :: a | r }
 -- | ```
 insert
   :: forall r1 r2 l a
    . IsSymbol l
-  => RowLacks l r1
-  => RowCons l a r1 r2
+  => Lacks l r1
+  => Cons l a r1 r2
   => SProxy l
   -> a
   -> Record r1
   -> Record r2
-insert l a r = runFn3 unsafeSetFn (reflectSymbol l) a r
+insert l a r = unsafeSet (reflectSymbol l) a r
 
 -- | Delete a property for a label which is specified using a value-level proxy for
 -- | a type-level string.
@@ -103,17 +103,17 @@ insert l a r = runFn3 unsafeSetFn (reflectSymbol l) a r
 -- |
 -- | ```purescript
 -- | delete (SProxy :: SProxy "x")
--- |   :: forall r a. RowLacks "x" r => { x :: a | r } -> { | r }
+-- |   :: forall r a. Lacks "x" r => { x :: a | r } -> { | r }
 -- | ```
 delete
   :: forall r1 r2 l a
    . IsSymbol l
-  => RowLacks l r1
-  => RowCons l a r1 r2
+  => Lacks l r1
+  => Cons l a r1 r2
   => SProxy l
   -> Record r2
   -> Record r1
-delete l r = runFn2 unsafeDeleteFn (reflectSymbol l) r
+delete l r = unsafeDelete (reflectSymbol l) r
 
 -- | Rename a property for a label which is specified using a value-level proxy for
 -- | a type-level string.
@@ -125,15 +125,15 @@ delete l r = runFn2 unsafeDeleteFn (reflectSymbol l) r
 -- |
 -- | ```purescript
 -- | rename (SProxy :: SProxy "x") (SProxy :: SProxy "y")
--- |   :: forall a r. RowLacks "x" r => RowLacks "y" r => { x :: a | r} -> { y :: a | r}
+-- |   :: forall a r. Lacks "x" r => Lacks "y" r => { x :: a | r} -> { y :: a | r}
 -- | ```
 rename :: forall prev next ty input inter output
    . IsSymbol prev
   => IsSymbol next
-  => RowCons prev ty inter input
-  => RowLacks prev inter
-  => RowCons next ty inter output
-  => RowLacks next inter
+  => Cons prev ty inter input
+  => Lacks prev inter
+  => Cons next ty inter output
+  => Lacks next inter
   => SProxy prev
   -> SProxy next
   -> Record input
@@ -158,7 +158,7 @@ instance equalFieldsCons
   ::
   ( IsSymbol name
   , Eq ty
-  , RowCons name ty tailRow row
+  , Cons name ty tailRow row
   , EqualFields tail row
   ) => EqualFields (Cons name ty tail) row where
   equalFields _ a b = get' a == get' b && equalRest a b

src/Data/Record/Unsafe.js

@@ -19,6 +19,15 @@ exports.unsafeInsert = function(l) {
   };
 };
 
+exports.unsafeModify = function(l) {
+  return function (f) {
+    return function(rec) {
+      rec[l] = f(rec[l]);
+      return rec;
+    };
+  };
+};
+
 exports.unsafeDelete = function(l) {
   return function(rec) {
     delete rec[l];