git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Update tests for `return`
commit67fb0b21fd0f7f54051549e448edd33bf19889f0 authorGary Burgess <garyb@users.noreply.github.com> dateThu 6 Feb 2014, 23:58 (13 years ago) parent265e572
11 files changed+27−27
examples/failing/Do.purs+2−2 examples/failing/SkolemEscape2.purs+1−1 examples/passing/Console.purs+1−1 examples/passing/Do.purs+1−1 examples/passing/Eff.purs+1−1 examples/passing/ExternData.purs+1−1 examples/passing/JSReserved.purs+4−4 examples/passing/Maybe.purs+1−1 examples/passing/Monad.purs+6−6 examples/passing/Rank2Types.purs+3−3 examples/passing/TypeClasses.purs+6−6
examples/failing/Do.purs+2−2
@@ -4,5 +4,5 @@ test1 = do let x = 1
44
55test2 y = do x <- y
66
7−test3 = do ret 1
8− ret 2
7+test3 = do return 1
8+ return 2
examples/failing/SkolemEscape2.purs+1−1
@@ -6,4 +6,4 @@ import ST
66
77test _ = do
88 r <- runST (newSTRef 0)
9− ret 0
9+ return 0
examples/passing/Console.purs+1−1
@@ -5,7 +5,7 @@ import Eff
55import Trace
66
77replicateM_ :: forall m a. (Monad m) => Number -> m a -> m {}
8−replicateM_ 0 _ = ret {}
8+replicateM_ 0 _ = return {}
99replicateM_ n act = do
1010 act
1111 replicateM_ (n - 1) act
examples/passing/Do.purs+1−1
@@ -5,7 +5,7 @@ import Prelude
55data Maybe a = Nothing | Just a
66
77instance Prelude.Monad Maybe where
8− ret = Just
8+ return = Just
99 (>>=) Nothing _ = Nothing
1010 (>>=) (Just a) f = f a
1111
examples/passing/Eff.purs+1−1
@@ -6,7 +6,7 @@ import ST
66import Errors
77import Trace
88
9−test1 = catchError (\s -> ret 0) $ do
9+test1 = catchError (\s -> return 0) $ do
1010 trace "Testing"
1111 throwError "Error!"
1212
examples/passing/ExternData.purs+1−1
@@ -4,7 +4,7 @@ module ExternData where
44
55 foreign import fmap :: forall a b. IO a -> (a -> b) -> IO b
66
7− foreign import ret :: forall a. a -> IO a
7+ foreign import return :: forall a. a -> IO a
88
99 foreign import bind :: forall a b. IO a -> (a -> IO b) -> IO b
1010
examples/passing/JSReserved.purs+4−4
@@ -2,15 +2,15 @@ module Main where
22
33 import Prelude
44
5− const = "test"
5+ yield = "test"
66 member = "test"
77
88 fortest = {
9− var return = 0;
9+ var function = 0;
1010 for (i <- 0 until 10) {
11− return = return + i;
11+ function = function + i;
1212 }
13− return return;
13+ return function;
1414 }
1515
1616 whiletest = {
examples/passing/Maybe.purs+1−1
@@ -8,5 +8,5 @@ main = do
88 let test1 = fromMaybe 0 $ do
99 a <- Just 1
1010 b <- Just 2
11− ret (a + b)
11+ return (a + b)
1212 Trace.print test1
examples/passing/Monad.purs+6−6
@@ -1,27 +1,27 @@
11module MonadTest where
22
3− type Monad m = { ret :: forall a. a -> m a
3+ type Monad m = { return :: forall a. a -> m a
44 , bind :: forall a b. m a -> (a -> m b) -> m b }
55
66 data Id a = Id a
77
88 id :: Monad Id
9− id = { ret : Id
9+ id = { return : Id
1010 , bind : \ma f -> case ma of Id a -> f a }
1111
1212 data Maybe a = Nothing | Just a
1313
1414 maybe :: Monad Maybe
15− maybe = { ret : Just
15+ maybe = { return : Just
1616 , bind : \ma f -> case ma of
1717 Nothing -> Nothing
1818 Just a -> f a
1919 }
2020
2121 test :: forall m. Monad m -> m Number
22− test = \m -> m.bind (m.ret 1) (\n1 ->
23− m.bind (m.ret "Test") (\n2 ->
24− m.ret n1))
22+ test = \m -> m.bind (m.return 1) (\n1 ->
23+ m.bind (m.return "Test") (\n2 ->
24+ m.return n1))
2525
2626 test1 = test id
2727
examples/passing/Rank2Types.purs+3−3
@@ -16,9 +16,9 @@ module Rank2Types where
1616 foreign import push :: forall el. el -> [el] -> [el]
1717
1818 replicateM :: forall m a. (forall a. a -> m a) -> (forall a b. m a -> (a -> m b) -> m b) -> Number -> m a -> m [a]
19− replicateM = \ret bind n m -> case n of
20− 0 -> ret []
21− n -> bind m (\x -> bind (replicateM ret bind (n - 1) m) (\xs -> ret (push x xs)))
19+ replicateM = \return bind n m -> case n of
20+ 0 -> return []
21+ n -> bind m (\x -> bind (replicateM return bind (n - 1) m) (\xs -> return (push x xs)))
2222
2323module Main where
2424
examples/passing/TypeClasses.purs+6−6
@@ -22,20 +22,20 @@ instance (Prelude.Show a) => Prelude.Show (Data a) where
2222test3 = \_ -> show (Data "testing")
2323
2424instance Prelude.Monad Data where
25− ret = Data
25+ return = Data
2626 (>>=) (Data a) f = f a
2727
2828data Maybe a = Nothing | Just a
2929
3030instance Prelude.Monad Maybe where
31− ret = Just
31+ return = Just
3232 (>>=) Nothing _ = Nothing
3333 (>>=) (Just a) f = f a
3434
3535test4 :: forall a m. (Monad m) => a -> m Number
36−test4 = \_ -> ret 1
36+test4 = \_ -> return 1
3737
38−test5 = \_ -> Just 1 >>= \n -> ret (n + 1)
38+test5 = \_ -> Just 1 >>= \n -> return (n + 1)
3939
4040module TypeClasses2 where
4141
@@ -49,7 +49,7 @@ instance (Prelude.Show a) => Prelude.Show [a] where
4949test6 = \_ -> show ["testing"]
5050
5151instance Prelude.Monad (->) r where
52− ret a r = a
52+ return a r = a
5353 (>>=) f g r = g (f r) r
5454
5555ask r = r
@@ -58,7 +58,7 @@ runReader r f = f r
5858
5959test9 _ = runReader 0 $ do
6060 n <- ask
61− ret $ n + 1
61+ return $ n + 1
6262
6363module Main where
6464