finish stream-write-attr/stream-write1 split

diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index ae333cab08d6447cb7776d52233e20b1922fa869..718d764facba359fbe8806ffac8642d57437ee50 100644 (file)
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -65,7 +65,6 @@ Investigate:
 - nappend: instead of using push, enlarge the sequence with set-length\r
   then add set the elements with set-nth\r
 - specialized arrays\r
-- phase out sbuf-append\r
 \r
 + kernel:\r
 \r
@@ -89,7 +88,6 @@ Investigate:
 - reading and writing byte arrays\r
 - clean up line reading code in win32-io\r
 - unix io: handle \n\r and \n\0\r
-- separate words for writing characters and strings\r
 - stream server can hang because of exception handler limitations\r
 - better i/o scheduler\r
 - unify unparse and prettyprint\r

diff --git a/library/collections/namespaces.factor b/library/collections/namespaces.factor
index fab5d8de1f031f9f8d9a514b3427957780e39f19..9c8ef4888b4224425d2a545f2f5d5b96617b2753 100644 (file)
--- a/library/collections/namespaces.factor
+++ b/library/collections/namespaces.factor
@@ -109,13 +109,7 @@ SYMBOL: building
 
 : , ( obj -- )
     #! Add to the sequence being built with make-seq.
-    ! The behavior where a string can be passed is deprecated;
-    ! use % instead!
-    building get dup sbuf? [
-        over string? [ swap nappend ] [ push ] ifte
-    ] [
-        push
-    ] ifte ;
+    building get push ;
 
 : unique, ( obj -- )
     #! Add the object to the sequence being built with make-seq

diff --git a/library/io/buffer.factor b/library/io/buffer.factor
index 624fa879435487d83d7961c205856aeea0f24c8f..0da40f7db51b7bed4682821ebedfdd105106c303 100644 (file)
--- a/library/io/buffer.factor
+++ b/library/io/buffer.factor
@@ -37,6 +37,8 @@ C: buffer ( size -- buffer )
 
 : buffer@ ( buffer -- int ) dup buffer-ptr swap buffer-pos + ;
 
+: buffer-end ( buffer -- int ) dup buffer-ptr swap buffer-fill + ;
+
 : buffer-first-n ( count buffer -- string )
     [ dup buffer-fill swap buffer-pos - min ] keep
     buffer@ swap memory>string ;
@@ -62,10 +64,10 @@ C: buffer ( size -- buffer )
     2dup buffer-ptr swap realloc check-ptr
     over set-buffer-ptr set-buffer-size ;
 
-: check-overflow ( string buffer -- )
-    over length over buffer-capacity > [
+: check-overflow ( length buffer -- )
+    2dup buffer-capacity > [
         dup eof? [
-            >r length r> buffer-extend
+            buffer-extend
         ] [
             "Buffer overflow" throw
         ] ifte
@@ -74,30 +76,21 @@ C: buffer ( size -- buffer )
     ] ifte ;
 
 : >buffer ( string buffer -- )
-    2dup check-overflow
-    [ dup buffer-ptr swap buffer-fill + string>memory ] 2keep
+    over length over check-overflow
+    [ buffer-end string>memory ] 2keep
     [ buffer-fill swap length + ] keep set-buffer-fill ;
 
+: ch>buffer ( char buffer -- )
+    1 over check-overflow
+    [ buffer-end <alien> 0 set-alien-unsigned-1 ] keep
+    [ buffer-fill 1 + ] keep set-buffer-fill ;
+
 : n>buffer ( count buffer -- )
     #! Increases the fill pointer by count.
     [ buffer-fill + ] keep set-buffer-fill ;
 
-: buffer-end ( buffer -- int ) dup buffer-ptr swap buffer-fill + ;
-
 : buffer-peek ( buffer -- char )
     buffer@ <alien> 0 alien-unsigned-1 ;
 
 : buffer-pop ( buffer -- char )
     [ buffer-peek  1 ] keep buffer-consume ;
-
-: buffer-append ( buffer buffer -- )
-    #! Append first buffer to second buffer.
-    2dup buffer-end over buffer-ptr rot buffer-fill memcpy
-    >r buffer-fill r> n>buffer ;
-
-: buffer-set ( string buffer -- )
-    2dup buffer-ptr string>memory
-    >r length r> buffer-reset ;
-
-: string>buffer ( string -- buffer )
-    dup length <buffer> tuck buffer-set ;

diff --git a/library/io/c-streams.factor b/library/io/c-streams.factor
index 239cd9b1f3a269b1498a695bee83643fb9f9fea2..e93180899b98f053b827de14e98658f6000f6b11 100644 (file)
--- a/library/io/c-streams.factor
+++ b/library/io/c-streams.factor
@@ -16,8 +16,7 @@ M: c-stream stream-write1 ( char stream -- )
     >r ch>string r> c-stream-out fwrite ;
 
 M: c-stream stream-write-attr ( str style stream -- )
-    nip >r dup string? [ ch>string ] unless r>
-    c-stream-out fwrite ;
+    nip c-stream-out fwrite ;
 
 M: c-stream stream-read1 ( stream -- str )
     c-stream-in dup [ fgetc ] when ;

diff --git a/library/io/string-streams.factor b/library/io/string-streams.factor
index dee33b278c3e4f92773229fc1e9fcde0a270c4d0..2db2cf436b92f092becedcee52163c40298b89fa 100644 (file)
--- a/library/io/string-streams.factor
+++ b/library/io/string-streams.factor
@@ -2,10 +2,7 @@ USING: io kernel math namespaces sequences strings ;
 
 ! String buffers support the stream output protocol.
 M: sbuf stream-write1 push ;
-
-M: sbuf stream-write-attr
-    nip over string? [ swap nappend ] [ push ] ifte ;
-
+M: sbuf stream-write-attr rot nappend drop ;
 M: sbuf stream-close drop ;
 M: sbuf stream-flush drop ;
 M: sbuf stream-auto-flush drop ;

diff --git a/library/test/io/buffer.factor b/library/test/io/buffer.factor
index 2106c08682c3c265dc890fe42bee8106931d051c..49d023641a9882d28206b677e2b9ee9c61e999cd 100644 (file)
--- a/library/test/io/buffer.factor
+++ b/library/test/io/buffer.factor
@@ -1,5 +1,17 @@
 IN: temporary
-USING: kernel io-internals test ;
+USING: io-internals kernel kernel-internals sequences test ;
+
+: buffer-append ( buffer buffer -- )
+    #! Append first buffer to second buffer.
+    2dup buffer-end over buffer-ptr rot buffer-fill memcpy
+    >r buffer-fill r> n>buffer ;
+
+: buffer-set ( string buffer -- )
+    2dup buffer-ptr string>memory
+    >r length r> buffer-reset ;
+
+: string>buffer ( string -- buffer )
+    dup length <buffer> tuck buffer-set ;
 
 [ "" 65536 ] [
     65536 <buffer>

diff --git a/library/tools/jedit-wire.factor b/library/tools/jedit-wire.factor
index a0c7c39a20b4efdf778f585266b0180a1d6b8552..6fa3de69588f5b38e2f98e17c2b46e773b40445a 100644 (file)
--- a/library/tools/jedit-wire.factor
+++ b/library/tools/jedit-wire.factor
@@ -38,20 +38,20 @@ prettyprint sequences io strings words styles ;
 ! 4 bytes -- length. -1 means EOF
 ! remaining -- input
 : jedit-write-attr ( str style -- )
-    CHAR: w write
+    CHAR: w write1
     [ drop . f . ] string-out
     dup write-len write ;
 
 TUPLE: jedit-stream ;
 
 M: jedit-stream stream-readln ( stream -- str )
-    [ CHAR: r write flush 4 read be> read ] with-wrapper ;
+    [ CHAR: r write1 flush 4 read be> read ] with-wrapper ;
 
 M: jedit-stream stream-write-attr ( str style stream -- )
     [ jedit-write-attr ] with-wrapper ;
 
 M: jedit-stream stream-flush ( stream -- )
-    [ CHAR: f write flush ] with-wrapper ;
+    [ CHAR: f write1 flush ] with-wrapper ;
 
 C: jedit-stream ( stream -- stream )
     [ >r <wrapper-stream> r> set-delegate ] keep ;

diff --git a/library/unix/io.factor b/library/unix/io.factor
index c6065450813ff3c6fbfdce57ddd472dc360c48b2..ec86637e99cbea84053cc56949f9c52c53fa9704 100644 (file)
--- a/library/unix/io.factor
+++ b/library/unix/io.factor
@@ -293,17 +293,11 @@ M: port stream-auto-flush ( stream -- ) drop ;
 : wait-to-write ( len port -- )
     tuck can-write? [ dup stream-flush ] unless pending-error ;
 
-: blocking-write1 ( str writer -- )
-    1 over wait-to-write >buffer ;
-
 M: port stream-write1 ( char writer -- )
-    nip >r dup string? [ ch>string ] unless r> blocking-write ;
-
-: blocking-write ( str writer -- )
-    over length over wait-to-write >buffer ;
+    1 over wait-to-write ch>buffer ;
 
 M: port stream-write-attr ( string style writer -- )
-    nip >r dup string? [ ch>string ] unless r> blocking-write ;
+    nip over length over wait-to-write >buffer ;
 
 M: port stream-close ( stream -- )
     dup stream-flush