core: trim using lists with lint.vocabs tool

[factor.git] / core / alien / strings / strings.factor

diff --git a/core/alien/strings/strings.factor b/core/alien/strings/strings.factor
index c14a8a5cd46b6ac2657fcab3cd909d28727e4a56..a33ed2274c679c67b5049f3dfb5d49fe1345d4ce 100644 (file)
--- a/core/alien/strings/strings.factor
+++ b/core/alien/strings/strings.factor
@@ -1,13 +1,13 @@
 ! Copyright (C) 2008, 2011 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien arrays byte-arrays byte-vectors init io
-io.encodings io.encodings.ascii io.encodings.utf16n
+USING: accessors alien arrays byte-arrays byte-vectors io
+io.encodings io.encodings.ascii io.encodings.utf16
 io.encodings.utf8 io.streams.memory kernel kernel.private math
 namespaces sequences sequences.private strings strings.private
 system system.private ;
 IN: alien.strings
 
-GENERIC# alien>string 1 ( c-ptr encoding -- string/f )
+GENERIC#: alien>string 1 ( c-ptr encoding -- string/f )
 
 M: c-ptr alien>string
     [ <memory-stream> ] [ <decoder> ] bi*
@@ -21,24 +21,24 @@ M: f alien>string
 
 ERROR: invalid-c-string string ;
 
-: check-string ( string -- )
+: check-c-string ( string -- )
     0 over member-eq? [ invalid-c-string ] [ drop ] if ;
 
-GENERIC# string>alien 1 ( string encoding -- byte-array )
+GENERIC#: string>alien 1 ( string encoding -- byte-array )
 
 M: c-ptr string>alien drop ;
 
 <PRIVATE
 
 : fast-string? ( string encoding -- ? )
-    [ aux>> not ] [ { ascii utf8 } member-eq? ] bi* and ; inline
+    swap aux>> not [ { ascii utf8 } member-eq? ] [ drop f ] if ; inline
 
 : string>alien-fast ( string encoding -- byte-array )
     { string object } declare ! aux>> must be f
     drop [ length ] keep over [
         1 + (byte-array) [
             [
-                [ [ string-nth-fast ] 2keep drop ]
+                [ [ string-nth-fast ] keepd ]
                 [ set-nth-unsafe ] bi*
             ] 2curry each-integer
         ] keep
@@ -53,7 +53,7 @@ M: c-ptr string>alien drop ;
 PRIVATE>
 
 M: string string>alien
-    over check-string
+    over check-c-string
     2dup fast-string?
     [ string>alien-fast ]
     [ string>alien-slow ] if ;
@@ -63,6 +63,7 @@ M: tuple string>alien drop underlying>> ;
 HOOK: native-string-encoding os ( -- encoding ) foldable
 
 M: unix native-string-encoding utf8 ;
+
 M: windows native-string-encoding utf16n ;
 
 : alien>native-string ( alien -- string )
@@ -80,15 +81,20 @@ M: string string>symbol utf8 string>alien ;
 
 M: sequence string>symbol [ utf8 string>alien ] map ;
 
-: (symbol>string) ( alien -- str )
-    utf8 alien>string ;
-
 GENERIC: symbol>string ( symbol(s) -- string )
-M: byte-array symbol>string (symbol>string) ;
-M: array symbol>string [ (symbol>string) ] map ", " join ;
-
-[
-    OBJ-CPU special-object utf8 alien>string string>cpu \ cpu set-global
-    OBJ-OS special-object utf8 alien>string string>os \ os set-global
-    OBJ-VM-COMPILER special-object utf8 alien>string \ vm-compiler set-global
-] "alien.strings" add-startup-hook
+
+M: byte-array symbol>string utf8 alien>string ;
+
+M: array symbol>string [ utf8 alien>string ] map ", " join ;
+
+: special-object>string ( n -- str )
+    special-object utf8 alien>string ;
+
+STARTUP-HOOK: [
+    OBJ-CPU special-object>string string>cpu \ cpu set-global
+    OBJ-OS special-object>string string>os \ os set-global
+    OBJ-VM-VERSION special-object>string \ vm-version set-global
+    OBJ-VM-GIT-LABEL special-object>string \ vm-git-label set-global
+    OBJ-VM-COMPILER special-object>string \ vm-compiler set-global
+    OBJ-VM-COMPILE-TIME special-object>string \ vm-compile-time set-global
+]