Update a few places that used string C type names to use words; fixes some deploy...

diff --git a/basis/cairo/cairo.factor b/basis/cairo/cairo.factor
index 074798a1b21bad4ad62ab62bf2edf61e9bae2661..38398ae228c4209a10492828ea37346c91c6105b 100755 (executable)
--- a/basis/cairo/cairo.factor
+++ b/basis/cairo/cairo.factor
@@ -16,7 +16,7 @@ ERROR: cairo-error message ;
 
 : check-surface ( surface -- ) cairo_surface_status (check-cairo) ;
 
-: width>stride ( width -- stride ) "uint" heap-size * ; inline
+: width>stride ( width -- stride ) uint heap-size * ; inline
 
 : <image-surface> ( data dim -- surface )
     [ CAIRO_FORMAT_ARGB32 ] dip first2 over width>stride

diff --git a/basis/db/sqlite/lib/lib.factor b/basis/db/sqlite/lib/lib.factor
index 163026f5ff2031bd3158b0db4135845a71a904e7..53034d148ab5aa194429655b8b5ad8182bd48b4e 100644 (file)
--- a/basis/db/sqlite/lib/lib.factor
+++ b/basis/db/sqlite/lib/lib.factor
@@ -32,14 +32,14 @@ ERROR: sqlite-sql-error < sql-error n string ;
 
 : sqlite-open ( path -- db )
     normalize-path
-    "void*" <c-object>
+    void* <c-object>
     [ sqlite3_open sqlite-check-result ] keep *void* ;
 
 : sqlite-close ( db -- )
     sqlite3_close sqlite-check-result ;
 
 : sqlite-prepare ( db sql -- handle )
-    utf8 encode dup length "void*" <c-object> "void*" <c-object>
+    utf8 encode dup length void* <c-object> void* <c-object>
     [ sqlite3_prepare_v2 sqlite-check-result ] 2keep
     drop *void* ;
 

diff --git a/basis/images/memory/memory.factor b/basis/images/memory/memory.factor
index ccf891d770f4458687d432dbdfdc6b543160ab35..883a0975118ddbdefb2c5db9f985e307686df227 100644 (file)
--- a/basis/images/memory/memory.factor
+++ b/basis/images/memory/memory.factor
@@ -10,7 +10,7 @@ IN: images.memory
 
 <PRIVATE
 
-: bitmap-size ( dim -- n ) product "uint" heap-size * ;
+: bitmap-size ( dim -- n ) product uint heap-size * ;
 
 : malloc-bitmap-data ( dim -- alien ) bitmap-size 1 calloc &free ;
 

diff --git a/basis/io/backend/unix/unix.factor b/basis/io/backend/unix/unix.factor
index ebb8f1ec05c9367050661c2ecd736221bbf08779..a8070525c7d3ca676b5d3d2389811de801d5043a 100644 (file)
--- a/basis/io/backend/unix/unix.factor
+++ b/basis/io/backend/unix/unix.factor
@@ -5,7 +5,7 @@ kernel.private math io.ports sequences strings sbufs threads
 unix vectors io.buffers io.backend io.encodings math.parser
 continuations system libc namespaces make io.timeouts
 io.encodings.utf8 destructors destructors.private accessors
-summary combinators locals unix.time fry
+summary combinators locals unix.time unix.types fry
 io.backend.unix.multiplexers ;
 QUALIFIED: io
 IN: io.backend.unix
@@ -151,7 +151,7 @@ M: stdin dispose*
 
 : wait-for-stdin ( stdin -- n )
     [ control>> CHAR: X over io:stream-write1 io:stream-flush ]
-    [ size>> "ssize_t" heap-size swap io:stream-read *int ]
+    [ size>> ssize_t heap-size swap io:stream-read *int ]
     bi ;
 
 :: refill-stdin ( buffer stdin size -- )

diff --git a/basis/io/files/info/windows/windows.factor b/basis/io/files/info/windows/windows.factor
index 9f0e4534e9290d0812db627a23409a06eb96edaf..d317a717bdc641cfce6f7b601e69be4d135c05a7 100755 (executable)
--- a/basis/io/files/info/windows/windows.factor
+++ b/basis/io/files/info/windows/windows.factor
@@ -20,7 +20,7 @@ IN: io.files.info.windows
 TUPLE: windows-file-info < file-info attributes ;
 
 : get-compressed-file-size ( path -- n )
-    "DWORD" <c-object> [ GetCompressedFileSize ] keep
+    DWORD <c-object> [ GetCompressedFileSize ] keep
     over INVALID_FILE_SIZE = [
         win32-error-string throw
     ] [
@@ -100,9 +100,9 @@ M: windows link-info ( path -- info )
 
 : volume-information ( normalized-path -- volume-name volume-serial max-component flags type )
     MAX_PATH 1 + [ <ushort-array> ] keep
-    "DWORD" <c-object>
-    "DWORD" <c-object>
-    "DWORD" <c-object>
+    DWORD <c-object>
+    DWORD <c-object>
+    DWORD <c-object>
     MAX_PATH 1 + [ <ushort-array> ] keep
     [ GetVolumeInformation win32-error=0/f ] 7 nkeep
     drop 5 nrot drop
@@ -110,9 +110,9 @@ M: windows link-info ( path -- info )
     utf16n alien>string ;
 
 : file-system-space ( normalized-path -- available-space total-space free-space )
-    "ULARGE_INTEGER" <c-object>
-    "ULARGE_INTEGER" <c-object>
-    "ULARGE_INTEGER" <c-object>
+    ULARGE_INTEGER <c-object>
+    ULARGE_INTEGER <c-object>
+    ULARGE_INTEGER <c-object>
     [ GetDiskFreeSpaceEx win32-error=0/f ] 3keep ;
 
 : calculate-file-system-info ( file-system-info -- file-system-info' )
@@ -160,7 +160,7 @@ M: winnt file-system-info ( path -- file-system-info )
     ret 0 = [
         ret win32-error-string throw
     ] [
-        names names-length *uint "ushort" heap-size * head
+        names names-length *uint ushort heap-size * head
         utf16n alien>string CHAR: \0 split
     ] if ;
 

diff --git a/basis/io/files/windows/windows.factor b/basis/io/files/windows/windows.factor
index ca5c9b3c4aa35713dd64c2d5b147f9f91ccbc942..3a088a17302f510921bfc1a17e988e0997b20532 100755 (executable)
--- a/basis/io/files/windows/windows.factor
+++ b/basis/io/files/windows/windows.factor
@@ -64,7 +64,7 @@ C: <FileArgs> FileArgs
         [ handle>> handle>> ]
         [ buffer>> ]
         [ buffer>> buffer-length ]
-        [ drop "DWORD" <c-object> ]
+        [ drop DWORD <c-object> ]
         [ FileArgs-overlapped ]
     } cleave <FileArgs> ;
 

diff --git a/basis/io/sockets/unix/unix.factor b/basis/io/sockets/unix/unix.factor
index 71ad5a57582a91b7aa4866cc4497e01dc6a5953a..cdf7e54408337a1da0fb7a9e0de6ff800b6abc07 100755 (executable)
--- a/basis/io/sockets/unix/unix.factor
+++ b/basis/io/sockets/unix/unix.factor
@@ -17,7 +17,7 @@ IN: io.sockets.unix
     0 socket dup io-error <fd> init-fd |dispose ;
 
 : set-socket-option ( fd level opt -- )
-    [ handle-fd ] 2dip 1 <int> "int" heap-size setsockopt io-error ;
+    [ handle-fd ] 2dip 1 <int> dup byte-length setsockopt io-error ;
 
 M: unix addrinfo-error ( n -- )
     [ gai_strerror throw ] unless-zero ;

diff --git a/basis/io/sockets/windows/nt/nt.factor b/basis/io/sockets/windows/nt/nt.factor
index 7cc21c961163511c4e94ca6cb0f271a95d3f4a6c..937dae347ac379f405d5ffbe7b150ed49fc1bb1f 100755 (executable)
--- a/basis/io/sockets/windows/nt/nt.factor
+++ b/basis/io/sockets/windows/nt/nt.factor
@@ -16,10 +16,10 @@ M: winnt WSASocket-flags ( -- DWORD )
     SIO_GET_EXTENSION_FUNCTION_POINTER
     WSAID_CONNECTEX
     GUID heap-size
-    "void*" <c-object>
+    void* <c-object>
     [
-        "void*" heap-size
-        "DWORD" <c-object>
+        void* heap-size
+        DWORD <c-object>
         f
         f
         WSAIoctl SOCKET_ERROR = [

diff --git a/basis/random/windows/windows.factor b/basis/random/windows/windows.factor
index 38c118de92b1e272232deb94b0d25249a9ea8877..757540c4c604d5478a8de89fd1ca407f37bad8b9 100644 (file)
--- a/basis/random/windows/windows.factor
+++ b/basis/random/windows/windows.factor
@@ -16,7 +16,7 @@ M: windows-crypto-context dispose ( tuple -- )
 CONSTANT: factor-crypto-container "FactorCryptoContainer"
 
 :: (acquire-crypto-context) ( provider type flags -- handle ret )
-    "HCRYPTPROV" <c-object> :> handle
+    HCRYPTPROV <c-object> :> handle
     handle
     factor-crypto-container
     provider

diff --git a/basis/specialized-arrays/specialized-arrays-tests.factor b/basis/specialized-arrays/specialized-arrays-tests.factor
index dd561e9d468e4b4ce0f8c9230af3381b6f797b39..ef2654be4506bc8628c10a45eba3b1f39cf1d534 100755 (executable)
--- a/basis/specialized-arrays/specialized-arrays-tests.factor
+++ b/basis/specialized-arrays/specialized-arrays-tests.factor
@@ -20,7 +20,7 @@ SPECIALIZED-ARRAYS: bool ushort char uint float ulonglong ;
 
 [ t ] [
     { t f t } >bool-array underlying>>
-    { 1 0 1 } "bool" heap-size {
+    { 1 0 1 } bool heap-size {
         { 1 [ >char-array ] }
         { 4 [ >uint-array ] }
     } case underlying>> =

diff --git a/basis/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor
index e4ed7d72ae76fff9c269cba3f16e50c8264a9437..4e117e11b5dd66a3c4755c4b483cf6b52cc5582f 100755 (executable)
--- a/basis/tools/deploy/shaker/shaker.factor
+++ b/basis/tools/deploy/shaker/shaker.factor
@@ -31,7 +31,6 @@ IN: tools.deploy.shaker
     {
         "alien.strings"
         "cpu.x86"
-        "destructors"
         "environment"
         "libc"
     }

diff --git a/basis/tools/disassembler/udis/udis-tests.factor b/basis/tools/disassembler/udis/udis-tests.factor
index 9ad3dbbcc21f9999151cef79cd41218f1b80f110..df3ef413650ee23edb290071ae650936f4d56800 100644 (file)
--- a/basis/tools/disassembler/udis/udis-tests.factor
+++ b/basis/tools/disassembler/udis/udis-tests.factor
@@ -2,8 +2,8 @@ IN: tools.disassembler.udis.tests
 USING: tools.disassembler.udis tools.test alien.c-types system combinators kernel ;
 
 {
-    { [ os linux? cpu x86.64? and ] [ [ 656 ] [ "ud" heap-size ] unit-test ] }
-    { [ os macosx? cpu x86.32? and ] [ [ 592 ] [ "ud" heap-size ] unit-test ] }
-    { [ os macosx? cpu x86.64? and ] [ [ 656 ] [ "ud" heap-size ] unit-test ] }
+    { [ os linux? cpu x86.64? and ] [ [ 656 ] [ ud heap-size ] unit-test ] }
+    { [ os macosx? cpu x86.32? and ] [ [ 592 ] [ ud heap-size ] unit-test ] }
+    { [ os macosx? cpu x86.64? and ] [ [ 656 ] [ ud heap-size ] unit-test ] }
     [ ]
 } cond
\ No newline at end of file

diff --git a/basis/unix/bsd/netbsd/netbsd.factor b/basis/unix/bsd/netbsd/netbsd.factor
index 15b173c311d32095fb536132deb6533dfeb9cab2..6bef08abe3dc18224126c42c5bd7699d574825e2 100644 (file)
--- a/basis/unix/bsd/netbsd/netbsd.factor
+++ b/basis/unix/bsd/netbsd/netbsd.factor
@@ -130,7 +130,7 @@ CONSTANT: _UTX_HOSTSIZE   256
 CONSTANT: _SS_MAXSIZE 128
 
 : _SS_ALIGNSIZE ( -- n )
-    "__int64_t" heap-size ; inline
+    __int64_t heap-size ; inline
     
 : _SS_PAD1SIZE ( -- n )
     _SS_ALIGNSIZE 2 - ; inline

diff --git a/basis/windows/com/com.factor b/basis/windows/com/com.factor
index 9628b890fb2754e630ca083030c54cc073c3069d..33164f52c4123784765a258b70a5a5bc4c89032f 100755 (executable)
--- a/basis/windows/com/com.factor
+++ b/basis/windows/com/com.factor
@@ -35,7 +35,7 @@ FUNCTION: void ReleaseStgMedium ( LPSTGMEDIUM pmedium ) ;
 
 : com-query-interface ( interface iid -- interface' )
     [
-        "void*" malloc-object &free
+        void* malloc-object &free
         [ IUnknown::QueryInterface ole32-error ] keep *void*
     ] with-destructors ;
 

diff --git a/extra/bunny/model/model.factor b/extra/bunny/model/model.factor
index b9923d5976cf74149eb920d749bb79cf11b4b842..cfe95956c050d88cf80561e586f5db4f6f22b4b1 100755 (executable)
--- a/extra/bunny/model/model.factor
+++ b/extra/bunny/model/model.factor
@@ -93,7 +93,7 @@ M: bunny-buffers bunny-geom
         { GL_VERTEX_ARRAY GL_NORMAL_ARRAY } [
             GL_FLOAT 0 0 buffer-offset glNormalPointer
             [
-                nv>> "float" heap-size * buffer-offset
+                nv>> c:float heap-size * buffer-offset
                 [ 3 GL_FLOAT 0 ] dip glVertexPointer
             ] [
                 ni>>