X-Git-Url: https://git.martlubbers.net/?p=cloogle-irc.git;a=blobdiff_plain;f=GenIRC.icl;h=e6dc8ec9ae1f6d1ed52844c279516bdcf7efe2da;hp=4a4d754a8ab2eff5ccc33b1a2e10fcae5b87cd13;hb=1c65613d8732d28f6c6c11864ccbc761918ac594;hpb=7a2a0cc9ba44d6073ae1778b07738c8d425e9cb5

diff --git a/GenIRC.icl b/GenIRC.icl
index 4a4d754..e6dc8ec 100644
--- a/GenIRC.icl
+++ b/GenIRC.icl
@@ -1,19 +1,16 @@
 implementation module GenIRC
 
-from IRC import :: IRCCommand, :: CSepList(CSepList)
-from Data.Func import $
-from StdFunc import o, const
-
-from Text.Parsers.Simple.Core import :: Error
-
-import StdList
-import StdString
+import StdEnv
 import StdGeneric
+
 import Data.Either
+import Data.Func
+import Data.Functor
 import Data.Maybe
 import Data.Tuple
-import Data.Functor
-from Text import class Text(join,split,indexOf,concat), instance Text String
+import Text
+
+import IRC
 
 pOne [] = (Left "Expected an argument", [])
 pOne [a:as] = (Right a, as)
@@ -26,7 +23,7 @@ gIRCParse{|EITHER|} lp rp as = case lp as of
 	(Right a, rest) = (Right $ LEFT a, rest)
 	(Left e1, _) = case rp as of
 		(Right a, rest) = (Right $ RIGHT a, rest)
-		(Left e2, _) = (Left $ e1 +++ " and " +++ e2, [])
+		(Left e2, _) = (Left $ e2, [])
 gIRCParse{|OBJECT|} p as = appFst (fmap OBJECT) $ p as
 gIRCParse{|CONS of d|} p []
 	= (Left $ concat ["Expected a cmd constructor: ", d.gcd_name], [])