basis/extra: builder fixes for recent cleanups

[factor.git] / basis / hashtables / sequences / sequences.factor

diff --git a/basis/hashtables/sequences/sequences.factor b/basis/hashtables/sequences/sequences.factor
index fed14608ed5225c77794fa5b2e314af646ecff6d..b521f62dd09ddeebede7e6ebece47d6b83a441d4 100644 (file)
--- a/basis/hashtables/sequences/sequences.factor
+++ b/basis/hashtables/sequences/sequences.factor
@@ -1,12 +1,15 @@
 ! Copyright (C) 2011 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 
-USING: accessors assocs combinators hashtables
-hashtables.wrapped kernel parser sequences vocabs.loader ;
+USING: accessors assocs hashtables hashtables.wrapped kernel
+math parser sequences vocabs.loader ;
 
 IN: hashtables.sequences
 
-TUPLE: sequence-wrapper < wrapped-key ;
+<PRIVATE
+
+TUPLE: sequence-wrapper
+    { underlying sequence read-only } ;
 
 C: <sequence-wrapper> sequence-wrapper
 
@@ -18,9 +21,11 @@ M: sequence-wrapper equal?
 M: sequence-wrapper hashcode*
     underlying>> [ sequence-hashcode ] recursive-hashcode ; inline
 
+PRIVATE>
+
 TUPLE: sequence-hashtable < wrapped-hashtable ;
 
-: <sequence-hashtable> ( n -- ihash )
+: <sequence-hashtable> ( n -- shashtable )
     <hashtable> sequence-hashtable boa ; inline
 
 M: sequence-hashtable wrap-key drop <sequence-wrapper> ;
@@ -31,6 +36,8 @@ M: sequence-hashtable clone
 : >sequence-hashtable ( assoc -- shashtable )
     [ assoc-size <sequence-hashtable> ] keep assoc-union! ;
 
+M: sequence-hashtable new-assoc drop <sequence-hashtable> ;
+
 SYNTAX: SH{ \ } [ >sequence-hashtable ] parse-literal ;
 
 { "hashtables.sequences" "prettyprint" } "hashtables.sequences.prettyprint" require-when