werkt

[cc1516.git] / yard.icl

diff --git a/yard.icl b/yard.icl
index 59b4e8c..1443325 100644 (file)
--- a/yard.icl
+++ b/yard.icl
@@ -1,8 +1,9 @@
 implementation module yard
 
 import StdTuple
-from StdClass import Eq
+import StdClass
 import Data.Functor
+import Data.Either
 import Control.Monad
 import Control.Applicative
 from Data.Func import $
@@ -44,10 +45,10 @@ top = Parser \i -> case i of
     [x:xs]  = (Right x, xs)
 
 satisfy :: (a -> Bool) -> Parser a a
-satisfy f = one >>= \r -> if (f r) (return r) fail
+satisfy f = top >>= \r -> if (f r) (return r) fail
 
 item :: a -> Parser a a | Eq a
 item a  = satisfy ((==)a)
 
 list :: [a] -> Parser a [a] | Eq a
-list as = mapM item as
\ No newline at end of file
+list as = mapM item as