Get contrib/aim/ to load

contrib/aim/aim.factor

@@ -1,7 +1,7 @@
 ! All Talk
 
 IN: aim-internals
-USING: kernel sequences lists prettyprint strings namespaces math threads vectors errors parser interpreter test io crypto words hashtables inspector aim-internals generic queues arrays ;
+USING: kernel sequences prettyprint strings namespaces math threads vectors errors parser interpreter test io crypto words hashtables inspector aim-internals generic queues arrays ;
 
 SYMBOL: username
 SYMBOL: password
@@ -261,15 +261,12 @@ M: object get-banned ( name -- <buddy> )
 : family-table ( -- hash ) H{ } ;
 
 : FAMILY: ( -- fam# )
-    scan hex> swons dup car family-table hash dup [
-        drop
-    ] [
-        drop H{ } clone over car family-table set-hash
-    ] if ; parsing
+    scan hex> dup family-table hash [
+        H{ } clone over family-table set-hash
+    ] unless ; parsing
 
 : OPCODE: ( fam# -- )
-    car family-table hash word scan hex> rot set-hash f ; parsing
-
+    family-table hash word scan hex> rot set-hash ; parsing
 
 ! Generic, Capabilities
 : send-generic-capabilities

contrib/aim/load.factor

@@ -1,8 +1,6 @@
 IN: scratchpad
 USING: kernel parser sequences words compiler ;
 
-"/contrib/crypto/load.factor" run-resource
-
 { 
     "net-bytes"
     "aim"

contrib/aim/net-bytes.factor

@@ -1,5 +1,5 @@
 IN: aim-internals
-USING: kernel sequences lists prettyprint strings namespaces math threads vectors errors parser interpreter test io crypto arrays ;
+USING: kernel sequences prettyprint strings namespaces math threads vectors errors parser interpreter test io crypto arrays ;
 
 SYMBOL: big-endian t big-endian set
 SYMBOL: unscoped-stream
@@ -31,7 +31,7 @@ SYMBOL: unscoped-stack
 
 ! TODO: make this work for types other than ""
 : papply ( seq seq -- seq )
-    [ [ 2array >list call % ] 2each ] "" make ;
+    [ [ 2array >quotation call % ] 2each ] "" make ;
 
 : writeln ( string -- )
     write terpri ;