more cleanup for H{ } make.

diff --git a/basis/http/server/cgi/cgi.factor b/basis/http/server/cgi/cgi.factor
index d2f453034a2de702d4211606b9b9c99688360d83..3089694e1316a9878bcd2dd15b137f9fbc5d1562 100644 (file)
--- a/basis/http/server/cgi/cgi.factor
+++ b/basis/http/server/cgi/cgi.factor
@@ -3,43 +3,43 @@
 USING: namespaces kernel assocs io.files io.streams.duplex\r
 combinators arrays io.launcher io.encodings io.encodings.binary io\r
 http.server.static http.server http accessors sequences strings\r
-math.parser fry urls urls.encoding calendar ;\r
+math.parser fry urls urls.encoding calendar make ;\r
 IN: http.server.cgi\r
 \r
 : cgi-variables ( script-path -- assoc )\r
     #! This needs some work.\r
     [\r
-        "CGI/1.0" "GATEWAY_INTERFACE" set\r
-        "HTTP/" request get version>> append "SERVER_PROTOCOL" set\r
-        "Factor" "SERVER_SOFTWARE" set\r
+        "CGI/1.0" "GATEWAY_INTERFACE" ,,\r
+        "HTTP/" request get version>> append "SERVER_PROTOCOL" ,,\r
+        "Factor" "SERVER_SOFTWARE" ,,\r
 \r
-        [ "PATH_TRANSLATED" set ] [ "SCRIPT_FILENAME" set ] bi\r
+        [ "PATH_TRANSLATED" ,, ] [ "SCRIPT_FILENAME" ,, ] bi\r
 \r
-        url get path>> "SCRIPT_NAME" set\r
+        url get path>> "SCRIPT_NAME" ,,\r
 \r
-        url get host>> "SERVER_NAME" set\r
-        url get port>> number>string "SERVER_PORT" set\r
-        "" "PATH_INFO" set\r
-        "" "REMOTE_HOST" set\r
-        "" "REMOTE_ADDR" set\r
-        "" "AUTH_TYPE" set\r
-        "" "REMOTE_USER" set\r
-        "" "REMOTE_IDENT" set\r
+        url get host>> "SERVER_NAME" ,,\r
+        url get port>> number>string "SERVER_PORT" ,,\r
+        "" "PATH_INFO" ,,\r
+        "" "REMOTE_HOST" ,,\r
+        "" "REMOTE_ADDR" ,,\r
+        "" "AUTH_TYPE" ,,\r
+        "" "REMOTE_USER" ,,\r
+        "" "REMOTE_IDENT" ,,\r
 \r
-        request get method>> "REQUEST_METHOD" set\r
-        url get query>> assoc>query "QUERY_STRING" set\r
-        request get "cookie" header "HTTP_COOKIE" set \r
+        request get method>> "REQUEST_METHOD" ,,\r
+        url get query>> assoc>query "QUERY_STRING" ,,\r
+        request get "cookie" header "HTTP_COOKIE" ,,\r
 \r
-        request get "user-agent" header "HTTP_USER_AGENT" set\r
-        request get "accept" header "HTTP_ACCEPT" set\r
+        request get "user-agent" header "HTTP_USER_AGENT" ,,\r
+        request get "accept" header "HTTP_ACCEPT" ,,\r
 \r
         post-request? [\r
             request get post-data>> data>>\r
-            [ "CONTENT_TYPE" set ]\r
-            [ length number>string "CONTENT_LENGTH" set ]\r
+            [ "CONTENT_TYPE" ,, ]\r
+            [ length number>string "CONTENT_LENGTH" ,, ]\r
             bi\r
         ] when\r
-    ] H{ } make-assoc ;\r
+    ] H{ } make ;\r
 \r
 : <cgi-process> ( name -- desc )\r
     <process>\r

diff --git a/basis/xml-rpc/xml-rpc.factor b/basis/xml-rpc/xml-rpc.factor
index 70f5d4d16dac08fd69380f1d401b4993e6955f7c..18c1a79db943e0ca4cc7e7ce7e00d05a9f48fb10 100644 (file)
--- a/basis/xml-rpc/xml-rpc.factor
+++ b/basis/xml-rpc/xml-rpc.factor
@@ -3,8 +3,8 @@
 USING: accessors arrays assocs base64 calendar calendar.format
 combinators debugger generic hashtables http http.client
 http.client.private io io.encodings.string io.encodings.utf8
-kernel math math.order math.parser namespaces sequences strings
-xml xml.data xml.syntax xml.traversal xml.writer ;
+kernel make math math.order math.parser namespaces sequences
+strings xml xml.data xml.syntax xml.traversal xml.writer ;
 IN: xml-rpc
 
 ! * Sending RPC requests
@@ -134,12 +134,12 @@ TAG: boolean xml>item
 : unstruct-member ( tag -- )
     children-tags first2
     first-child-tag xml>item
-    [ children>string ] dip swap set ;
+    [ children>string ] dip swap ,, ;
 
 TAG: struct xml>item
     [
         children-tags [ unstruct-member ] each
-    ] H{ } make-assoc ;
+    ] H{ } make ;
 
 TAG: base64 xml>item
     children>string base64> <base64> ;