From d5160ce79198521f8ad3eb00776849d53331ab6b Mon Sep 17 00:00:00 2001
From: Daniel Ehrenberg <littledan@Macintosh-103.local>
Date: Wed, 28 Jan 2009 15:46:34 -0600
Subject: [PATCH] Fixing USING: lines

---
 basis/http/client/client.factor  | 2 +-
 basis/http/server/server.factor  | 1 +
 basis/xml/data/data.factor       | 7 ++-----
 basis/xmode/marker/marker.factor | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/basis/http/client/client.factor b/basis/http/client/client.factor
index edfc6e312b..e7305ed372 100644
--- a/basis/http/client/client.factor
+++ b/basis/http/client/client.factor
@@ -5,7 +5,7 @@ sequences strings splitting calendar continuations accessors vectors
 math.order hashtables byte-arrays destructors
 io io.sockets io.streams.string io.files io.timeouts
 io.pathnames io.encodings io.encodings.string io.encodings.ascii
-io.encodings.utf8 io.encodings.8-bit io.encodings.binary
+io.encodings.utf8 io.encodings.8-bit io.encodings.binary io.crlf
 io.streams.duplex fry ascii urls urls.encoding present
 http http.parsers http.client.post-data ;
 IN: http.client
diff --git a/basis/http/server/server.factor b/basis/http/server/server.factor
index c9ec2c7f3e..b4af727caa 100755
--- a/basis/http/server/server.factor
+++ b/basis/http/server/server.factor
@@ -14,6 +14,7 @@ io.encodings.binary
 io.streams.limited
 io.servers.connection
 io.timeouts
+io.crlf
 fry logging logging.insomniac calendar urls urls.encoding
 mime.multipart
 unicode.categories
diff --git a/basis/xml/data/data.factor b/basis/xml/data/data.factor
index 74ad348bab..6cd975d42d 100644
--- a/basis/xml/data/data.factor
+++ b/basis/xml/data/data.factor
@@ -150,10 +150,10 @@ TUPLE: tag
     [ assure-name ] [ T{ attrs } assoc-like ] [ ] tri*
     tag boa ;
 
-: attr ( tag name -- string )
+: attr ( tag/xml name -- string )
     swap attrs>> at ;
 
-: set-attr ( tag value name -- )
+: set-attr ( tag/xml value name -- )
     rot attrs>> set-at ;
 
 ! They also follow the sequence protocol (for children)
@@ -188,9 +188,6 @@ C: <xml> xml
 CONSULT: sequence-protocol xml body>> ;
 INSTANCE: xml sequence
 
-CONSULT: assoc-protocol xml body>> ;
-INSTANCE: xml assoc
-
 CONSULT: tag xml body>> ;
 
 CONSULT: name xml body>> ;
diff --git a/basis/xmode/marker/marker.factor b/basis/xmode/marker/marker.factor
index 5d10d2ed02..ce942fbc67 100644
--- a/basis/xmode/marker/marker.factor
+++ b/basis/xmode/marker/marker.factor
@@ -5,7 +5,7 @@ USING: kernel namespaces make xmode.rules xmode.tokens
 xmode.marker.state xmode.marker.context xmode.utilities
 xmode.catalog sequences math assocs combinators strings
 parser-combinators.regexp splitting parser-combinators ascii
-ascii combinators.short-circuit accessors ;
+ascii combinators.short-circuit accessors xml.data ;
 
 ! Based on org.gjt.sp.jedit.syntax.TokenMarker