Merge pull request #3 from dopefishh/standard-maybe

[CleanReadLine.git] / ReadLine.dcl

diff --git a/ReadLine.dcl b/ReadLine.dcl
index 30d3f4d..222f949 100644 (file)
--- a/ReadLine.dcl
+++ b/ReadLine.dcl
@@ -1,19 +1,14 @@
 definition module ReadLine
 
 import StdClass
+from Data.Maybe import :: Maybe
 
-:: Maybe a = Nothing | Just a
 :: HistoryItem = {line :: String, timestamp :: String}
 :: HistoryState = {entries :: [HistoryItem], offset :: Int, flags :: Int}
 
 instance toString HistoryItem
 instance toString HistoryState
 
-//Maybe functions
-isNothing :: !(Maybe .x) -> Bool
-isJust    :: !(Maybe .x) -> Bool
-fromJust  :: !(Maybe .x) -> .x
-
 //Non-library functions
 setReadLineName :: !String !*env -> *env
 
@@ -62,6 +57,6 @@ historyTruncateFile :: !String !Int !*env -> (!Bool, !*env)
 
 //History Expansion
 historyExpand :: !String !*env -> (!String, !Int, !*env)
-getHistoryEvent :: !String !Int !Int !*env -> (!String, !*env)
+getHistoryEvent :: !String !Int !Int !*env -> (!Maybe String, !Int, !*env)
 historyTokenize :: !String !*env -> ([String], !*env)
-historyArgExtract :: !Int !Int !String !*env -> (!String, !*env)
+historyArgExtract :: !Int !Int !String !*env -> (!Maybe String, !*env)