tools.test: Make the flag public. Finish porting tester changes to fuzzer.

[factor.git] / unmaintained / dns / server / server.factor

diff --git a/unmaintained/dns/server/server.factor b/unmaintained/dns/server/server.factor
index b14d765e8d09a99b2b47d55a754c26847303b36b..072e6a97089448429dd221ebe522c11a13c2ea12 100644 (file)
--- a/unmaintained/dns/server/server.factor
+++ b/unmaintained/dns/server/server.factor
@@ -1,8 +1,8 @@
 
 USING: kernel combinators sequences sets math threads namespaces continuations
-       debugger io io.sockets unicode.case accessors destructors
+       debugger io io.sockets unicode accessors destructors
        combinators.short-circuit combinators.smart
-       newfx fry arrays
+       fry arrays
        dns dns.util dns.misc ;
 
 IN: dns.server
@@ -18,7 +18,7 @@ SYMBOL: records-var
 : {name-type-class} ( obj -- array )
   [ [ name>> >lower ] [ type>> ] [ class>> ] tri ] output>array ; 
 
-: rr=query? ( obj obj -- ? ) [ {name-type-class} ] bi@ = ;
+: rr=query? ( obj obj -- ? ) [ {name-type-class} ] same? ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -64,7 +64,7 @@ SYMBOL: records-var
   [ rr->rdata-names ] map concat ;
 
 : extract-names ( message -- names )
-  [ message-query name>> ] [ extract-rdata-names ] bi prefix-on ;
+  [ message-query name>> ] [ extract-rdata-names ] bi swap prefix ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! fill-authority
@@ -99,7 +99,7 @@ DEFER: query->rrs
 : matching-cname? ( query -- rrs/f )
   [ ] [ clone CNAME >>type matching-rrs ] bi ! query rrs
   [ empty? not ]
-    [ 1st swap clone over rdata>> >>name query->rrs prefix-on ]
+    [ first swap clone over rdata>> >>name query->rrs swap prefix ]
     [ 2drop f ]
   1if ;
 
@@ -120,7 +120,7 @@ DEFER: query->rrs
 ! have-delegates?
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: cdr-name ( name -- name ) dup CHAR: . index 1+ tail ;
+: cdr-name ( name -- name ) dup CHAR: . index 1 + tail ;
 
 : is-soa? ( name -- ? ) SOA IN query boa matching-rrs empty? not ;
 
@@ -164,7 +164,7 @@ DEFER: query->rrs
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : is-nx ( message -- message/f )
-  [ message-query name>> records [ name>> = ] with filter empty? ]
+  [ message-query name>> records [ name>> = ] with any? not ]
     [
       NAME-ERROR >>rcode
       dup