Merge branch 'experimental'

extra/trees/splay/splay-tests.factor

@@ -1,6 +1,6 @@
 ! Copyright (c) 2005 Mackenzie Straight.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel tools.test splay-trees namespaces assocs
+USING: kernel tools.test trees.splay math namespaces assocs
 sequences random ;
 IN: temporary
 

extra/trees/splay/splay.factor

@@ -1,7 +1,7 @@
 ! Copyright (c) 2005 Mackenzie Straight.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel math combinators assocs parser ;
-IN: splay-trees
+IN: trees.splay
 
 TUPLE: splay-tree r count ;
 INSTANCE: splay-tree assoc

extra/trees/splay/tags.txt

@@ -1 +1,2 @@
 collections
+trees

extra/trees/tags.txt

@@ -1 +1,2 @@
-collections trees
+collections
+trees

extra/trees/todo.txt

@@ -0,0 +1,2 @@
+- Make trees.splay use the same tree protocol as trees.binary and trees.avl
+- Make all trees follow the assoc protocol

extra/trees/trees.factor

@@ -1,6 +1,7 @@
 ! Copyright (C) 2007 Alex Chapman
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel generic math math.parser sequences arrays io namespaces namespaces.private random layouts ;
+USING: kernel generic math math.parser sequences arrays io namespaces
+namespaces.private random layouts ;
 IN: trees
 
 TUPLE: tree root ;