Move the host word from dns to tools.dns

diff --git a/basis/tools/dns/authors.txt b/basis/tools/dns/authors.txt
new file mode 100644 (file)
index 0000000..7c1b2f2
--- /dev/null
+++ b/basis/tools/dns/authors.txt
@@ -0,0 +1 @@
+Doug Coleman

diff --git a/basis/tools/dns/dns.factor b/basis/tools/dns/dns.factor
new file mode 100644 (file)
index 0000000..f59a9da
--- /dev/null
+++ b/basis/tools/dns/dns.factor
@@ -0,0 +1,24 @@
+! Copyright (C) 2010 Doug Coleman.
+! See http://factorcode.org/license.txt for BSD license.
+USING: dns io kernel math.parser sequences ;
+IN: tools.dns
+
+: a-line. ( host ip -- )
+    [ write " has address " write ] [ print ] bi* ;
+
+: a-message. ( message -- )
+    [ message>query-name ] [ message>names ] bi
+    [ a-line. ] with each ;
+
+: mx-line. ( host pair -- )
+    [ write " mail is handled by " write ]
+    [ first2 [ number>string write bl ] [ print ] bi* ] bi* ;
+
+: mx-message. ( message -- )
+    [ message>query-name ] [ message>mxs ] bi
+    [ mx-line. ] with each ;
+
+: host ( domain -- )
+    [ dns-A-query a-message. ]
+    [ dns-AAAA-query a-message. ]
+    [ dns-MX-query mx-message. ] tri ;

diff --git a/extra/dns/dns.factor b/extra/dns/dns.factor
index 63c071be808fba78ba0ce419e4801fbe6fb33f86..ea8b0625cfcd8ce52984f4c67036b4e9a03d2385 100644 (file)
--- a/extra/dns/dns.factor
+++ b/extra/dns/dns.factor
@@ -369,26 +369,6 @@ M: SOA rdata>byte-array
 : message>query-name ( message -- string )
     query>> first name>> dotted> ;
 
-: a-line. ( host ip -- )
-    [ write " has address " write ] [ print ] bi* ;
-
-: a-message. ( message -- )
-    [ message>query-name ] [ message>names ] bi
-    [ a-line. ] with each ;
-
-: mx-line. ( host pair -- )
-    [ write " mail is handled by " write ]
-    [ first2 [ number>string write bl ] [ print ] bi* ] bi* ;
-
-: mx-message. ( message -- )
-    [ message>query-name ] [ message>mxs ] bi
-    [ mx-line. ] with each ;
-
-: host ( domain -- )
-    [ dns-A-query a-message. ]
-    [ dns-AAAA-query a-message. ]
-    [ dns-MX-query mx-message. ] tri ;
-
 USE: nested-comments
 (*
 M: string resolve-host