Fix bootstrap

core/bootstrap/primitives.factor

@@ -58,16 +58,13 @@ num-types get f <array> builtins set
     "alien.accessors"
     "arrays"
     "bit-arrays"
-    "bit-vectors"
     "byte-arrays"
-    "byte-vectors"
     "classes.private"
     "classes.tuple"
     "classes.tuple.private"
     "compiler.units"
     "continuations.private"
     "float-arrays"
-    "float-vectors"
     "generator"
     "growable"
     "hashtables"
@@ -455,54 +452,6 @@ tuple
     }
 } define-tuple-class
 
-"byte-vector" "byte-vectors" create
-tuple
-{
-    {
-        { "byte-array" "byte-arrays" }
-        "underlying"
-        { "underlying" "growable" }
-        { "set-underlying" "growable" }
-    } {
-        { "array-capacity" "sequences.private" }
-        "fill"
-        { "length" "sequences" }
-        { "set-fill" "growable" }
-    }
-} define-tuple-class
-
-"bit-vector" "bit-vectors" create
-tuple
-{
-    {
-        { "bit-array" "bit-arrays" }
-        "underlying"
-        { "underlying" "growable" }
-        { "set-underlying" "growable" }
-    } {
-        { "array-capacity" "sequences.private" }
-        "fill"
-        { "length" "sequences" }
-        { "set-fill" "growable" }
-    }
-} define-tuple-class
-
-"float-vector" "float-vectors" create
-tuple
-{
-    {
-        { "float-array" "float-arrays" }
-        "underlying"
-        { "underlying" "growable" }
-        { "set-underlying" "growable" }
-    } {
-        { "array-capacity" "sequences.private" }
-        "fill"
-        { "length" "sequences" }
-        { "set-fill" "growable" }
-    }
-} define-tuple-class
-
 "curry" "kernel" create
 tuple
 {

core/bootstrap/syntax.factor

@@ -14,16 +14,13 @@ IN: bootstrap.syntax
     ";"
     "<PRIVATE"
     "?{"
-    "?V{"
     "BIN:"
     "B{"
-    "BV{"
     "C:"
     "CHAR:"
     "DEFER:"
     "ERROR:"
     "F{"
-    "FV{"
     "FORGET:"
     "GENERIC#"
     "GENERIC:"

core/prettyprint/backend/backend.factor

@@ -152,9 +152,6 @@ GENERIC: >pprint-sequence ( obj -- seq )
 M: object >pprint-sequence ;
 
 M: vector >pprint-sequence ;
-M: bit-vector >pprint-sequence ;
-M: byte-vector >pprint-sequence ;
-M: float-vector >pprint-sequence ;
 M: curry >pprint-sequence ;
 M: compose >pprint-sequence ;
 M: hashtable >pprint-sequence >alist ;

core/syntax/syntax.factor

@@ -1,10 +1,10 @@
 ! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien arrays bit-arrays bit-vectors byte-arrays
+USING: alien arrays bit-arrays byte-arrays
-byte-vectors definitions generic hashtables kernel math
+definitions generic hashtables kernel math
 namespaces parser sequences strings sbufs vectors words
 quotations io assocs splitting classes.tuple generic.standard
-generic.math classes io.files vocabs float-arrays float-vectors
+generic.math classes io.files vocabs float-arrays
 classes.union classes.mixin classes.predicate classes.singleton
 compiler.units combinators debugger ;
 IN: bootstrap.syntax

extra/bit-vectors/bit-vectors.factor

@@ -5,6 +5,16 @@ sequences.private growable bit-arrays prettyprint.backend
 parser ;
 IN: bit-vectors
 
+TUPLE: bit-vector underlying fill ;
+
+M: bit-vector underlying underlying>> { bit-array } declare ;
+
+M: bit-vector set-underlying (>>underlying) ;
+
+M: bit-vector length fill>> { array-capacity } declare ;
+
+M: bit-vector set-fill (>>fill) ;
+
 <PRIVATE
 
 : bit-array>vector ( bit-array length -- bit-vector )
@@ -15,7 +25,8 @@ PRIVATE>
 : <bit-vector> ( n -- bit-vector )
     <bit-array> 0 bit-array>vector ; inline
 
-: >bit-vector ( seq -- bit-vector ) ?V{ } clone-like ;
+: >bit-vector ( seq -- bit-vector )
+    T{ bit-vector f ?{ } 0 } clone-like ;
 
 M: bit-vector like
     drop dup bit-vector? [
@@ -35,4 +46,6 @@ INSTANCE: bit-vector growable
 
 : ?V \ } [ >bit-vector ] parse-literal ; parsing
 
+M: bit-vector >pprint-sequence ;
+
 M: bit-vector pprint-delims drop \ ?V{ \ } ;

extra/byte-vectors/byte-vectors.factor

@@ -2,9 +2,19 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays kernel kernel.private math sequences
 sequences.private growable byte-arrays prettyprint.backend
-parser ;
+parser accessors ;
 IN: byte-vectors
 
+TUPLE: byte-vector underlying fill ;
+
+M: byte-vector underlying underlying>> { byte-array } declare ;
+
+M: byte-vector set-underlying (>>underlying) ;
+
+M: byte-vector length fill>> { array-capacity } declare ;
+
+M: byte-vector set-fill (>>fill) ;
+
 <PRIVATE
 
 : byte-array>vector ( byte-array length -- byte-vector )
@@ -15,7 +25,8 @@ PRIVATE>
 : <byte-vector> ( n -- byte-vector )
     <byte-array> 0 byte-array>vector ; inline
 
-: >byte-vector ( seq -- byte-vector ) BV{ } clone-like ;
+: >byte-vector ( seq -- byte-vector )
+    T{ byte-vector f B{ } 0 } clone-like ;
 
 M: byte-vector like
     drop dup byte-vector? [
@@ -35,4 +46,6 @@ INSTANCE: byte-vector growable
 
 : BV{ \ } [ >byte-vector ] parse-literal ; parsing
 
+M: byte-vector >pprint-sequence ;
+
 M: byte-vector pprint-delims drop \ BV{ \ } ;

extra/float-vectors/float-vectors.factor

@@ -5,6 +5,16 @@ sequences.private growable float-arrays prettyprint.backend
 parser ;
 IN: float-vectors
 
+TUPLE: float-vector underlying fill ;
+
+M: float-vector underlying underlying>> { float-array } declare ;
+
+M: float-vector set-underlying (>>underlying) ;
+
+M: float-vector length fill>> { array-capacity } declare ;
+
+M: float-vector set-fill (>>fill) ;
+
 <PRIVATE
 
 : float-array>vector ( float-array length -- float-vector )
@@ -15,7 +25,8 @@ PRIVATE>
 : <float-vector> ( n -- float-vector )
     0.0 <float-array> 0 float-array>vector ; inline
 
-: >float-vector ( seq -- float-vector ) FV{ } clone-like ;
+: >float-vector ( seq -- float-vector )
+    T{ float-vector f F{ } 0 } clone-like ;
 
 M: float-vector like
     drop dup float-vector? [
@@ -35,4 +46,6 @@ INSTANCE: float-vector growable
 
 : FV{ \ } [ >float-vector ] parse-literal ; parsing
 
+M: float-vector >pprint-sequence ;
+
 M: float-vector pprint-delims drop \ FV{ \ } ;