Remove trim-whitespace in favor of [ blank? ] trim.

diff --git a/basis/csv/csv.factor b/basis/csv/csv.factor
index 1aeb2e1d193ecc4488a504e03cda73d49b71f8c9..123647ac057c7b26382407d945845fb7dbb0b023 100644 (file)
--- a/basis/csv/csv.factor
+++ b/basis/csv/csv.factor
@@ -12,24 +12,21 @@ CHAR: , delimiter set-global
 <PRIVATE
 
 : delimiter> ( -- delimiter ) delimiter get ; inline
-    
+
 DEFER: quoted-field ( -- endchar )
-    
-: trim-whitespace ( str -- str )
-    [ blank? ] trim ; inline
 
 : skip-to-field-end ( -- endchar )
   "\n" delimiter> suffix read-until nip ; inline
-  
+
 : not-quoted-field ( -- endchar )
     "\"\n" delimiter> suffix read-until
     dup {
         { CHAR: "    [ 2drop quoted-field ] }
-        { delimiter> [ swap trim-whitespace % ] }
-        { CHAR: \n   [ swap trim-whitespace % ] }
-        { f          [ swap trim-whitespace % ] }
+        { delimiter> [ swap [ blank? ] trim % ] }
+        { CHAR: \n   [ swap [ blank? ] trim % ] }
+        { f          [ swap [ blank? ] trim % ] }
     } case ;
-  
+
 : maybe-escaped-quote ( -- endchar )
     read1 dup {
         { CHAR: "    [ , quoted-field ] }
@@ -37,7 +34,7 @@ DEFER: quoted-field ( -- endchar )
         { CHAR: \n   [ ] }
         [ 2drop skip-to-field-end ]
     } case ;
-  
+
 : quoted-field ( -- endchar )
     "\"" read-until
     drop % maybe-escaped-quote ;
@@ -46,7 +43,7 @@ DEFER: quoted-field ( -- endchar )
     [ not-quoted-field ] "" make  ;
 
 : (row) ( -- sep )
-    field , 
+    field ,
     dup delimiter> = [ drop (row) ] when ;
 
 : row ( -- eof? array[string] )
@@ -56,7 +53,7 @@ DEFER: quoted-field ( -- endchar )
     row
     dup [ empty? ] all? [ drop ] [ , ] if
     [ (csv) ] when ;
-  
+
 PRIVATE>
 
 : csv-row ( stream -- row )
@@ -78,7 +75,7 @@ PRIVATE>
 <PRIVATE
 
 : needs-escaping? ( cell -- ? )
-    [ { [ "\n\"" member? ] [ delimiter get = ] } 1|| ] any? ; inline
+    [ { [ "\n\"" member? ] [ delimiter> = ] } 1|| ] any? ; inline
 
 : escape-quotes ( cell -- cell' )
     [
@@ -90,22 +87,22 @@ PRIVATE>
 
 : enclose-in-quotes ( cell -- cell' )
     "\"" dup surround ; inline
-    
+
 : escape-if-required ( cell -- cell' )
     dup needs-escaping?
     [ escape-quotes enclose-in-quotes ] when ; inline
 
 PRIVATE>
-    
+
 : write-row ( row -- )
-    [ delimiter get write1 ]
+    [ delimiter> write1 ]
     [ escape-if-required write ] interleave nl ; inline
 
 <PRIVATE
 
 : (write-csv) ( rows -- )
     [ write-row ] each ;
-    
+
 PRIVATE>
 
 : write-csv ( rows stream -- )
@@ -113,5 +110,5 @@ PRIVATE>
 
 : csv>string ( csv -- string )
     [ (write-csv) ] with-string-writer ;
-    
+
 : csv>file ( rows path encoding -- ) <file-writer> write-csv ;

diff --git a/basis/xml/writer/writer.factor b/basis/xml/writer/writer.factor
index ab957ebc75a70c7cc1516eb265eda0b43a522831..3a23108dd5a6fc42e73688f7bd2e46b4797211ed 100644 (file)
--- a/basis/xml/writer/writer.factor
+++ b/basis/xml/writer/writer.factor
@@ -31,12 +31,9 @@ SYMBOL: indentation
 : unindent ( -- )\r
     xml-pprint? get [ -1 indentation +@ ] when ;\r
 \r
-: trim-whitespace ( string -- no-whitespace )\r
-    [ blank? ] trim ;\r
-\r
 : ?filter-children ( children -- no-whitespace )\r
     xml-pprint? get [\r
-        [ dup string? [ trim-whitespace ] when ] map\r
+        [ dup string? [ [ blank? ] trim ] when ] map\r
         [ [ empty? ] [ string? ] bi and not ] filter\r
     ] when ;\r
 \r