remove submodules'

diff --git a/.gitmodules b/.gitmodules
index 6292283..e69de29 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "cloogle-sub"]
-       path = cloogle-sub
-       url = https://github.com/clean-cloogle/cloogle.git

diff --git a/IRC.dcl b/IRC.dcl
index cc3e4b2..4681254 100644 (file)
--- a/IRC.dcl
+++ b/IRC.dcl
@@ -69,7 +69,7 @@ instance toInt IRCReplies, IRCErrors
        | TIME (Maybe String)
        | TOPIC String (Maybe String)
        | TRACE (Maybe String)
-       | USER String String String
+       | USER String String String String
        | USERHOST CSepList
        | USERS (Maybe String)
        | VERSION (Maybe String)

diff --git a/README.md b/README.md
index 156b32e..44bc317 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,14 +1,11 @@
 # clean-irc
 IRC library for Clean
 
-*DOES NOT WORK ATM*
-
 ## Test
 ```
-make && ./test | nc irc.freenode.net 6667
+make && ./test -b | nc irc.freenode.net 6667
 ```
 
 ## Todo
-- Implement more commands
-- Check comma separated parses
+- Check the commands one more time on syntax
 - Make a bot interface

diff --git a/cloogle-sub b/cloogle-sub
deleted file mode 160000 (submodule)
index ac8e331..0000000
--- a/cloogle-sub
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ac8e33102880d63c6a9f9bc33c3d2e412d7a5ac4

diff --git a/cloogle.icl b/cloogle.icl
index de14724..9d8b2db 100644 (file)
--- a/cloogle.icl
+++ b/cloogle.icl
@@ -31,8 +31,8 @@ import TCPIP
 commands :: [String]
 commands = map toString
        [NICK "clooglebot" Nothing
-       ,USER "cloogle" "0" "Cloogle bot"
-       ,JOIN [("#cloogle", Nothing)]
+       ,USER "cloogle" "0" "cloogle" "Cloogle bot"
+       ,JOIN (CSepList ["#cloogle"])
        ]
 
 TIMEOUT :== Just 10000

diff --git a/test.icl b/test.icl
index d67e97d..fce0299 100644 (file)
--- a/test.icl
+++ b/test.icl
@@ -6,10 +6,11 @@ import Data.Maybe
 import StdEnv
 import IRC
 
-Start :: [String]
-Start = map toString
+from Text import class Text(concat), instance Text String
+
+Start = concat $ map toString
        [NICK "clooglebot" Nothing
-       ,USER "cloogle" "0" "Cloogle bot"
+       ,USER "cloogle" "0" "cloogle" "Cloogle bot"
        ,JOIN (CSepList ["#cloogle"]) Nothing
        ,PRIVMSG (CSepList ["#cloogle"]) "Hello world"
        ,QUIT Nothing