From 07072cfe733a724f925d9d6c2f2ec10f1e866505 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Tue, 21 Jun 2016 12:12:01 -0700 Subject: [PATCH] factor: rename destructor: library: c-type: to upper --- .../io/files/acls/macosx/macosx.factor | 2 +- .../io/files/trash/windows/windows.factor | 2 +- ffi/atk/ffi/ffi.factor | 2 +- ffi/cairo/ffi/ffi.factor | 6 +- ffi/clutter/cally/ffi/ffi.factor | 2 +- ffi/clutter/cogl/ffi/ffi.factor | 2 +- ffi/clutter/ffi/ffi.factor | 2 +- ffi/clutter/gtk/ffi/ffi.factor | 2 +- ffi/clutter/json/ffi/ffi.factor | 2 +- ffi/core-foundation/core-foundation.factor | 2 +- .../dictionaries/dictionaries.factor | 4 +- .../file-descriptors/file-descriptors.factor | 2 +- ffi/core-graphics/core-graphics.factor | 4 +- ffi/cuda/contexts/contexts.factor | 4 +- ffi/cuda/ffi/ffi.factor | 2 +- ffi/cuda/gl/ffi/ffi.factor | 2 +- ffi/cuda/gl/gl.factor | 4 +- ffi/cuda/memory/memory.factor | 2 +- ffi/curl/curl.factor | 4 +- ffi/curl/ffi/ffi.factor | 2 +- ffi/curses/ffi/ffi.factor | 4 +- ffi/ecdsa/ecdsa.factor | 4 +- ffi/fftw/ffi/ffi.factor | 4 +- ffi/forestdb/ffi/ffi.factor | 2 +- ffi/freetype/freetype.factor | 8 +-- ffi/gdbm/ffi/ffi.factor | 4 +- ffi/gdbm/gdbm.factor | 2 +- ffi/gdk/ffi/ffi.factor | 6 +- ffi/gdk/gl/ffi/ffi.factor | 2 +- ffi/gdk/pixbuf/ffi/ffi.factor | 2 +- ffi/gio/ffi/ffi.factor | 2 +- ffi/glib/ffi/ffi.factor | 6 +- ffi/gmodule/ffi/ffi.factor | 2 +- ffi/gobject/ffi/ffi.factor | 4 +- ffi/gstreamer/base/ffi/ffi.factor | 2 +- ffi/gstreamer/controller/ffi/ffi.factor | 2 +- ffi/gstreamer/ffi/ffi.factor | 2 +- ffi/gstreamer/net/ffi/ffi.factor | 2 +- ffi/gtk/ffi/ffi.factor | 4 +- ffi/gtk/gl/ffi/ffi.factor | 2 +- ffi/ifaddrs/ifaddrs.factor | 2 +- ffi/libtls/ffi/ffi.factor | 10 ++-- ffi/libudev/libudev.factor | 14 ++--- ffi/libusb/libusb.factor | 10 ++-- ffi/lua/lua.factor | 6 +- ffi/ogg/ogg.factor | 2 +- ffi/ogg/theora/theora.factor | 6 +- ffi/ogg/vorbis/vorbis.factor | 2 +- ffi/openal/alut/alut.factor | 2 +- ffi/openal/alut/macosx/macosx.factor | 2 +- ffi/openal/alut/other/other.factor | 2 +- ffi/openal/openal.factor | 10 ++-- ffi/opencl/ffi/ffi.factor | 20 +++---- ffi/opengl/gl/gl.factor | 4 +- ffi/opengl/gl/windows/windows.factor | 2 +- ffi/opengl/glu/glu.factor | 18 +++--- ffi/openssl/libcrypto/libcrypto.factor | 8 +-- ffi/openssl/libssl/libssl.factor | 18 +++--- ffi/pango/cairo/ffi/ffi.factor | 2 +- ffi/pango/ffi/ffi.factor | 6 +- ffi/pcre/ffi/ffi.factor | 2 +- ffi/python/ffi/ffi.factor | 8 +-- ffi/readline/ffi/ffi.factor | 2 +- ffi/system-info/macosx/macosx.factor | 2 +- ffi/unix/ffi/ffi.factor | 2 +- ffi/unix/types/types.factor | 10 ++-- ffi/windows/advapi32/advapi32.factor | 2 +- ffi/windows/com/com.factor | 10 ++-- ffi/windows/crypt32/crypt32.factor | 2 +- ffi/windows/ddk/hid/hid.factor | 4 +- ffi/windows/ddk/setupapi/setupapi.factor | 4 +- ffi/windows/ddk/winusb/winusb.factor | 2 +- ffi/windows/directx/d2d1/d2d1.factor | 28 ++++----- ffi/windows/directx/d3d10/d3d10.factor | 4 +- ffi/windows/directx/d3d10_1/d3d10_1.factor | 2 +- .../d3d10_1shader/d3d10_1shader.factor | 4 +- .../directx/d3d10effect/d3d10effect.factor | 28 ++++----- .../directx/d3d10misc/d3d10misc.factor | 4 +- .../directx/d3d10shader/d3d10shader.factor | 2 +- ffi/windows/directx/d3d11/d3d11.factor | 6 +- .../directx/d3d11shader/d3d11shader.factor | 6 +- ffi/windows/directx/d3d9/d3d9.factor | 6 +- .../directx/d3dcompiler/d3dcompiler.factor | 10 ++-- ffi/windows/directx/d3dcsx/d3dcsx.factor | 2 +- .../directx/d3dx10async/d3dx10async.factor | 12 ++-- .../directx/d3dx10core/d3dx10core.factor | 6 +- .../directx/d3dx10mesh/d3dx10mesh.factor | 2 +- .../directx/d3dx10tex/d3dx10tex.factor | 2 +- .../directx/d3dx11async/d3dx11async.factor | 2 +- .../directx/d3dx11core/d3dx11core.factor | 2 +- .../directx/d3dx11tex/d3dx11tex.factor | 2 +- .../directx/d3dx9anim/d3dx9anim.factor | 18 +++--- .../directx/d3dx9core/d3dx9core.factor | 18 +++--- .../directx/d3dx9effect/d3dx9effect.factor | 12 ++-- .../directx/d3dx9math/d3dx9math.factor | 4 +- .../directx/d3dx9mesh/d3dx9mesh.factor | 32 +++++----- .../directx/d3dx9shader/d3dx9shader.factor | 8 +-- .../directx/d3dx9shape/d3dx9shape.factor | 2 +- ffi/windows/directx/d3dx9tex/d3dx9tex.factor | 2 +- ffi/windows/directx/d3dx9xof/d3dx9xof.factor | 12 ++-- ffi/windows/directx/dinput/dinput.factor | 2 +- ffi/windows/directx/dwrite/dwrite.factor | 22 +++---- ffi/windows/directx/dxfile/dxfile.factor | 16 ++--- ffi/windows/directx/dxgi/dxgi.factor | 4 +- ffi/windows/directx/x3daudio/x3daudio.factor | 2 +- ffi/windows/directx/xact3/xact3.factor | 20 +++---- ffi/windows/directx/xapofx/xapofx.factor | 2 +- ffi/windows/directx/xaudio2/xaudio2.factor | 14 ++--- ffi/windows/directx/xinput/xinput.factor | 2 +- ffi/windows/dwmapi/dwmapi.factor | 2 +- ffi/windows/gdi32/gdi32.factor | 6 +- ffi/windows/gdiplus/gdiplus.factor | 58 +++++++++---------- ffi/windows/iphlpapi/iphlpapi.factor | 2 +- ffi/windows/kernel32/kernel32.factor | 2 +- ffi/windows/ntdll/ntdll.factor | 2 +- ffi/windows/ole32/ole32.factor | 2 +- ffi/windows/opengl32/opengl32.factor | 2 +- ffi/windows/psapi/psapi.factor | 2 +- ffi/windows/shell32/shell32.factor | 2 +- ffi/windows/user32/user32.factor | 2 +- ffi/windows/usp10/usp10.factor | 8 +-- ffi/windows/winmm/winmm.factor | 2 +- ffi/windows/winsock/winsock.factor | 6 +- ffi/x11/glx/glx.factor | 2 +- ffi/x11/xinput2/ffi/ffi.factor | 2 +- ffi/x11/xlib/xlib.factor | 14 ++--- frameworks/db/postgresql/ffi/ffi.factor | 20 +++---- frameworks/db/sqlite/ffi/ffi.factor | 6 +- frameworks/game/input/gtk/gtk.factor | 2 +- .../cxx/demangle/libstdcxx/libstdcxx.factor | 2 +- language/alien/destructors/destructors.factor | 2 +- language/alien/handles/handles.factor | 4 +- libs/chipmunk/ffi/ffi.factor | 20 +++---- libs/compression/snappy/ffi/ffi.factor | 2 +- libs/compression/zlib/ffi/ffi.factor | 2 +- libs/libc/libc.factor | 6 +- libs/libc/linux/linux.factor | 2 +- libs/libc/macosx/macosx.factor | 2 +- libs/libc/windows/windows.factor | 4 +- libs/magic/ffi/ffi.factor | 4 +- libs/math/blas/ffi/ffi.factor | 2 +- libs/math/libm/libm.factor | 2 +- libs/random/c/c.factor | 2 +- libs/tokyo/alien/tcadb/tcadb.factor | 2 +- libs/tokyo/alien/tcbdb/tcbdb.factor | 2 +- libs/tokyo/alien/tchdb/tchdb.factor | 6 +- libs/tokyo/alien/tcrdb/tcrdb.factor | 6 +- libs/tokyo/alien/tctdb/tctdb.factor | 12 ++-- libs/tokyo/alien/tcutil/tcutil.factor | 4 +- libs/yaml/ffi/ffi.factor | 14 ++--- libs/zeromq/ffi/ffi.factor | 2 +- tools/file-picker/linux/linux.factor | 2 +- tools/file-picker/windows/windows.factor | 2 +- tools/tools/disassembler/udis/udis.factor | 2 +- 154 files changed, 446 insertions(+), 446 deletions(-) diff --git a/collections/io/files/acls/macosx/macosx.factor b/collections/io/files/acls/macosx/macosx.factor index 1dc6ba8c98..a23f78af29 100644 --- a/collections/io/files/acls/macosx/macosx.factor +++ b/collections/io/files/acls/macosx/macosx.factor @@ -34,7 +34,7 @@ PRIVATE< : free-acl ( acl -- ) acl_free acl-error ; -destructor: free-acl +DESTRUCTOR: free-acl : get-acl-entry ( acl_t n -- acl_entry_t ) f acl_entry_t [ acl_get_entry ] keep swap -1 = [ drop f ] when ; diff --git a/collections/io/files/trash/windows/windows.factor b/collections/io/files/trash/windows/windows.factor index f2aa675a2f..48901409d1 100644 --- a/collections/io/files/trash/windows/windows.factor +++ b/collections/io/files/trash/windows/windows.factor @@ -10,7 +10,7 @@ IN: io.files.trash.windows PRIVATE< -library: shell32 +LIBRARY: shell32 TYPEDEF: WORD FILEOP_FLAGS ; diff --git a/ffi/atk/ffi/ffi.factor b/ffi/atk/ffi/ffi.factor index a60065b89a..fabb0bf5f5 100644 --- a/ffi/atk/ffi/ffi.factor +++ b/ffi/atk/ffi/ffi.factor @@ -6,7 +6,7 @@ IN: atk.ffi COMPILE< "gobject.ffi" require COMPILE> -library: atk +LIBRARY: atk COMPILE< "atk" { { [ os windows? ] [ "libatk-1.0-0.dll" ] } diff --git a/ffi/cairo/ffi/ffi.factor b/ffi/cairo/ffi/ffi.factor index bc3e60b58e..e94a86482d 100644 --- a/ffi/cairo/ffi/ffi.factor +++ b/ffi/cairo/ffi/ffi.factor @@ -14,7 +14,7 @@ COMPILE< "cairo" { { [ os unix? ] [ "libcairo.so" ] } } cond cdecl add-library COMPILE> -library: cairo +LIBRARY: cairo FUNCTION: int cairo_version ( ) ; FUNCTION: c-string cairo_version_string ( ) ; @@ -92,7 +92,7 @@ FUNCTION: cairo_t* cairo_reference ( cairo_t* cr ) ; FUNCTION: void cairo_destroy ( cairo_t* cr ) ; -destructor: cairo_destroy +DESTRUCTOR: cairo_destroy FUNCTION: uint cairo_get_reference_count ( cairo_t* cr ) ; @@ -614,7 +614,7 @@ FUNCTION: void cairo_surface_finish ( cairo_surface_t* surface ) ; FUNCTION: void cairo_surface_destroy ( cairo_surface_t* surface ) ; -destructor: cairo_surface_destroy +DESTRUCTOR: cairo_surface_destroy FUNCTION: uint cairo_surface_get_reference_count ( cairo_surface_t* surface ) ; diff --git a/ffi/clutter/cally/ffi/ffi.factor b/ffi/clutter/cally/ffi/ffi.factor index d06112933f..70d6682437 100644 --- a/ffi/clutter/cally/ffi/ffi.factor +++ b/ffi/clutter/cally/ffi/ffi.factor @@ -9,7 +9,7 @@ COMPILE< "clutter.ffi" require COMPILE> -library: clutter.cally +LIBRARY: clutter.cally COMPILE< "clutter.cally" { diff --git a/ffi/clutter/cogl/ffi/ffi.factor b/ffi/clutter/cogl/ffi/ffi.factor index a4e6f38f68..98c58590f4 100644 --- a/ffi/clutter/cogl/ffi/ffi.factor +++ b/ffi/clutter/cogl/ffi/ffi.factor @@ -8,7 +8,7 @@ COMPILE< "gobject.ffi" require COMPILE> -library: clutter.cogl +LIBRARY: clutter.cogl COMPILE< "clutter.cogl" { diff --git a/ffi/clutter/ffi/ffi.factor b/ffi/clutter/ffi/ffi.factor index 188e97063d..10fa1732ee 100644 --- a/ffi/clutter/ffi/ffi.factor +++ b/ffi/clutter/ffi/ffi.factor @@ -12,7 +12,7 @@ COMPILE< "clutter.json.ffi" require COMPILE> -library: clutter +LIBRARY: clutter COMPILE< "clutter" { diff --git a/ffi/clutter/gtk/ffi/ffi.factor b/ffi/clutter/gtk/ffi/ffi.factor index 22327b248d..e15eae0874 100644 --- a/ffi/clutter/gtk/ffi/ffi.factor +++ b/ffi/clutter/gtk/ffi/ffi.factor @@ -9,7 +9,7 @@ COMPILE< "gtk.ffi" require COMPILE> -library: clutter.gtk +LIBRARY: clutter.gtk COMPILE< "clutter.gtk" { diff --git a/ffi/clutter/json/ffi/ffi.factor b/ffi/clutter/json/ffi/ffi.factor index 3e68d23430..384ba96392 100644 --- a/ffi/clutter/json/ffi/ffi.factor +++ b/ffi/clutter/json/ffi/ffi.factor @@ -9,7 +9,7 @@ COMPILE< "gio.ffi" require COMPILE> -library: clutter.json +LIBRARY: clutter.json COMPILE< "clutter.json" { diff --git a/ffi/core-foundation/core-foundation.factor b/ffi/core-foundation/core-foundation.factor index 1b0e4cb653..94e40b19ab 100644 --- a/ffi/core-foundation/core-foundation.factor +++ b/ffi/core-foundation/core-foundation.factor @@ -40,4 +40,4 @@ FUNCTION: CFTypeRef CFRetain ( CFTypeRef cf ) ; FUNCTION: void CFRelease ( CFTypeRef cf ) ; -destructor: CFRelease +DESTRUCTOR: CFRelease diff --git a/ffi/core-foundation/dictionaries/dictionaries.factor b/ffi/core-foundation/dictionaries/dictionaries.factor index e4668cc3d6..0d514ab233 100644 --- a/ffi/core-foundation/dictionaries/dictionaries.factor +++ b/ffi/core-foundation/dictionaries/dictionaries.factor @@ -8,8 +8,8 @@ SPECIALIZED-ARRAY: void* TYPEDEF: void* CFDictionaryRef ; TYPEDEF: void* CFMutableDictionaryRef ; -c-type: CFDictionaryKeyCallBacks -c-type: CFDictionaryValueCallBacks +C-TYPE: CFDictionaryKeyCallBacks +C-TYPE: CFDictionaryValueCallBacks FUNCTION: CFDictionaryRef CFDictionaryCreate ( CFAllocatorRef allocator, diff --git a/ffi/core-foundation/file-descriptors/file-descriptors.factor b/ffi/core-foundation/file-descriptors/file-descriptors.factor index 93c4714269..61308e4382 100644 --- a/ffi/core-foundation/file-descriptors/file-descriptors.factor +++ b/ffi/core-foundation/file-descriptors/file-descriptors.factor @@ -13,7 +13,7 @@ CALLBACK: void CFFileDescriptorCallBack ( void *info ) ; -c-type: CFFileDescriptorContext +C-TYPE: CFFileDescriptorContext FUNCTION: CFFileDescriptorRef CFFileDescriptorCreate ( CFAllocatorRef allocator, diff --git a/ffi/core-graphics/core-graphics.factor b/ffi/core-graphics/core-graphics.factor index aa5b13f62b..cd158aac62 100644 --- a/ffi/core-graphics/core-graphics.factor +++ b/ffi/core-graphics/core-graphics.factor @@ -69,11 +69,11 @@ FUNCTION: CGImageRef CGBitmapContextCreateImage ( FUNCTION: void CGColorSpaceRelease ( CGColorSpaceRef ref ) ; -destructor: CGColorSpaceRelease +DESTRUCTOR: CGColorSpaceRelease FUNCTION: void CGContextRelease ( CGContextRef ref ) ; -destructor: CGContextRelease +DESTRUCTOR: CGContextRelease FUNCTION: void CGContextSetRGBStrokeColor ( CGContextRef c, diff --git a/ffi/cuda/contexts/contexts.factor b/ffi/cuda/contexts/contexts.factor index b5fc2001e6..3674b4e686 100644 --- a/ffi/cuda/contexts/contexts.factor +++ b/ffi/cuda/contexts/contexts.factor @@ -23,8 +23,8 @@ IN: cuda.contexts : clean-up-context ( context -- ) [ sync-context ] ignore-errors destroy-context ; inline -destructor: destroy-context -destructor: clean-up-context +DESTRUCTOR: destroy-context +DESTRUCTOR: clean-up-context : (with-cuda-context) ( context quot -- ) swap '[ _ clean-up-context ] [ ] cleanup ; inline diff --git a/ffi/cuda/ffi/ffi.factor b/ffi/cuda/ffi/ffi.factor index 4df2905463..635c9aaf79 100644 --- a/ffi/cuda/ffi/ffi.factor +++ b/ffi/cuda/ffi/ffi.factor @@ -11,7 +11,7 @@ COMPILE< } cond add-library COMPILE> -library: cuda +LIBRARY: cuda TYPEDEF: uint CUdeviceptr ; TYPEDEF: int CUdevice ; diff --git a/ffi/cuda/gl/ffi/ffi.factor b/ffi/cuda/gl/ffi/ffi.factor index 7e34a80af3..c58dda3c59 100644 --- a/ffi/cuda/gl/ffi/ffi.factor +++ b/ffi/cuda/gl/ffi/ffi.factor @@ -2,7 +2,7 @@ USING: alien.c-types alien.syntax cuda.ffi opengl.gl ; IN: cuda.gl.ffi -library: cuda +LIBRARY: cuda FUNCTION: CUresult cuGLCtxCreate ( CUcontext* pCtx, uint Flags, CUdevice device ) ; FUNCTION: CUresult cuGraphicsGLRegisterBuffer ( CUgraphicsResource* pCudaResource, GLuint buffer, uint Flags ) ; diff --git a/ffi/cuda/gl/gl.factor b/ffi/cuda/gl/gl.factor index db9bad40ba..e5aa2ef118 100644 --- a/ffi/cuda/gl/gl.factor +++ b/ffi/cuda/gl/gl.factor @@ -30,12 +30,12 @@ IN: cuda.gl : unmap-resource ( resource -- ) 1 swap void* f cuGraphicsUnmapResources cuda-error ; inline -destructor: unmap-resource +DESTRUCTOR: unmap-resource : free-resource ( resource -- ) cuGraphicsUnregisterResource cuda-error ; inline -destructor: free-resource +DESTRUCTOR: free-resource : with-mapped-resource ( ..a resource quot: ( ..a device-ptr size -- ..b ) -- ..b ) over [ map-resource ] 2dip '[ _ unmap-resource ] [ ] cleanup ; inline diff --git a/ffi/cuda/memory/memory.factor b/ffi/cuda/memory/memory.factor index 4049848fd9..c67f6ea765 100644 --- a/ffi/cuda/memory/memory.factor +++ b/ffi/cuda/memory/memory.factor @@ -17,7 +17,7 @@ IN: cuda.memory : cuda-free ( ptr -- ) cuMemFree cuda-error ; inline -destructor: cuda-free +DESTRUCTOR: cuda-free : memcpy-device>device ( dest-ptr src-ptr count -- ) cuMemcpyDtoD cuda-error ; inline diff --git a/ffi/curl/curl.factor b/ffi/curl/curl.factor index 38adf7f24a..8ad799d9f1 100644 --- a/ffi/curl/curl.factor +++ b/ffi/curl/curl.factor @@ -10,9 +10,9 @@ IN: curl PRIVATE< -destructor: curl_easy_cleanup +DESTRUCTOR: curl_easy_cleanup -destructor: fclose +DESTRUCTOR: fclose : check-code ( code -- ) CURLE_OK assert= ; diff --git a/ffi/curl/ffi/ffi.factor b/ffi/curl/ffi/ffi.factor index 704b892b2f..0e8f5c01fe 100644 --- a/ffi/curl/ffi/ffi.factor +++ b/ffi/curl/ffi/ffi.factor @@ -9,7 +9,7 @@ COMPILE< "curl" { { [ os unix? ] [ "libcurl.so" ] } } cond cdecl add-library COMPILE> -library: curl +LIBRARY: curl ! curl.h diff --git a/ffi/curses/ffi/ffi.factor b/ffi/curses/ffi/ffi.factor index fc4882f473..a11dc9819c 100644 --- a/ffi/curses/ffi/ffi.factor +++ b/ffi/curses/ffi/ffi.factor @@ -10,7 +10,7 @@ COMPILE< "curses" { { [ os unix? ] [ "ncursesw" find-library ] } } cond cdecl add-library COMPILE> -c-type: SCREEN +C-TYPE: SCREEN TYPEDEF: void* va_list ; TYPEDEF: uint chtype ; @@ -81,7 +81,7 @@ STRUCT: MEVENT { x int } { y int } { z int } { bstate mmask_t } ; -library: curses +LIBRARY: curses C-GLOBAL: void* stdscr ; diff --git a/ffi/ecdsa/ecdsa.factor b/ffi/ecdsa/ecdsa.factor index 1be1be48ae..f08c505f9c 100644 --- a/ffi/ecdsa/ecdsa.factor +++ b/ffi/ecdsa/ecdsa.factor @@ -21,9 +21,9 @@ M: ec-key dispose : ec-key-handle ( -- handle ) ec-key get dup handle>> [ nip ] [ already-disposed ] if* ; -destructor: BN_clear_free +DESTRUCTOR: BN_clear_free -destructor: EC_POINT_clear_free +DESTRUCTOR: EC_POINT_clear_free PRIVATE> diff --git a/ffi/fftw/ffi/ffi.factor b/ffi/fftw/ffi/ffi.factor index 301db5d87f..5ac7591f5f 100644 --- a/ffi/fftw/ffi/ffi.factor +++ b/ffi/fftw/ffi/ffi.factor @@ -6,7 +6,7 @@ alien.libraries.finder alien.syntax combinators kernel system ; IN: fftw.ffi -library: fftw3 +LIBRARY: fftw3 COMPILE< "fftw3" { { [ os windows? ] [ "libfftw3-3.dll" ] } @@ -40,4 +40,4 @@ FUNCTION: void fftw_execute ( fftw_plan p ) ; FUNCTION: void fftw_free ( void* p ) ; -destructor: fftw_free +DESTRUCTOR: fftw_free diff --git a/ffi/forestdb/ffi/ffi.factor b/ffi/forestdb/ffi/ffi.factor index 6bd4adcf64..6af27416fd 100644 --- a/ffi/forestdb/ffi/ffi.factor +++ b/ffi/forestdb/ffi/ffi.factor @@ -8,7 +8,7 @@ IN: forestdb.ffi COMPILE< "forestdb" dup find-library cdecl add-library COMPILE> -library: forestdb +LIBRARY: forestdb ! Begin fdb_types.h diff --git a/ffi/freetype/freetype.factor b/ffi/freetype/freetype.factor index 85d4e2aa6f..f2183b5439 100644 --- a/ffi/freetype/freetype.factor +++ b/ffi/freetype/freetype.factor @@ -10,7 +10,7 @@ COMPILE< "freetype" { { [ t ] [ drop ] } } cond COMPILE> -library: freetype +LIBRARY: freetype TYPEDEF: uchar FT_Byte ; TYPEDEF: void* FT_Bytes ; @@ -38,8 +38,8 @@ TYPEDEF: long FT_F26Dot6 ; FUNCTION: FT_Error FT_Init_FreeType ( void* library ) ; ! circular reference between glyph and face -c-type: face -c-type: glyph +C-TYPE: face +C-TYPE: glyph STRUCT: glyph { library void* } @@ -166,7 +166,7 @@ STRUCT: FT_Bitmap { palette_mode char } { palette void* } ; -c-type: FT_Face +C-TYPE: FT_Face FUNCTION: FT_Error FT_New_Face ( void* library, FT_Char* font, FT_Long index, face* face ) ; diff --git a/ffi/gdbm/ffi/ffi.factor b/ffi/gdbm/ffi/ffi.factor index 393b5b4144..a9980ecef5 100755 --- a/ffi/gdbm/ffi/ffi.factor +++ b/ffi/gdbm/ffi/ffi.factor @@ -8,7 +8,7 @@ COMPILE< "libgdbm" { "gdbm" "gdbm3" "libgdbm-3" } find-library-from-list cdecl add-library COMPILE> -library: libgdbm +LIBRARY: libgdbm C-GLOBAL: c-string gdbm_version ; @@ -25,7 +25,7 @@ CONSTANT: GDBM_COALESCEBLKS 5 ; STRUCT: datum { dptr char* } { dsize int } ; -c-type: _GDBM_FILE +C-TYPE: _GDBM_FILE TYPEDEF: _GDBM_FILE* GDBM_FILE ; CALLBACK: void fatal_func_cb ( ) ; diff --git a/ffi/gdbm/gdbm.factor b/ffi/gdbm/gdbm.factor index 12847a06bf..a17248fbdd 100644 --- a/ffi/gdbm/gdbm.factor +++ b/ffi/gdbm/gdbm.factor @@ -64,7 +64,7 @@ SYMBOL: current-dbf [ block-size>> ] [ get-flag ] [ mode>> ] } cleave f gdbm_open [ gdbm-throw ] unless* ; -destructor: gdbm-close +DESTRUCTOR: gdbm-close : object>datum ( obj -- datum ) object>bytes [ malloc-byte-array &free ] [ length ] bi diff --git a/ffi/gdk/ffi/ffi.factor b/ffi/gdk/ffi/ffi.factor index c807c707c0..13d3bc194c 100644 --- a/ffi/gdk/ffi/ffi.factor +++ b/ffi/gdk/ffi/ffi.factor @@ -11,7 +11,7 @@ COMPILE< "gdk.pixbuf.ffi" require COMPILE> -library: gdk +LIBRARY: gdk COMPILE< "gdk" { @@ -25,7 +25,7 @@ COMPILE> STRUCT: cairo_rectangle_int_t { x int } { y int } { width int } { height int } ; -c-type: cairo_region_t +C-TYPE: cairo_region_t ! workaround> FOREIGN-RECORD-TYPE: cairo.RectangleInt cairo_rectangle_int_t ; @@ -38,7 +38,7 @@ FOREIGN-ENUM-TYPE: cairo.Content cairo_content_t ; gir: vocab:gdk/Gdk-3.0.gir -destructor: gdk_cursor_unref +DESTRUCTOR: gdk_cursor_unref STRUCT: GdkEventButton { type GdkEventType } diff --git a/ffi/gdk/gl/ffi/ffi.factor b/ffi/gdk/gl/ffi/ffi.factor index 8dfcc27387..fcd385b690 100644 --- a/ffi/gdk/gl/ffi/ffi.factor +++ b/ffi/gdk/gl/ffi/ffi.factor @@ -8,7 +8,7 @@ COMPILE< "gdk.ffi" require COMPILE> -library: gdk.gl +LIBRARY: gdk.gl COMPILE< "gdk.gl" { diff --git a/ffi/gdk/pixbuf/ffi/ffi.factor b/ffi/gdk/pixbuf/ffi/ffi.factor index 516ba44d64..b633eaaaa9 100644 --- a/ffi/gdk/pixbuf/ffi/ffi.factor +++ b/ffi/gdk/pixbuf/ffi/ffi.factor @@ -8,7 +8,7 @@ IN: gdk.pixbuf.ffi COMPILE< "gio.ffi" require COMPILE> -library: gdk.pixbuf +LIBRARY: gdk.pixbuf COMPILE< "gdk.pixbuf" { { [ os windows? ] [ "libgdk_pixbuf-2.0-0.dll" ] } diff --git a/ffi/gio/ffi/ffi.factor b/ffi/gio/ffi/ffi.factor index df0ec77d46..07dae63492 100644 --- a/ffi/gio/ffi/ffi.factor +++ b/ffi/gio/ffi/ffi.factor @@ -6,7 +6,7 @@ IN: gio.ffi COMPILE< "gobject.ffi" require COMPILE> -library: gio +LIBRARY: gio COMPILE< "gio" { { [ os windows? ] [ "libgio-2.0-0.dll" ] } diff --git a/ffi/glib/ffi/ffi.factor b/ffi/glib/ffi/ffi.factor index b24867acaf..db63b93a76 100644 --- a/ffi/glib/ffi/ffi.factor +++ b/ffi/glib/ffi/ffi.factor @@ -6,7 +6,7 @@ gobject-introspection.standard-types io.encodings.utf8 kernel system ; IN: glib.ffi -library: glib +LIBRARY: glib COMPILE< "glib" { { [ os windows? ] [ "libglib-2.0-0.dll" ] } @@ -31,8 +31,8 @@ CONSTANT: G_MAXUINT64 0xffffffffffffffff ; gir: vocab:glib/GLib-2.0.gir -destructor: g_source_unref -destructor: g_free +DESTRUCTOR: g_source_unref +DESTRUCTOR: g_free CALLBACK: gboolean GSourceFuncsPrepareFunc ( GSource* source, gint* timeout_ ) ; CALLBACK: gboolean GSourceFuncsCheckFunc ( GSource* source ) ; diff --git a/ffi/gmodule/ffi/ffi.factor b/ffi/gmodule/ffi/ffi.factor index c494d10038..f26843489e 100644 --- a/ffi/gmodule/ffi/ffi.factor +++ b/ffi/gmodule/ffi/ffi.factor @@ -6,7 +6,7 @@ IN: gmodule.ffi COMPILE< "glib.ffi" require COMPILE> -library: gmodule +LIBRARY: gmodule COMPILE< "gmodule" { { [ os windows? ] [ "libgmodule-2.0-0.dll" ] } diff --git a/ffi/gobject/ffi/ffi.factor b/ffi/gobject/ffi/ffi.factor index 248add2122..6f9b69b4fd 100644 --- a/ffi/gobject/ffi/ffi.factor +++ b/ffi/gobject/ffi/ffi.factor @@ -9,7 +9,7 @@ IN: gobject.ffi COMPILE< "glib.ffi" require COMPILE> use: glib.ffi -library: gobject +LIBRARY: gobject COMPILE< "gobject" { { [ os windows? ] [ "libgobject-2.0-0.dll" ] } @@ -29,7 +29,7 @@ forget: G_IO_ERR forget: G_IO_HUP forget: G_IO_NVAL -destructor: g_object_unref +DESTRUCTOR: g_object_unref CONSTANT: G_TYPE_INVALID $[ 0 2 shift ] ; CONSTANT: G_TYPE_NONE $[ 1 2 shift ] ; diff --git a/ffi/gstreamer/base/ffi/ffi.factor b/ffi/gstreamer/base/ffi/ffi.factor index 7380bbc464..bc15e9ba51 100644 --- a/ffi/gstreamer/base/ffi/ffi.factor +++ b/ffi/gstreamer/base/ffi/ffi.factor @@ -8,7 +8,7 @@ COMPILE< "gstreamer.ffi" require COMPILE> -library: gstreamer.base +LIBRARY: gstreamer.base COMPILE< "gstreamer.base" { diff --git a/ffi/gstreamer/controller/ffi/ffi.factor b/ffi/gstreamer/controller/ffi/ffi.factor index 207612b5ca..1b2fc58d9a 100644 --- a/ffi/gstreamer/controller/ffi/ffi.factor +++ b/ffi/gstreamer/controller/ffi/ffi.factor @@ -8,7 +8,7 @@ COMPILE< "gstreamer.ffi" require COMPILE> -library: gstreamer.controller +LIBRARY: gstreamer.controller COMPILE< "gstreamer.controller" { diff --git a/ffi/gstreamer/ffi/ffi.factor b/ffi/gstreamer/ffi/ffi.factor index b16a372aca..b491239ddd 100644 --- a/ffi/gstreamer/ffi/ffi.factor +++ b/ffi/gstreamer/ffi/ffi.factor @@ -10,7 +10,7 @@ COMPILE< "gmodule.ffi" require COMPILE> -library: gstreamer +LIBRARY: gstreamer COMPILE< "gstreamer" { diff --git a/ffi/gstreamer/net/ffi/ffi.factor b/ffi/gstreamer/net/ffi/ffi.factor index 5b7d884d73..e942173839 100644 --- a/ffi/gstreamer/net/ffi/ffi.factor +++ b/ffi/gstreamer/net/ffi/ffi.factor @@ -8,7 +8,7 @@ COMPILE< "gstreamer.ffi" require COMPILE> -library: gstreamer.net +LIBRARY: gstreamer.net COMPILE< "gstreamer.net" { diff --git a/ffi/gtk/ffi/ffi.factor b/ffi/gtk/ffi/ffi.factor index 1c5f86b8b0..92ffbd2979 100644 --- a/ffi/gtk/ffi/ffi.factor +++ b/ffi/gtk/ffi/ffi.factor @@ -11,7 +11,7 @@ COMPILE< "gdk.ffi" require COMPILE> -library: gtk +LIBRARY: gtk COMPILE< "gtk" { @@ -25,7 +25,7 @@ IMPLEMENT-STRUCTS: GtkTreeIter ; gir: vocab:gtk/Gtk-3.0.gir -destructor: gtk_widget_destroy +DESTRUCTOR: gtk_widget_destroy ! -library: gtk.gl +LIBRARY: gtk.gl COMPILE< "gtk.gl" { diff --git a/ffi/ifaddrs/ifaddrs.factor b/ffi/ifaddrs/ifaddrs.factor index 111895d4ba..9ebe63add0 100644 --- a/ffi/ifaddrs/ifaddrs.factor +++ b/ffi/ifaddrs/ifaddrs.factor @@ -23,7 +23,7 @@ FUNCTION: int getifaddrs ( ifaddrs** ifap ) ; FUNCTION: void freeifaddrs ( ifaddrs* ifp ) ; -destructor: freeifaddrs +DESTRUCTOR: freeifaddrs : interface-names ( -- ifaddrs ) [ diff --git a/ffi/libtls/ffi/ffi.factor b/ffi/libtls/ffi/ffi.factor index 567fc09af0..d0f5a7ead5 100644 --- a/ffi/libtls/ffi/ffi.factor +++ b/ffi/libtls/ffi/ffi.factor @@ -9,10 +9,10 @@ COMPILE< "libtls" { { [ os unix? ] [ "libtls.so" ] } } cond cdecl add-library COMPILE> -c-type: tls_config -c-type: tls_ctx +C-TYPE: tls_config +C-TYPE: tls_ctx -library: libtls +LIBRARY: libtls FUNCTION: int tls_init ( ) ; FUNCTION: c-string tls_error ( tls_ctx* ctx ) ; @@ -66,5 +66,5 @@ FUNCTION: ssize_t tls_read ( tls_ctx* ctx, void* buf, size_t buflen ) ; FUNCTION: ssize_t tls_write ( tls_ctx* ctx, void* buf, size_t buflen ) ; FUNCTION: int tls_close ( tls_ctx* ctx ) ; -destructor: tls_config_free -destructor: tls_free +DESTRUCTOR: tls_config_free +DESTRUCTOR: tls_free diff --git a/ffi/libudev/libudev.factor b/ffi/libudev/libudev.factor index 2633bce7fe..3da3f3a79b 100644 --- a/ffi/libudev/libudev.factor +++ b/ffi/libudev/libudev.factor @@ -6,9 +6,9 @@ IN: libudev COMPILE< "libudev" "libudev.so" cdecl add-library COMPILE> -library: libudev +LIBRARY: libudev -c-type: udev +C-TYPE: udev FUNCTION: udev* udev_ref ( udev* udev ) ; @@ -40,7 +40,7 @@ FUNCTION: void* udev_get_userdata ( udev* udev ) ; FUNCTION: void udev_set_userdata ( udev* udev, void* userdata ) ; -c-type: udev_list_entry +C-TYPE: udev_list_entry FUNCTION: udev_list_entry* udev_list_entry_get_next ( udev_list_entry* list_entry ) ; @@ -69,7 +69,7 @@ FUNCTION: c-string udev_list_entry_get_value ( : udev-list-entries ( first_entry -- seq ) [ ] collector [ udev_list_entry_foreach ] dip ; -c-type: udev_device +C-TYPE: udev_device FUNCTION: udev_device* udev_device_ref ( udev_device* udev_device ) ; @@ -175,7 +175,7 @@ FUNCTION: c-string udev_device_get_sysattr_value ( udev_device* udev_device, c-string sysattr ) ; -c-type: udev_monitor +C-TYPE: udev_monitor FUNCTION: udev_monitor* udev_monitor_ref ( udev_monitor* udev_monitor ) ; @@ -242,7 +242,7 @@ FUNCTION: int udev_monitor_filter_remove ( -c-type: udev_enumerate +C-TYPE: udev_enumerate FUNCTION: udev_enumerate* udev_enumerate_ref ( udev_enumerate* udev_enumerate ) ; @@ -324,7 +324,7 @@ FUNCTION: udev_list_entry* udev_enumerate_get_list_entry ( -c-type: udev_queue +C-TYPE: udev_queue FUNCTION: udev_queue* udev_queue_ref ( udev_queue* udev_queue ) ; diff --git a/ffi/libusb/libusb.factor b/ffi/libusb/libusb.factor index f8aa3066d3..a7b8f7b6da 100644 --- a/ffi/libusb/libusb.factor +++ b/ffi/libusb/libusb.factor @@ -12,7 +12,7 @@ COMPILE< "libusb" { { [ os macosx? ] [ "libusb-1.0.dylib" ] } { [ os unix? ] [ "libusb-1.0.so" ] } } cond cdecl add-library COMPILE> -library: libusb +LIBRARY: libusb : libusb_cpu_to_le16 ( x -- y ) 2 >native-endian le> ; inline @@ -172,9 +172,9 @@ STRUCT: libusb_control_setup : LIBUSB_CONTROL_SETUP_SIZE ( -- x ) libusb_control_setup heap-size ; inline -c-type: libusb_context -c-type: libusb_device -c-type: libusb_device_handle +C-TYPE: libusb_context +C-TYPE: libusb_device +C-TYPE: libusb_device_handle ENUM: libusb_error { LIBUSB_SUCCESS 0 } @@ -212,7 +212,7 @@ STRUCT: libusb_iso_packet_descriptor { status libusb_transfer_status } ; SPECIALIZED-ARRAY: libusb_iso_packet_descriptor -c-type: libusb_transfer +C-TYPE: libusb_transfer CALLBACK: void libusb_transfer_cb_fn ( libusb_transfer* transfer ) ; diff --git a/ffi/lua/lua.factor b/ffi/lua/lua.factor index 7233b521ef..fc39ba428a 100644 --- a/ffi/lua/lua.factor +++ b/ffi/lua/lua.factor @@ -11,7 +11,7 @@ COMPILE< "liblua5.1" { { [ os unix? ] [ "liblua5.1.so" ] } } cond cdecl add-library COMPILE> -library: liblua5.1 +LIBRARY: liblua5.1 ! luaconf.h TYPEDEF: double LUA_NUMBER ; @@ -43,7 +43,7 @@ CONSTANT: LUA_ERRSYNTAX 3 ; CONSTANT: LUA_ERRMEM 4 ; CONSTANT: LUA_ERRERR 5 ; -c-type: lua_State +C-TYPE: lua_State CALLBACK: int lua_CFunction ( lua_State* L ) ; CALLBACK: char* lua_Reader ( lua_State* L, void* ud, size_t* sz ) ; @@ -175,7 +175,7 @@ CONSTANT: LUA_HOOKTAILRET 4 ; : LUA_MASKLINE ( n -- n ) LUA_HOOKLINE shift ; inline : LUA_MASKCOUNT ( n -- n ) LUA_HOOKCOUNT shift ; inline -c-type: lua_Debug +C-TYPE: lua_Debug CALLBACK: void lua_Hook ( lua_State* L, lua_Debug* ar ) ; FUNCTION: int lua_getstack ( lua_State* L, int level, lua_Debug* ar ) ; diff --git a/ffi/ogg/ogg.factor b/ffi/ogg/ogg.factor index b8f5b563d5..9a01092c70 100644 --- a/ffi/ogg/ogg.factor +++ b/ffi/ogg/ogg.factor @@ -23,7 +23,7 @@ COMPILE< "ogg" deploy-library COMPILE> -library: ogg +LIBRARY: ogg STRUCT: oggpack-buffer { endbyte long } diff --git a/ffi/ogg/theora/theora.factor b/ffi/ogg/theora/theora.factor index 0400091ea7..8965add20e 100644 --- a/ffi/ogg/theora/theora.factor +++ b/ffi/ogg/theora/theora.factor @@ -109,7 +109,7 @@ STRUCT: th-huff-code { nbits int } ; -library: theoradec +LIBRARY: theoradec FUNCTION: c-string th_version_string ( ) ; FUNCTION: uint th_version_number ( ) ; FUNCTION: longlong th_granule_frame ( void* encdec, longlong granpos ) ; @@ -144,7 +144,7 @@ CONSTANT: TH-RATECTL-CAP-UNDERFOW 4 ; TYPEDEF: void* th-enc-ctx ; -library: theoraenc +LIBRARY: theoraenc FUNCTION: th-enc-ctx* th_encode_alloc ( th-info* info ) ; FUNCTION: int th_encode_ctl ( th-enc-ctx* enc, int req, void* buf, int buf_sz ) ; FUNCTION: int th_encode_flushheader ( th-enc-ctx* enc, th-comment* comments, ogg-packet* op ) ; @@ -171,7 +171,7 @@ STRUCT: th-stripe-callback TYPEDEF: void* th-dec-ctx ; TYPEDEF: void* th-setup-info ; -library: theoradec +LIBRARY: theoradec FUNCTION: int th_decode_headerin ( th-info* info, th-comment* tc, th-setup-info** setup, ogg-packet* op ) ; FUNCTION: th-dec-ctx* th_decode_alloc ( th-info* info, th-setup-info* setup ) ; FUNCTION: void th_setup_free ( th-setup-info* setup ) ; diff --git a/ffi/ogg/vorbis/vorbis.factor b/ffi/ogg/vorbis/vorbis.factor index 0460b4e28f..2067a52be1 100644 --- a/ffi/ogg/vorbis/vorbis.factor +++ b/ffi/ogg/vorbis/vorbis.factor @@ -24,7 +24,7 @@ COMPILE< "vorbis" deploy-library COMPILE> -library: vorbis +LIBRARY: vorbis STRUCT: vorbis-info { version int } diff --git a/ffi/openal/alut/alut.factor b/ffi/openal/alut/alut.factor index 7814b2c398..1a42e0bb06 100755 --- a/ffi/openal/alut/alut.factor +++ b/ffi/openal/alut/alut.factor @@ -18,7 +18,7 @@ COMPILE< "alut" { COMPILE< os macosx? [ "alut" deploy-library ] unless COMPILE> -library: alut +LIBRARY: alut CONSTANT: ALUT_API_MAJOR_VERSION 1 ; CONSTANT: ALUT_API_MINOR_VERSION 1 ; diff --git a/ffi/openal/alut/macosx/macosx.factor b/ffi/openal/alut/macosx/macosx.factor index a4b5da172b..ccc4238533 100755 --- a/ffi/openal/alut/macosx/macosx.factor +++ b/ffi/openal/alut/macosx/macosx.factor @@ -4,7 +4,7 @@ USING: alien.c-types alien.data kernel alien alien.syntax shuffle openal openal.alut.backend namespaces system generalizations ; IN: openal.alut.macosx -library: alut +LIBRARY: alut FUNCTION: void alutLoadWAVFile ( c-string fileName, ALenum* format, void** data, ALsizei* size, ALsizei* frequency ) ; diff --git a/ffi/openal/alut/other/other.factor b/ffi/openal/alut/other/other.factor index 4dea9a4907..8b446c3f5c 100755 --- a/ffi/openal/alut/other/other.factor +++ b/ffi/openal/alut/other/other.factor @@ -4,7 +4,7 @@ USING: alien.c-types alien.data alien.syntax combinators generalizations kernel openal openal.alut.backend ; IN: openal.alut.other -library: alut +LIBRARY: alut FUNCTION: void alutLoadWAVFile ( c-string fileName, ALenum* format, void** data, ALsizei* size, ALsizei* frequency, ALboolean* looping ) ; diff --git a/ffi/openal/openal.factor b/ffi/openal/openal.factor index c77a3c91f8..298440a4fe 100755 --- a/ffi/openal/openal.factor +++ b/ffi/openal/openal.factor @@ -19,7 +19,7 @@ COMPILE< "openal" { COMPILE< os unix? [ "openal" deploy-library ] unless COMPILE> -library: openal +LIBRARY: openal TYPEDEF: char ALboolean ; TYPEDEF: char ALchar ; @@ -178,8 +178,8 @@ FUNCTION: void alDopplerVelocity ( ALfloat value ) ; FUNCTION: void alSpeedOfSound ( ALfloat value ) ; FUNCTION: void alDistanceModel ( ALenum distanceModel ) ; -c-type: ALCdevice -c-type: ALCcontext +C-TYPE: ALCdevice +C-TYPE: ALCcontext TYPEDEF: char ALCboolean ; TYPEDEF: char ALCchar ; TYPEDEF: int ALCenum ; @@ -244,8 +244,8 @@ FUNCTION: void alcCaptureStart ( ALCdevice* device ) ; FUNCTION: void alcCaptureStop ( ALCdevice* device ) ; FUNCTION: void alcCaptureSamples ( ALCdevice* device, void* buf, ALCsizei samps ) ; -destructor: alcCloseDevice* -destructor: alcDestroyContext +DESTRUCTOR: alcCloseDevice* +DESTRUCTOR: alcDestroyContext : gen-sources ( size -- seq ) dup uint [ alGenSources ] keep ; diff --git a/ffi/opencl/ffi/ffi.factor b/ffi/opencl/ffi/ffi.factor index 5d75986255..bdbf77e985 100644 --- a/ffi/opencl/ffi/ffi.factor +++ b/ffi/opencl/ffi/ffi.factor @@ -10,7 +10,7 @@ COMPILE< "opencl" { { [ os macosx? ] [ "/System/Library/Frameworks/OpenCL.framework/OpenCL" cdecl ] } { [ os unix? ] [ "libOpenCL.so" cdecl ] } } cond add-library COMPILE> -library: opencl +LIBRARY: opencl ! cl_platform.h TYPEDEF: char cl_char ; @@ -74,15 +74,15 @@ TYPEDEF: int cl_GLint ; TYPEDEF: uint cl_GLenum ; ! cl.h -c-type: _cl_platform_id -c-type: _cl_device_id -c-type: _cl_context -c-type: _cl_command_queue -c-type: _cl_mem -c-type: _cl_program -c-type: _cl_kernel -c-type: _cl_event -c-type: _cl_sampler +C-TYPE: _cl_platform_id +C-TYPE: _cl_device_id +C-TYPE: _cl_context +C-TYPE: _cl_command_queue +C-TYPE: _cl_mem +C-TYPE: _cl_program +C-TYPE: _cl_kernel +C-TYPE: _cl_event +C-TYPE: _cl_sampler TYPEDEF: _cl_platform_id* cl_platform_id ; TYPEDEF: _cl_device_id* cl_device_id ; diff --git a/ffi/opengl/gl/gl.factor b/ffi/opengl/gl/gl.factor index dfd11daa62..dcf8a19117 100644 --- a/ffi/opengl/gl/gl.factor +++ b/ffi/opengl/gl/gl.factor @@ -24,7 +24,7 @@ TYPEDEF: double GLclampd ; TYPEDEF: longlong GLint64 ; TYPEDEF: ulonglong GLuint64 ; TYPEDEF: void* GLsync ; -c-type: GLvoid +C-TYPE: GLvoid TYPEDEF: c-string[ascii] GLstring ; @@ -625,7 +625,7 @@ CONSTANT: GL_CLIENT_VERTEX_ARRAY_BIT 0x00000002 ; CONSTANT: GL_ALL_CLIENT_ATTRIB_BITS 0xFFFFFFFF ; CONSTANT: GL_CLIENT_ALL_ATTRIB_BITS 0xFFFFFFFF ; -library: gl +LIBRARY: gl COMPILE< os linux? [ diff --git a/ffi/opengl/gl/windows/windows.factor b/ffi/opengl/gl/windows/windows.factor index 0be8e72d02..eda1e3178e 100644 --- a/ffi/opengl/gl/windows/windows.factor +++ b/ffi/opengl/gl/windows/windows.factor @@ -1,7 +1,7 @@ USING: alien alien.c-types alien.syntax kernel windows.types ; IN: opengl.gl.windows -library: gl +LIBRARY: gl FUNCTION: HGLRC wglGetCurrentContext ( ) ; FUNCTION: void* wglGetProcAddress ( c-string name ) ; diff --git a/ffi/opengl/glu/glu.factor b/ffi/opengl/glu/glu.factor index 216d89033e..de02453138 100644 --- a/ffi/opengl/glu/glu.factor +++ b/ffi/opengl/glu/glu.factor @@ -14,13 +14,13 @@ os { COMPILE> -library: glu +LIBRARY: glu ! These are defined as structs in glu.h, but we only ever use pointers to them -c-type: GLUnurbs -c-type: GLUquadric -c-type: GLUtesselator -c-type: GLubyte +C-TYPE: GLUnurbs +C-TYPE: GLUquadric +C-TYPE: GLUtesselator +C-TYPE: GLubyte TYPEDEF: void* GLUfuncptr ; ! StringName @@ -202,7 +202,7 @@ CONSTANT: GLU_TESS_WINDING_POSITIVE 100132 ; CONSTANT: GLU_TESS_WINDING_NEGATIVE 100133 ; CONSTANT: GLU_TESS_WINDING_ABS_GEQ_TWO 100134 ; -library: glu +LIBRARY: glu FUNCTION: void gluBeginCurve ( GLUnurbs* nurb ) ; FUNCTION: void gluBeginPolygon ( GLUtesselator* tess ) ; @@ -267,9 +267,9 @@ FUNCTION: GLint gluUnProject ( GLdouble winX, GLdouble winY, GLdouble winZ, GLdo ! FUNCTION: GLboolean gluCheckExtension ( GLubyte* extName, GLubyte* extString ) ; ! FUNCTION: GLint gluUnProject4 ( GLdouble winX, GLdouble winY, GLdouble winZ, GLdouble clipW, GLdouble* model, GLdouble* proj, GLint* view, GLdouble nearVal, GLdouble farVal, GLdouble* objX, GLdouble* objY, GLdouble* objZ, GLdouble* objW ) ; -destructor: gluDeleteNurbsRenderer -destructor: gluDeleteQuadric -destructor: gluDeleteTess +DESTRUCTOR: gluDeleteNurbsRenderer +DESTRUCTOR: gluDeleteQuadric +DESTRUCTOR: gluDeleteTess CALLBACK: void GLUtessBeginCallback ( GLenum type ) ; CALLBACK: void GLUtessBeginDataCallback ( GLenum type, void* data ) ; diff --git a/ffi/openssl/libcrypto/libcrypto.factor b/ffi/openssl/libcrypto/libcrypto.factor index 170f3018cb..939974afe6 100644 --- a/ffi/openssl/libcrypto/libcrypto.factor +++ b/ffi/openssl/libcrypto/libcrypto.factor @@ -46,7 +46,7 @@ CONSTANT: BIO_C_SET_FILENAME 108 ; CONSTANT: BIO_C_SET_SSL 109 ; CONSTANT: BIO_C_GET_SSL 110 ; -library: libcrypto +LIBRARY: libcrypto ! =============================================== ! crypto.h @@ -130,8 +130,8 @@ FUNCTION: void* BIO_f_buffer ( ) ; CONSTANT: EVP_MAX_MD_SIZE 64 ; -c-type: EVP_MD -c-type: ENGINE +C-TYPE: EVP_MD +C-TYPE: ENGINE STRUCT: EVP_MD_CTX { digest EVP_MD* } @@ -206,7 +206,7 @@ FUNCTION: void* BN_bin2bn ( void* s, int len, void* ret ) ; FUNCTION: int BN_bn2bin ( void* a, void* to ) ; FUNCTION: void BN_clear_free ( void* a ) ; -destructor: BN_clear_free +DESTRUCTOR: BN_clear_free ! =============================================== ! ec.h diff --git a/ffi/openssl/libssl/libssl.factor b/ffi/openssl/libssl/libssl.factor index 1b91070999..02f915fd29 100644 --- a/ffi/openssl/libssl/libssl.factor +++ b/ffi/openssl/libssl/libssl.factor @@ -180,10 +180,10 @@ CONSTANT: SSL_ERROR_WANT_ACCEPT 8 ; { 8 "SSL_ERROR_WANT_ACCEPT" } } ; -c-type: SSL_CTX -c-type: SSL_SESSION +C-TYPE: SSL_CTX +C-TYPE: SSL_SESSION -library: libssl +LIBRARY: libssl ! =============================================== ! stack.h @@ -201,12 +201,12 @@ TYPEDEF: stack_st _STACK ; ! asn1t.h ! =============================================== -c-type: ASN1_ITEM +C-TYPE: ASN1_ITEM ! =============================================== ! asn1.h ! =============================================== -c-type: ASN1_VALUE +C-TYPE: ASN1_VALUE TYPEDEF: ASN1_ITEM ASN1_ITEM_EXP ; STRUCT: ASN1_STRING @@ -233,8 +233,8 @@ STRUCT: X509_EXTENSION { critical void* } { value ASN1_OCTET_STRING* } ; -c-type: X509_NAME -c-type: X509 +C-TYPE: X509_NAME +C-TYPE: X509 ! =============================================== ! x509v3.h @@ -615,9 +615,9 @@ FUNCTION: X509_NAME* X509_get_subject_name ( X509* a ) ; FUNCTION: int X509_check_trust ( X509* a, int id, int flags ) ; FUNCTION: X509_EXTENSION* X509_get_ext ( X509* a, int loc ) ; FUNCTION: void X509_free ( X509 *a ) ; -destructor: X509_free +DESTRUCTOR: X509_free -c-type: X509_STORE +C-TYPE: X509_STORE FUNCTION: X509_STORE* X509_STORE_new ( ) ; CONSTANT: X509_R_CERT_ALREADY_IN_HASH_TABLE 101 ; diff --git a/ffi/pango/cairo/ffi/ffi.factor b/ffi/pango/cairo/ffi/ffi.factor index 98a04ad6a2..856aa3f2d4 100644 --- a/ffi/pango/cairo/ffi/ffi.factor +++ b/ffi/pango/cairo/ffi/ffi.factor @@ -6,7 +6,7 @@ IN: pango.cairo.ffi COMPILE< "pango.ffi" require COMPILE> -library: pango.cairo +LIBRARY: pango.cairo COMPILE< "pango.cairo" { { [ os windows? ] [ "libpangocairo-1.0-0.dll" ] } diff --git a/ffi/pango/ffi/ffi.factor b/ffi/pango/ffi/ffi.factor index ade4f617aa..ad1d480294 100644 --- a/ffi/pango/ffi/ffi.factor +++ b/ffi/pango/ffi/ffi.factor @@ -7,7 +7,7 @@ IN: pango.ffi COMPILE< "gobject.ffi" require COMPILE> -library: pango +LIBRARY: pango COMPILE< "pango" { { [ os windows? ] [ "libpango-1.0-0.dll" ] } @@ -19,8 +19,8 @@ IMPLEMENT-STRUCTS: PangoRectangle ; gir: vocab:pango/Pango-1.0.gir -destructor: pango_font_description_free -destructor: pango_layout_iter_free +DESTRUCTOR: pango_font_description_free +DESTRUCTOR: pango_layout_iter_free ! -library: pcre +LIBRARY: pcre CONSTANT: PCRE_CASELESS 0x00000001 ; CONSTANT: PCRE_MULTILINE 0x00000002 ; diff --git a/ffi/python/ffi/ffi.factor b/ffi/python/ffi/ffi.factor index 775fe2aa2c..f2ca66e37b 100644 --- a/ffi/python/ffi/ffi.factor +++ b/ffi/python/ffi/ffi.factor @@ -11,9 +11,9 @@ cdecl add-library COMPILE> ! Functions that return borrowed references needs to be called like this: ! Py_Func dup Py_IncRef &Py_DecRef -library: python +LIBRARY: python -c-type: PyObject +C-TYPE: PyObject ! Methods CONSTANT: METH_OLDARGS 0x0000 ; @@ -25,7 +25,7 @@ CONSTANT: METH_CLASS 0x0010 ; CONSTANT: METH_STATIC 0x0020 ; CONSTANT: METH_COEXIST 0x0040 ; -c-type: PyCFunction +C-TYPE: PyCFunction STRUCT: PyMethodDef { ml_name c-string } @@ -144,7 +144,7 @@ FUNCTION: int PyType_Check ( PyObject* obj ) ; ! Reference counting FUNCTION: void Py_IncRef ( PyObject* o ) ; FUNCTION: void Py_DecRef ( PyObject* o ) ; -destructor: Py_DecRef +DESTRUCTOR: Py_DecRef ! Reflection FUNCTION: c-string PyEval_GetFuncName ( PyObject* func ) ; diff --git a/ffi/readline/ffi/ffi.factor b/ffi/readline/ffi/ffi.factor index 0ce1ab3baa..c70beda06e 100644 --- a/ffi/readline/ffi/ffi.factor +++ b/ffi/readline/ffi/ffi.factor @@ -11,7 +11,7 @@ COMPILE< "readline" { { [ os unix? ] [ "libreadline.so" ] } } cond cdecl add-library COMPILE> -library: readline +LIBRARY: readline TYPEDEF: void* histdata_t ; diff --git a/ffi/system-info/macosx/macosx.factor b/ffi/system-info/macosx/macosx.factor index 363f27ff29..151318f43f 100644 --- a/ffi/system-info/macosx/macosx.factor +++ b/ffi/system-info/macosx/macosx.factor @@ -51,7 +51,7 @@ M: macosx os-version ! See /usr/include/sys/sysctl.h for constants -library: libc +LIBRARY: libc FUNCTION: int sysctl ( int* name, uint namelen, void* oldp, size_t* oldlenp, void* newp, size_t newlen ) ; : (sysctl-query) ( name namelen oldp oldlenp -- oldp ) diff --git a/ffi/unix/ffi/ffi.factor b/ffi/unix/ffi/ffi.factor index ecba939d13..c0a2fefedb 100644 --- a/ffi/unix/ffi/ffi.factor +++ b/ffi/unix/ffi/ffi.factor @@ -48,7 +48,7 @@ CONSTANT: SHUT_RD 0 ; CONSTANT: SHUT_WR 1 ; CONSTANT: SHUT_RDWR 2 ; -library: libc +LIBRARY: libc STRUCT: group { gr_name c-string } diff --git a/ffi/unix/types/types.factor b/ffi/unix/types/types.factor index 15e0b22076..a2d1f6e5c0 100644 --- a/ffi/unix/types/types.factor +++ b/ffi/unix/types/types.factor @@ -29,10 +29,10 @@ TYPEDEF: __uint64_t rlim_t ; TYPEDEF: uint32_t id_t ; TYPEDEF: long clockid_t ; -c-type: DIR -c-type: FILE -c-type: rlimit -c-type: rusage -c-type: sockaddr +C-TYPE: DIR +C-TYPE: FILE +C-TYPE: rlimit +C-TYPE: rusage +C-TYPE: sockaddr "unix.types." os name>> sequences:append require diff --git a/ffi/windows/advapi32/advapi32.factor b/ffi/windows/advapi32/advapi32.factor index 2e755aa03a..d98ce3112b 100755 --- a/ffi/windows/advapi32/advapi32.factor +++ b/ffi/windows/advapi32/advapi32.factor @@ -2,7 +2,7 @@ USING: alien.c-types alien.syntax classes.struct kernel literals math math.bitwise windows.kernel32 windows.types ; IN: windows.advapi32 -library: advapi32 +LIBRARY: advapi32 CONSTANT: MS_DEF_DH_SCHANNEL_PROV "Microsoft DH Schannel Cryptographic Provider" ; diff --git a/ffi/windows/com/com.factor b/ffi/windows/com/com.factor index edb34b5b53..93404a9443 100644 --- a/ffi/windows/com/com.factor +++ b/ffi/windows/com/com.factor @@ -3,16 +3,16 @@ windows.ole32 windows.types continuations kernel alien.syntax libc destructors accessors alien.data classes.struct windows.kernel32 ; IN: windows.com -library: ole32 +LIBRARY: ole32 COM-INTERFACE: IUnknown f "{00000000-0000-0000-C000-000000000046}" HRESULT QueryInterface ( REFGUID iid, void** ppvObject ) ULONG AddRef ( ) ULONG Release ( ) ; -c-type: IAdviseSink -c-type: IEnumFORMATETC -c-type: IEnumSTATDATA +C-TYPE: IAdviseSink +C-TYPE: IEnumFORMATETC +C-TYPE: IEnumSTATDATA COM-INTERFACE: IDataObject IUnknown "{0000010E-0000-0000-C000-000000000046}" HRESULT GetData ( FORMATETC* pFormatetc, STGMEDIUM* pmedium ) @@ -99,4 +99,4 @@ ERROR: null-com-release ; : with-com-interface ( interface quot -- ) over [ com-release ] curry [ ] cleanup ; inline -destructor: com-release +DESTRUCTOR: com-release diff --git a/ffi/windows/crypt32/crypt32.factor b/ffi/windows/crypt32/crypt32.factor index 51abacb610..deae14cbc2 100644 --- a/ffi/windows/crypt32/crypt32.factor +++ b/ffi/windows/crypt32/crypt32.factor @@ -4,7 +4,7 @@ USING: alien.syntax classes.struct windows.kernel32 windows.types ; IN: windows.crypt32 -library: crypt32 +LIBRARY: crypt32 TYPEDEF: HANDLE HCERTSTORE ; TYPEDEF: ULONG_PTR HCRYPTPROV ; diff --git a/ffi/windows/ddk/hid/hid.factor b/ffi/windows/ddk/hid/hid.factor index 0fb4c74ac0..79458e5492 100755 --- a/ffi/windows/ddk/hid/hid.factor +++ b/ffi/windows/ddk/hid/hid.factor @@ -5,7 +5,7 @@ classes.struct kernel math windows.types windows.ole32 ; IN: windows.ddk.hid COMPILE< "hid" "hid.dll" stdcall add-library COMPILE> -library: hid +LIBRARY: hid TYPEDEF: LONG NTSTATUS ; TYPEDEF: USHORT USAGE ; @@ -320,7 +320,7 @@ STRUCT: HIDP_LINK_COLLECTION_NODE TYPEDEF: HIDP_LINK_COLLECTION_NODE* PHIDP_LINK_COLLECTION_NODE ; TYPEDEF: PUCHAR PHIDP_REPORT_DESCRIPTOR ; -c-type: HIDP_PREPARSED_DATA +C-TYPE: HIDP_PREPARSED_DATA TYPEDEF: HIDP_PREPARSED_DATA* PHIDP_PREPARSED_DATA ; STRUCT: HIDP_CAPS diff --git a/ffi/windows/ddk/setupapi/setupapi.factor b/ffi/windows/ddk/setupapi/setupapi.factor index b7433bda00..3c939bea71 100755 --- a/ffi/windows/ddk/setupapi/setupapi.factor +++ b/ffi/windows/ddk/setupapi/setupapi.factor @@ -6,7 +6,7 @@ windows.advapi32 alien.libraries ; IN: windows.ddk.setupapi COMPILE< "setupapi" "setupapi.dll" stdcall add-library COMPILE> -library: setupapi +LIBRARY: setupapi TYPEDEF: DWORDLONG SP_LOG_TOKEN ; TYPEDEF: DWORDLONG* PSP_LOG_TOKEN ; @@ -60,7 +60,7 @@ CONSTANT: TXTLOG_VENDOR 0x80000000 ; TYPEDEF: void* HPROPSHEETPAGE ; TYPEDEF: void* HIMAGELIST ; -c-type: DEVPROPKEY +C-TYPE: DEVPROPKEY TYPEDEF: ULONG DEVPROPTYPE ; TYPEDEF: DEVPROPTYPE* PDEVPROPTYPE ; TYPEDEF: void* LPPROPSHEETHEADERA ; diff --git a/ffi/windows/ddk/winusb/winusb.factor b/ffi/windows/ddk/winusb/winusb.factor index dfd779d0f9..e5078a16c2 100755 --- a/ffi/windows/ddk/winusb/winusb.factor +++ b/ffi/windows/ddk/winusb/winusb.factor @@ -5,7 +5,7 @@ windows.kernel32 windows.types alien.libraries ; IN: windows.ddk.winusb COMPILE< "winusb" "winusb.dll" stdcall add-library COMPILE> -library: winusb +LIBRARY: winusb TYPEDEF: PVOID WINUSB_INTERFACE_HANDLE ; TYPEDEF: WINUSB_INTERFACE_HANDLE* PWINUSB_INTERFACE_HANDLE ; diff --git a/ffi/windows/directx/d2d1/d2d1.factor b/ffi/windows/directx/d2d1/d2d1.factor index a98e27baca..b73fe15691 100644 --- a/ffi/windows/directx/d2d1/d2d1.factor +++ b/ffi/windows/directx/d2d1/d2d1.factor @@ -4,7 +4,7 @@ windows.directx.dcommon windows.directx.dxgi windows.directx.dxgiformat windows.ole32 windows.types ; IN: windows.directx.d2d1 -library: d2d1 +LIBRARY: d2d1 CONSTANT: D2D1_INVALID_TAG 0xffffffffffffffff ; CONSTANT: D2D1_DEFAULT_FLATTENING_TOLERANCE 0.25 ; @@ -217,9 +217,9 @@ CONSTANT: D2D1_LAYER_OPTIONS_INITIALIZE_FOR_CLEARTYPE 0x00000001 ; CONSTANT: D2D1_LAYER_OPTIONS_FORCE_DWORD 0xffffffff ; TYPEDEF: int D2D1_LAYER_OPTIONS ; -c-type: ID2D1Geometry -c-type: ID2D1Brush -c-type: ID2D1RenderTarget +C-TYPE: ID2D1Geometry +C-TYPE: ID2D1Brush +C-TYPE: ID2D1RenderTarget STRUCT: D2D1_LAYER_PARAMETERS { contentBounds D2D1_RECT_F } @@ -304,8 +304,8 @@ TYPEDEF: int D2D1_FACTORY_TYPE ; STRUCT: D2D1_FACTORY_OPTIONS { debugLevel D2D1_DEBUG_LEVEL } ; -c-type: ID2D1Factory -c-type: ID2D1BitmapRenderTarget +C-TYPE: ID2D1Factory +C-TYPE: ID2D1BitmapRenderTarget COM-INTERFACE: ID2D1Resource IUnknown "{2cd90691-12e2-11dc-9fed-001143a055f9}" void GetFactory ( ID2D1Factory** factory ) ; @@ -374,8 +374,8 @@ COM-INTERFACE: ID2D1StrokeStyle ID2D1Resource "{2cd9069d-12e2-11dc-9fed-001143a0 UINT32 GetDashesCount ( ) void GetDashes ( FLOAT* dashes, UINT dashesCount ) ; -c-type: ID2D1SimplifiedGeometrySink -c-type: ID2D1TessellationSink +C-TYPE: ID2D1SimplifiedGeometrySink +C-TYPE: ID2D1TessellationSink COM-INTERFACE: ID2D1Geometry ID2D1Resource "{2cd906a1-12e2-11dc-9fed-001143a055f9}" HRESULT GetBounds ( D2D1_MATRIX_3X2_F* worldTransform, D2D1_RECT_F* bounds ) @@ -442,7 +442,7 @@ COM-INTERFACE: ID2D1Mesh ID2D1Resource "{2cd906c2-12e2-11dc-9fed-001143a055f9}" COM-INTERFACE: ID2D1Layer ID2D1Resource "{2cd9069b-12e2-11dc-9fed-001143a055f9}" D2D1_SIZE_F GetSize ( ) ; -c-type: IDWriteRenderingParams +C-TYPE: IDWriteRenderingParams COM-INTERFACE: ID2D1DrawingStateBlock ID2D1Resource "{28506e39-ebf6-46a1-bb47-fd85565ab957}" void GetDescription ( D2D1_DRAWING_STATE_DESCRIPTION* stateDescription ) @@ -450,11 +450,11 @@ COM-INTERFACE: ID2D1DrawingStateBlock ID2D1Resource "{28506e39-ebf6-46a1-bb47-fd void SetTextRenderingParams ( IDWriteRenderingParams* textRenderingParams ) void GetTextRenderingParams ( IDWriteRenderingParams** textRenderingParams ) ; -c-type: IWICBitmapSource -c-type: IWICBitmap -c-type: IDWriteTextFormat -c-type: IDWriteTextLayout -c-type: DWRITE_GLYPH_RUN +C-TYPE: IWICBitmapSource +C-TYPE: IWICBitmap +C-TYPE: IDWriteTextFormat +C-TYPE: IDWriteTextLayout +C-TYPE: DWRITE_GLYPH_RUN COM-INTERFACE: ID2D1RenderTarget ID2D1Resource "{2cd90694-12e2-11dc-9fed-001143a055f9}" HRESULT CreateBitmap ( D2D1_SIZE_U size, void* srcData, UINT32 pitch, D2D1_BITMAP_PROPERTIES* bitmapProperties, ID2D1Bitmap** bitmap ) diff --git a/ffi/windows/directx/d3d10/d3d10.factor b/ffi/windows/directx/d3d10/d3d10.factor index d1e7b58b1d..5776fd2241 100644 --- a/ffi/windows/directx/d3d10/d3d10.factor +++ b/ffi/windows/directx/d3d10/d3d10.factor @@ -3,7 +3,7 @@ windows.directx windows.directx.dxgiformat windows.com.syntax windows.com windows.ole32 windows.directx.dxgitype ; IN: windows.directx.d3d10 -library: d3d10 +LIBRARY: d3d10 CONSTANT: D3D10_16BIT_INDEX_STRIP_CUT_VALUE 0xffff ; CONSTANT: D3D10_32BIT_INDEX_STRIP_CUT_VALUE 0xffffffff ; @@ -382,7 +382,7 @@ STRUCT: D3D10_BOX { bottom UINT } { back UINT } ; -c-type: ID3D10Device +C-TYPE: ID3D10Device COM-INTERFACE: ID3D10DeviceChild IUnknown "{9B7E4C00-342C-4106-A19F-4F2704F689F0}" void GetDevice ( ID3D10Device** ppDevice ) HRESULT GetPrivateData ( LPGUID guid, UINT* pDataSize, void* pData ) diff --git a/ffi/windows/directx/d3d10_1/d3d10_1.factor b/ffi/windows/directx/d3d10_1/d3d10_1.factor index 16db00c8ea..e450adfb5f 100644 --- a/ffi/windows/directx/d3d10_1/d3d10_1.factor +++ b/ffi/windows/directx/d3d10_1/d3d10_1.factor @@ -4,7 +4,7 @@ windows.directx.d3d10misc windows.directx.dxgi windows.directx.dxgiformat windows.types ; IN: windows.directx.d3d10_1 -library: d3d10_1 +LIBRARY: d3d10_1 CONSTANT: D3D10_1_DEFAULT_SAMPLE_MASK 0xffffffff ; CONSTANT: D3D10_1_FLOAT16_FUSED_TOLERANCE_IN_ULP 0.6 ; diff --git a/ffi/windows/directx/d3d10_1shader/d3d10_1shader.factor b/ffi/windows/directx/d3d10_1shader/d3d10_1shader.factor index 9f82c0e43f..7f721853cf 100644 --- a/ffi/windows/directx/d3d10_1shader/d3d10_1shader.factor +++ b/ffi/windows/directx/d3d10_1shader/d3d10_1shader.factor @@ -3,7 +3,7 @@ windows.com.syntax windows.directx windows.directx.d3d10 windows.directx.d3d10shader windows.types ; IN: windows.directx.d3d10_1shader -library: d3d10_1 +LIBRARY: d3d10_1 CONSTANT: D3D10_SHADER_DEBUG_REG_INPUT 0 ; CONSTANT: D3D10_SHADER_DEBUG_REG_OUTPUT 1 ; @@ -140,7 +140,7 @@ STRUCT: D3D10_SHADER_DEBUG_INFO { UintOffset UINT } { StringOffset UINT } ; -c-type: ID3D10ShaderReflection1 +C-TYPE: ID3D10ShaderReflection1 TYPEDEF: ID3D10ShaderReflection1* LPD3D10SHADERREFLECTION1 ; COM-INTERFACE: ID3D10ShaderReflection1 IUnknown "{C3457783-A846-47CE-9520-CEA6F66E7447}" diff --git a/ffi/windows/directx/d3d10effect/d3d10effect.factor b/ffi/windows/directx/d3d10effect/d3d10effect.factor index 43d4bb72a4..4652ed033f 100644 --- a/ffi/windows/directx/d3d10effect/d3d10effect.factor +++ b/ffi/windows/directx/d3d10effect/d3d10effect.factor @@ -3,7 +3,7 @@ windows.com.syntax windows.directx windows.directx.d3d10 windows.directx.d3d10misc windows.directx.d3d10shader windows.types ; IN: windows.directx.d3d10effect -library: d3d10 +LIBRARY: d3d10 CONSTANT: D3D10_DST_SO_BUFFERS 1 ; CONSTANT: D3D10_DST_OM_RENDER_TARGETS 2 ; @@ -113,19 +113,19 @@ STRUCT: D3D10_EFFECT_VARIABLE_DESC { BufferOffset UINT } { ExplicitBindPoint UINT } ; -c-type: ID3D10EffectConstantBuffer -c-type: ID3D10EffectScalarVariable -c-type: ID3D10EffectVectorVariable -c-type: ID3D10EffectMatrixVariable -c-type: ID3D10EffectStringVariable -c-type: ID3D10EffectShaderResourceVariable -c-type: ID3D10EffectRenderTargetViewVariable -c-type: ID3D10EffectDepthStencilViewVariable -c-type: ID3D10EffectShaderVariable -c-type: ID3D10EffectBlendVariable -c-type: ID3D10EffectDepthStencilVariable -c-type: ID3D10EffectRasterizerVariable -c-type: ID3D10EffectSamplerVariable +C-TYPE: ID3D10EffectConstantBuffer +C-TYPE: ID3D10EffectScalarVariable +C-TYPE: ID3D10EffectVectorVariable +C-TYPE: ID3D10EffectMatrixVariable +C-TYPE: ID3D10EffectStringVariable +C-TYPE: ID3D10EffectShaderResourceVariable +C-TYPE: ID3D10EffectRenderTargetViewVariable +C-TYPE: ID3D10EffectDepthStencilViewVariable +C-TYPE: ID3D10EffectShaderVariable +C-TYPE: ID3D10EffectBlendVariable +C-TYPE: ID3D10EffectDepthStencilVariable +C-TYPE: ID3D10EffectRasterizerVariable +C-TYPE: ID3D10EffectSamplerVariable COM-INTERFACE: ID3D10EffectVariable f "{AE897105-00E6-45bf-BB8E-281DD6DB8E1B}" BOOL IsValid ( ) diff --git a/ffi/windows/directx/d3d10misc/d3d10misc.factor b/ffi/windows/directx/d3d10misc/d3d10misc.factor index 96e410caa1..1ec05ff751 100644 --- a/ffi/windows/directx/d3d10misc/d3d10misc.factor +++ b/ffi/windows/directx/d3d10misc/d3d10misc.factor @@ -3,9 +3,9 @@ windows.directx windows.directx.d3d10 windows.directx.dxgi windows.types ; IN: windows.directx.d3d10misc -library: d3d10 +LIBRARY: d3d10 -c-type: ID3D10Blob +C-TYPE: ID3D10Blob TYPEDEF: ID3D10Blob* LPD3D10BLOB ; COM-INTERFACE: ID3D10Blob IUnknown "{8BA5FB08-5195-40e2-AC58-0D989C3A0102}" diff --git a/ffi/windows/directx/d3d10shader/d3d10shader.factor b/ffi/windows/directx/d3d10shader/d3d10shader.factor index 7c4dd5d4d6..28c1176b66 100644 --- a/ffi/windows/directx/d3d10shader/d3d10shader.factor +++ b/ffi/windows/directx/d3d10shader/d3d10shader.factor @@ -3,7 +3,7 @@ windows.com.syntax windows.directx.d3d10 windows.directx.d3d10misc windows.types windows.directx ; IN: windows.directx.d3d10shader -library: d3d10 +LIBRARY: d3d10 CONSTANT: D3D10_SHADER_DEBUG 1 ; CONSTANT: D3D10_SHADER_SKIP_VALIDATION 2 ; diff --git a/ffi/windows/directx/d3d11/d3d11.factor b/ffi/windows/directx/d3d11/d3d11.factor index e9c8e150d8..50030f4329 100644 --- a/ffi/windows/directx/d3d11/d3d11.factor +++ b/ffi/windows/directx/d3d11/d3d11.factor @@ -4,7 +4,7 @@ windows.directx.dxgitype windows.directx.dxgi windows.directx.d3dcommon windows.directx ; IN: windows.directx.d3d11 -library: d3d11 +LIBRARY: d3d11 CONSTANT: D3D11_16BIT_INDEX_STRIP_CUT_VALUE 0xffff ; CONSTANT: D3D11_32BIT_INDEX_STRIP_CUT_VALUE 0xffffffff ; @@ -635,8 +635,8 @@ STRUCT: D3D11_BOX { bottom UINT } { back UINT } ; -c-type: ID3D11Device -c-type: ID3D11ClassLinkage +C-TYPE: ID3D11Device +C-TYPE: ID3D11ClassLinkage COM-INTERFACE: ID3D11DeviceChild IUnknown "{1841e5c8-16b0-489b-bcc8-44cfb0d5deae}" void GetDevice ( ID3D11Device** ppDevice ) diff --git a/ffi/windows/directx/d3d11shader/d3d11shader.factor b/ffi/windows/directx/d3d11shader/d3d11shader.factor index 8eb4094e53..4df58adbdc 100644 --- a/ffi/windows/directx/d3d11shader/d3d11shader.factor +++ b/ffi/windows/directx/d3d11shader/d3d11shader.factor @@ -4,7 +4,7 @@ windows.directx.d3d11 windows.com windows.com.syntax windows.directx.d3dcommon ; IN: windows.directx.d3d11shader -library: d3d11 +LIBRARY: d3d11 CONSTANT: D3D11_SHVER_PIXEL_SHADER 0 ; CONSTANT: D3D11_SHVER_VERTEX_SHADER 1 ; @@ -152,8 +152,8 @@ COM-INTERFACE: ID3D11ShaderReflectionType f "{6E6FFA6A-9BAE-4613-A51E-91652D508C HRESULT IsOfType ( ID3D11ShaderReflectionType* pType ) HRESULT ImplementsInterface ( ID3D11ShaderReflectionType* pBase ) ; -c-type: ID3D11ShaderReflectionType -c-type: ID3D11ShaderReflectionConstantBuffer +C-TYPE: ID3D11ShaderReflectionType +C-TYPE: ID3D11ShaderReflectionConstantBuffer COM-INTERFACE: ID3D11ShaderReflectionVariable f "{51F23923-F3E5-4BD1-91CB-606177D8DB4C}" HRESULT GetDesc ( D3D11_SHADER_VARIABLE_DESC* pDesc ) diff --git a/ffi/windows/directx/d3d9/d3d9.factor b/ffi/windows/directx/d3d9/d3d9.factor index b9c2ec881f..b7efe4ec26 100644 --- a/ffi/windows/directx/d3d9/d3d9.factor +++ b/ffi/windows/directx/d3d9/d3d9.factor @@ -3,14 +3,14 @@ windows.com.syntax windows.com windows.directx windows.directx.d3d9caps windows.ole32 windows.kernel32 ; IN: windows.directx.d3d9 -library: d3d9 +LIBRARY: d3d9 CONSTANT: DIRECT3D_VERSION 0x0900 ; CONSTANT: D3D_SDK_VERSION 32 ; CONSTANT: D3D9b_SDK_VERSION 31 ; -c-type: IDirect3D9 +C-TYPE: IDirect3D9 FUNCTION: IDirect3D9* Direct3DCreate9 ( UINT SDKVersion ) ; @@ -23,7 +23,7 @@ FUNCTION: BOOL D3DPERF_QueryRepeatFrame ( ) ; FUNCTION: void D3DPERF_SetOptions ( DWORD dwOptions ) ; FUNCTION: DWORD D3DPERF_GetStatus ( ) ; -c-type: IDirect3DDevice9 +C-TYPE: IDirect3DDevice9 COM-INTERFACE: IDirect3D9 IUnknown "{81BDCBCA-64D4-426d-AE8D-AD0147F4275C}"" HRESULT RegisterSoftwareDevice ( void* pInitializeFunction ) diff --git a/ffi/windows/directx/d3dcompiler/d3dcompiler.factor b/ffi/windows/directx/d3dcompiler/d3dcompiler.factor index ea8ed9c291..a9bc7b3078 100644 --- a/ffi/windows/directx/d3dcompiler/d3dcompiler.factor +++ b/ffi/windows/directx/d3dcompiler/d3dcompiler.factor @@ -1,14 +1,14 @@ USING: alien.c-types alien.syntax windows.directx windows.ole32 windows.types ; IN: windows.directx.d3dcompiler -library: d3dcompiler +LIBRARY: d3dcompiler -c-type: D3D_SHADER_MACRO -c-type: ID3DBlob +C-TYPE: D3D_SHADER_MACRO +C-TYPE: ID3DBlob TYPEDEF: ID3DBlob* LPD3DBLOB ; -c-type: ID3DInclude +C-TYPE: ID3DInclude TYPEDEF: ID3DInclude* LPD3DINCLUDE ; -c-type: ID3D10Effect +C-TYPE: ID3D10Effect FUNCTION: HRESULT D3DCompile ( LPCVOID pSrcData, diff --git a/ffi/windows/directx/d3dcsx/d3dcsx.factor b/ffi/windows/directx/d3dcsx/d3dcsx.factor index e3a5725b7e..d18d300d89 100644 --- a/ffi/windows/directx/d3dcsx/d3dcsx.factor +++ b/ffi/windows/directx/d3dcsx/d3dcsx.factor @@ -2,7 +2,7 @@ USING: alien.c-types alien.syntax classes.struct windows.com windows.com.syntax windows.directx windows.directx.d3d11 windows.types ; IN: windows.directx.d3dcsx -library: d3dcsx +LIBRARY: d3dcsx CONSTANT: D3DX11_SCAN_DATA_TYPE_FLOAT 1 ; CONSTANT: D3DX11_SCAN_DATA_TYPE_INT 2 ; diff --git a/ffi/windows/directx/d3dx10async/d3dx10async.factor b/ffi/windows/directx/d3dx10async/d3dx10async.factor index a4d4781fc1..695b74c66d 100644 --- a/ffi/windows/directx/d3dx10async/d3dx10async.factor +++ b/ffi/windows/directx/d3dx10async/d3dx10async.factor @@ -3,13 +3,13 @@ windows.directx.d3d10misc windows.directx.d3d10shader windows.directx.d3dx10core windows.types ; IN: windows.directx.d3dx10async -library: d3dx10 +LIBRARY: d3dx10 -c-type: ID3DX10ThreadPump -c-type: ID3D10EffectPool -c-type: D3DX10_IMAGE_LOAD_INFO -c-type: D3DX10_IMAGE_INFO -c-type: ID3D10Effect +C-TYPE: ID3DX10ThreadPump +C-TYPE: ID3D10EffectPool +C-TYPE: D3DX10_IMAGE_LOAD_INFO +C-TYPE: D3DX10_IMAGE_INFO +C-TYPE: ID3D10Effect FUNCTION: HRESULT D3DX10CompileFromFileA ( LPCSTR pSrcFile, D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, LPCSTR pFunctionName, LPCSTR pProfile, UINT Flags1, UINT Flags2, ID3DX10ThreadPump* pPump, ID3D10Blob** ppShader, ID3D10Blob** ppErrorMsgs, HRESULT* pHResult ) ; diff --git a/ffi/windows/directx/d3dx10core/d3dx10core.factor b/ffi/windows/directx/d3dx10core/d3dx10core.factor index 12000951fd..b81f48ceab 100644 --- a/ffi/windows/directx/d3dx10core/d3dx10core.factor +++ b/ffi/windows/directx/d3dx10core/d3dx10core.factor @@ -4,7 +4,7 @@ windows.directx.d3d10misc windows.directx.d3dx10math windows.directx.dxgi windows.gdi32 windows.types ; IN: windows.directx.d3dx10core -library: d3dx10 +LIBRARY: d3dx10 CONSTANT: D3DX10_SDK_VERSION 42 ; @@ -24,7 +24,7 @@ FUNCTION: HRESULT D3DX10CreateDeviceAndSwapChain ( IDXGISwapChain** ppSwapChain, ID3D10Device** ppDevice ) ; -c-type: ID3D10Device1 +C-TYPE: ID3D10Device1 FUNCTION: HRESULT D3DX10GetFeatureLevel1 ( ID3D10Device* pDevice, ID3D10Device1** ppDevice1 ) ; @@ -45,7 +45,7 @@ STRUCT: D3DX10_SPRITE { pTexture ID3D10ShaderResourceView* } { TextureIndex UINT } ; -c-type: ID3DX10Sprite +C-TYPE: ID3DX10Sprite TYPEDEF: ID3DX10Sprite* LPD3DX10SPRITE ; COM-INTERFACE: ID3DX10Sprite IUnknown "{BA0B762D-8D28-43ec-B9DC-2F84443B0614}" diff --git a/ffi/windows/directx/d3dx10mesh/d3dx10mesh.factor b/ffi/windows/directx/d3dx10mesh/d3dx10mesh.factor index af14e580b9..87fb6f0c03 100644 --- a/ffi/windows/directx/d3dx10mesh/d3dx10mesh.factor +++ b/ffi/windows/directx/d3dx10mesh/d3dx10mesh.factor @@ -3,7 +3,7 @@ windows.com.syntax windows.directx windows.directx.d3d10 windows.directx.d3d10misc windows.types windows.directx.d3dx10math ; IN: windows.directx.d3dx10mesh -library: d3dx10 +LIBRARY: d3dx10 CONSTANT: D3DX10_MESH_32_BIT 1 ; CONSTANT: D3DX10_MESH_GS_ADJACENCY 4 ; diff --git a/ffi/windows/directx/d3dx10tex/d3dx10tex.factor b/ffi/windows/directx/d3dx10tex/d3dx10tex.factor index 59aa1455c6..5d1c5e935e 100644 --- a/ffi/windows/directx/d3dx10tex/d3dx10tex.factor +++ b/ffi/windows/directx/d3dx10tex/d3dx10tex.factor @@ -4,7 +4,7 @@ windows.directx.d3dx10async windows.directx.dxgiformat windows.types ; IN: windows.directx.d3dx10tex -library: d3dx10 +LIBRARY: d3dx10 CONSTANT: D3DX10_FILTER_NONE 0x00000001 ; CONSTANT: D3DX10_FILTER_POINT 0x00000002 ; diff --git a/ffi/windows/directx/d3dx11async/d3dx11async.factor b/ffi/windows/directx/d3dx11async/d3dx11async.factor index 4951d699a0..a1406f8c73 100644 --- a/ffi/windows/directx/d3dx11async/d3dx11async.factor +++ b/ffi/windows/directx/d3dx11async/d3dx11async.factor @@ -3,7 +3,7 @@ windows.directx.d3d10shader windows.directx.d3d11 windows.directx.d3dx11core windows.directx.d3dx11tex windows.types ; IN: windows.directx.d3dx11async -library: d3dx11 +LIBRARY: d3dx11 FUNCTION: HRESULT D3DX11CompileFromFileA ( LPCSTR pSrcFile, D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, LPCSTR pFunctionName, LPCSTR pProfile, UINT Flags1, UINT Flags2, ID3DX11ThreadPump* pPump, ID3D10Blob** ppShader, ID3D10Blob** ppErrorMsgs, HRESULT* pHResult ) ; diff --git a/ffi/windows/directx/d3dx11core/d3dx11core.factor b/ffi/windows/directx/d3dx11core/d3dx11core.factor index a3d01a8660..320a1a48e9 100644 --- a/ffi/windows/directx/d3dx11core/d3dx11core.factor +++ b/ffi/windows/directx/d3dx11core/d3dx11core.factor @@ -2,7 +2,7 @@ USING: alien.syntax windows.directx windows.types windows.com.syntax alien.c-types windows.com windows.directx.d3d11 ; IN: windows.directx.d3dx11core -library: d3dx11 +LIBRARY: d3dx11 FUNCTION: HRESULT D3DX11CheckVersion ( UINT D3DSdkVersion, UINT D3DX11SdkVersion ) ; diff --git a/ffi/windows/directx/d3dx11tex/d3dx11tex.factor b/ffi/windows/directx/d3dx11tex/d3dx11tex.factor index 0656974b65..2e0b0a1f7b 100644 --- a/ffi/windows/directx/d3dx11tex/d3dx11tex.factor +++ b/ffi/windows/directx/d3dx11tex/d3dx11tex.factor @@ -3,7 +3,7 @@ windows.directx windows.directx.d3d10misc windows.directx.d3d11 windows.directx.d3dx11core windows.directx.dxgiformat windows.types ; IN: windows.directx.d3dx11tex -library: d3dx11 +LIBRARY: d3dx11 CONSTANT: D3DX11_FILTER_NONE 0x00000001 ; CONSTANT: D3DX11_FILTER_POINT 0x00000002 ; diff --git a/ffi/windows/directx/d3dx9anim/d3dx9anim.factor b/ffi/windows/directx/d3dx9anim/d3dx9anim.factor index 276b76980d..75ab8c9ab3 100644 --- a/ffi/windows/directx/d3dx9anim/d3dx9anim.factor +++ b/ffi/windows/directx/d3dx9anim/d3dx9anim.factor @@ -5,7 +5,7 @@ windows.directx.d3dx9mesh windows.directx.d3dx9xof windows.types ; IN: windows.directx.d3dx9anim -library: d3dx9 +LIBRARY: d3dx9 TYPEDEF: int D3DXMESHDATATYPE ; CONSTANT: D3DXMESHTYPE_MESH 1 ; @@ -37,7 +37,7 @@ STRUCT: D3DXFRAME { pFrameFirstChild D3DXFRAME* } ; TYPEDEF: D3DXFRAME* LPD3DXFRAME ; -c-type: ID3DXAllocateHierarchy +C-TYPE: ID3DXAllocateHierarchy TYPEDEF: ID3DXAllocateHierarchy* LPD3DXALLOCATEHIERARCHY ; COM-INTERFACE: ID3DXAllocateHierarchy f "{00000000-0000-0000-0000-000000000000}" @@ -54,7 +54,7 @@ COM-INTERFACE: ID3DXAllocateHierarchy f "{00000000-0000-0000-0000-000000000000}" HRESULT DestroyFrame ( LPD3DXFRAME pFrameToFree ) HRESULT DestroyMeshContainer ( LPD3DXMESHCONTAINER pMeshContainerToFree ) ; -c-type: ID3DXLoadUserData +C-TYPE: ID3DXLoadUserData TYPEDEF: ID3DXLoadUserData* LPD3DXLOADUSERDATA ; COM-INTERFACE: ID3DXLoadUserData f "{00000000-0000-0000-0000-000000000000}" @@ -64,7 +64,7 @@ COM-INTERFACE: ID3DXLoadUserData f "{00000000-0000-0000-0000-000000000000}" HRESULT LoadMeshChildData ( LPD3DXMESHCONTAINER pMeshContainer, LPD3DXFILEDATA pXofChildData ) ; -c-type: ID3DXSaveUserData +C-TYPE: ID3DXSaveUserData TYPEDEF: ID3DXSaveUserData* LPD3DXSAVEUSERDATA ; COM-INTERFACE: ID3DXSaveUserData f "{00000000-0000-0000-0000-000000000000}" @@ -87,7 +87,7 @@ CONSTANT: D3DXCALLBACK_SEARCH_EXCLUDING_INITIAL_POSITION 1 ; CONSTANT: D3DXCALLBACK_SEARCH_BEHIND_INITIAL_POSITION 2 ; CONSTANT: D3DXCALLBACK_SEARCH_FORCE_DWORD 0x7fffffff ; -c-type: ID3DXAnimationSet +C-TYPE: ID3DXAnimationSet TYPEDEF: ID3DXAnimationSet* LPD3DXANIMATIONSET ; COM-INTERFACE: ID3DXAnimationSet IUnknown "{698CFB3F-9289-4d95-9A57-33A94B5A65F9}" @@ -134,7 +134,7 @@ TYPEDEF: int D3DXCOMPRESSION_FLAGS ; CONSTANT: D3DXCOMPRESS_DEFAULT 0 ; CONSTANT: D3DXCOMPRESS_FORCE_DWORD 0x7fffffff ; -c-type: ID3DXKeyframedAnimationSet +C-TYPE: ID3DXKeyframedAnimationSet TYPEDEF: ID3DXKeyframedAnimationSet* LPD3DXKEYFRAMEDANIMATIONSET ; COM-INTERFACE: ID3DXKeyframedAnimationSet ID3DXAnimationSet "{FA4E8E3A-9786-407d-8B4C-5995893764AF}" @@ -175,7 +175,7 @@ COM-INTERFACE: ID3DXKeyframedAnimationSet ID3DXAnimationSet "{FA4E8E3A-9786-407d LPD3DXBUFFER* ppCompressedData ) HRESULT UnregisterAnimation ( UINT Index ) ; -c-type: ID3DXCompressedAnimationSet +C-TYPE: ID3DXCompressedAnimationSet TYPEDEF: ID3DXCompressedAnimationSet* LPD3DXCOMPRESSEDANIMATIONSET ; COM-INTERFACE: ID3DXCompressedAnimationSet ID3DXAnimationSet "{6CC2480D-3808-4739-9F88-DE49FACD8D4C}" @@ -228,13 +228,13 @@ TYPEDEF: D3DXEVENT_DESC* LPD3DXEVENT_DESC ; TYPEDEF: DWORD D3DXEVENTHANDLE ; TYPEDEF: D3DXEVENTHANDLE* LPD3DXEVENTHANDLE ; -c-type: ID3DXAnimationCallbackHandler +C-TYPE: ID3DXAnimationCallbackHandler TYPEDEF: ID3DXAnimationCallbackHandler* LPD3DXANIMATIONCALLBACKHANDLER ; COM-INTERFACE: ID3DXAnimationCallbackHandler f "{00000000-0000-0000-0000-000000000000}" HRESULT HandleCallback ( UINT Track, LPVOID pCallbackData ) ; -c-type: ID3DXAnimationController +C-TYPE: ID3DXAnimationController TYPEDEF: ID3DXAnimationController* LPD3DXANIMATIONCONTROLLER ; COM-INTERFACE: ID3DXAnimationController IUnknown "{AC8948EC-F86D-43e2-96DE-31FC35F96D9E}" diff --git a/ffi/windows/directx/d3dx9core/d3dx9core.factor b/ffi/windows/directx/d3dx9core/d3dx9core.factor index 053b18bcab..895d359338 100644 --- a/ffi/windows/directx/d3dx9core/d3dx9core.factor +++ b/ffi/windows/directx/d3dx9core/d3dx9core.factor @@ -3,7 +3,7 @@ windows.com windows.directx windows.directx.d3dx9math windows.directx.d3d9types classes.struct windows.gdi32 ; IN: windows.directx.d3dx9core -library: d3dx9 +LIBRARY: d3dx9 CONSTANT: D3DX_VERSION 0x0902 ; CONSTANT: D3DX_SDK_VERSION 42 ; @@ -12,7 +12,7 @@ FUNCTION: BOOL D3DXCheckVersion ( UINT D3DSdkVersion, UINT D3DXSdkVersion ) ; FUNCTION: BOOL D3DXDebugMute ( BOOL Mute ) ; FUNCTION: UINT D3DXGetDriverLevel ( LPDIRECT3DDEVICE9 pDevice ) ; -c-type: ID3DXBuffer +C-TYPE: ID3DXBuffer TYPEDEF: ID3DXBuffer* LPD3DXBUFFER ; COM-INTERFACE: ID3DXBuffer IUnknown "{8BA5FB08-5195-40e2-AC58-0D989C3A0102}" @@ -29,7 +29,7 @@ CONSTANT: D3DXSPRITE_SORT_DEPTH_FRONTTOBACK 64 ; CONSTANT: D3DXSPRITE_SORT_DEPTH_BACKTOFRONT 128 ; CONSTANT: D3DXSPRITE_DO_NOT_ADDREF_TEXTURE 256 ; -c-type: ID3DXSprite +C-TYPE: ID3DXSprite TYPEDEF: ID3DXSprite* LPD3DXSPRITE ; COM-INTERFACE: ID3DXSprite IUnknown "{BA0B762D-7D28-43ec-B9DC-2F84443B0614}" @@ -79,10 +79,10 @@ TYPEDEF: D3DXFONT_DESCW* LPD3DXFONT_DESCW ; TYPEDEF: D3DXFONT_DESCW D3DXFONT_DESC ; TYPEDEF: LPD3DXFONT_DESCW LPD3DXFONT_DESC ; -c-type: ID3DXFont +C-TYPE: ID3DXFont TYPEDEF: ID3DXFont* LPD3DXFONT ; -c-type: TEXTMETRICA -c-type: TEXTMETRICW +C-TYPE: TEXTMETRICA +C-TYPE: TEXTMETRICW COM-INTERFACE: ID3DXFont IUnknown "{D79DBB70-5F21-4d36-BBC2-FF525C213CDC}" HRESULT GetDevice ( LPDIRECT3DDEVICE9* ppDevice ) @@ -155,7 +155,7 @@ STRUCT: D3DXRTS_DESC { DepthStencilFormat D3DFORMAT } ; TYPEDEF: D3DXRTS_DESC* LPD3DXRTS_DESC ; -c-type: ID3DXRenderToSurface +C-TYPE: ID3DXRenderToSurface TYPEDEF: ID3DXRenderToSurface* LPD3DXRENDERTOSURFACE ; COM-INTERFACE: ID3DXRenderToSurface IUnknown "{6985F346-2C3D-43b3-BE8B-DAAE8A03D894}" @@ -184,7 +184,7 @@ STRUCT: D3DXRTE_DESC { DepthStencilFormat D3DFORMAT } ; TYPEDEF: D3DXRTE_DESC* LPD3DXRTE_DESC ; -c-type: ID3DXRenderToEnvMap +C-TYPE: ID3DXRenderToEnvMap TYPEDEF: ID3DXRenderToEnvMap* LPD3DXRenderToEnvMap ; COM-INTERFACE: ID3DXRenderToEnvMap IUnknown "{313F1B4B-C7B0-4fa2-9D9D-8D380B64385E}" @@ -209,7 +209,7 @@ FUNCTION: HRESULT D3DFORMAT DepthStencilFormat, LPD3DXRenderToEnvMap* ppRenderToEnvMap ) ; -c-type: ID3DXLine +C-TYPE: ID3DXLine TYPEDEF: ID3DXLine* LPD3DXLINE ; COM-INTERFACE: ID3DXLine IUnknown "{D379BA7F-9042-4ac4-9F5E-58192A4C6BD8}" HRESULT GetDevice ( LPDIRECT3DDEVICE9* ppDevice ) diff --git a/ffi/windows/directx/d3dx9effect/d3dx9effect.factor b/ffi/windows/directx/d3dx9effect/d3dx9effect.factor index 76aee008a8..44399912c2 100644 --- a/ffi/windows/directx/d3dx9effect/d3dx9effect.factor +++ b/ffi/windows/directx/d3dx9effect/d3dx9effect.factor @@ -5,7 +5,7 @@ windows.directx.d3dx9math windows.directx.d3dx9shader windows.types ; IN: windows.directx.d3dx9effect -library: d3dx9 +LIBRARY: d3dx9 CONSTANT: D3DXFX_DONOTSAVESTATE 1 ; CONSTANT: D3DXFX_DONOTSAVESHADERSTATE 2 ; @@ -52,12 +52,12 @@ STRUCT: D3DXFUNCTION_DESC { Name LPCSTR } { Annotations UINT } ; -c-type: ID3DXEffectPool +C-TYPE: ID3DXEffectPool TYPEDEF: ID3DXEffectPool* LPD3DXEFFECTPOOL ; COM-INTERFACE: ID3DXEffectPool IUnknown "{9537AB04-3250-412e-8213-FCD2F8677933}" ; -c-type: ID3DXBaseEffect +C-TYPE: ID3DXBaseEffect TYPEDEF: ID3DXBaseEffect* LPD3DXBASEEFFECT ; COM-INTERFACE: ID3DXBaseEffect IUnknown "{017C18AC-103F-4417-8C51-6BF6EF1E56BE}" @@ -116,7 +116,7 @@ COM-INTERFACE: ID3DXBaseEffect IUnknown "{017C18AC-103F-4417-8C51-6BF6EF1E56BE}" HRESULT GetVertexShader ( D3DXHANDLE hParameter, LPDIRECT3DVERTEXSHADER9* ppVShader ) HRESULT SetArrayRange ( D3DXHANDLE hParameter, UINT uStart, UINT uEnd ) ; -c-type: ID3DXEffectStateManager +C-TYPE: ID3DXEffectStateManager TYPEDEF: ID3DXEffectStateManager* LPD3DXEFFECTSTATEMANAGER ; COM-INTERFACE: ID3DXEffectStateManager IUnknown "{79AAB587-6DBC-4fa7-82DE-37FA1781C5CE}" @@ -139,7 +139,7 @@ COM-INTERFACE: ID3DXEffectStateManager IUnknown "{79AAB587-6DBC-4fa7-82DE-37FA17 HRESULT SetPixelShaderConstantI ( UINT RegisterIndex, INT* pConstantData, UINT RegisterCount ) HRESULT SetPixelShaderConstantB ( UINT RegisterIndex, BOOL* pConstantData, UINT RegisterCount ) ; -c-type: ID3DXEffect +C-TYPE: ID3DXEffect TYPEDEF: ID3DXEffect* LPD3DXEFFECT ; COM-INTERFACE: ID3DXEffect ID3DXBaseEffect "{F6CEB4B3-4E4C-40dd-B883-8D8DE5EA0CD5}" @@ -166,7 +166,7 @@ COM-INTERFACE: ID3DXEffect ID3DXBaseEffect "{F6CEB4B3-4E4C-40dd-B883-8D8DE5EA0CD HRESULT CloneEffect ( LPDIRECT3DDEVICE9 pDevice, LPD3DXEFFECT* ppEffect ) HRESULT SetRawValue ( D3DXHANDLE hParameter, LPCVOID pData, UINT ByteOffset, UINT Bytes ) ; -c-type: ID3DXEffectCompiler +C-TYPE: ID3DXEffectCompiler TYPEDEF: ID3DXEffectCompiler* LPD3DXEFFECTCOMPILER ; COM-INTERFACE: ID3DXEffectCompiler ID3DXBaseEffect "{51B8A949-1A31-47e6-BEA0-4B30DB53F1E0}" diff --git a/ffi/windows/directx/d3dx9math/d3dx9math.factor b/ffi/windows/directx/d3dx9math/d3dx9math.factor index 536eb3a277..95ff0fc036 100644 --- a/ffi/windows/directx/d3dx9math/d3dx9math.factor +++ b/ffi/windows/directx/d3dx9math/d3dx9math.factor @@ -2,7 +2,7 @@ USING: math classes.struct windows.types alien.syntax windows.directx.d3d9types windows.com.syntax windows.com windows.directx windows.directx.d3d9 ; IN: windows.directx.d3dx9math -library: d3dx9 +LIBRARY: d3dx9 CONSTANT: D3DX_PI 3.141592654 ; CONSTANT: D3DX_1BYPI 0.318309886 ; @@ -85,7 +85,7 @@ STRUCT: D3DXCOLOR { a FLOAT } ; TYPEDEF: D3DXCOLOR* LPD3DXCOLOR ; -c-type: ID3DXMatrixStack +C-TYPE: ID3DXMatrixStack TYPEDEF: ID3DXMatrixStack* LPD3DXMATRIXSTACK ; COM-INTERFACE: ID3DXMatrixStack IUnknown "{C7885BA7-F990-4fe7-922D-8515E477DD85}" diff --git a/ffi/windows/directx/d3dx9mesh/d3dx9mesh.factor b/ffi/windows/directx/d3dx9mesh/d3dx9mesh.factor index 8d4387e8a1..74c9f5440e 100644 --- a/ffi/windows/directx/d3dx9mesh/d3dx9mesh.factor +++ b/ffi/windows/directx/d3dx9mesh/d3dx9mesh.factor @@ -4,7 +4,7 @@ windows.directx.d3d9 windows.directx.d3dx9core windows.directx.d3dx9math windows.directx.d3dx9xof ; IN: windows.directx.d3dx9mesh -library: d3dx9 +LIBRARY: d3dx9 TYPEDEF: int D3DXPATCHMESHTYPE ; CONSTANT: D3DXPATCHMESH_RECT 1 ; @@ -76,21 +76,21 @@ CONSTANT: D3DXUVATLAS_DEFAULT 0x00 ; CONSTANT: D3DXUVATLAS_GEODESIC_FAST 0x01 ; CONSTANT: D3DXUVATLAS_GEODESIC_QUALITY 0x02 ; -c-type: ID3DXBaseMesh +C-TYPE: ID3DXBaseMesh TYPEDEF: ID3DXBaseMesh* LPD3DXBASEMESH ; -c-type: ID3DXMesh +C-TYPE: ID3DXMesh TYPEDEF: ID3DXMesh* LPD3DXMESH ; -c-type: ID3DXPMesh +C-TYPE: ID3DXPMesh TYPEDEF: ID3DXPMesh* LPD3DXPMESH ; -c-type: ID3DXSPMesh +C-TYPE: ID3DXSPMesh TYPEDEF: ID3DXSPMesh* LPD3DXSPMESH ; -c-type: ID3DXSkinInfo +C-TYPE: ID3DXSkinInfo TYPEDEF: ID3DXSkinInfo* LPD3DXSKININFO ; -c-type: ID3DXPatchMesh +C-TYPE: ID3DXPatchMesh TYPEDEF: ID3DXPatchMesh* LPD3DXPATCHMESH ; -c-type: ID3DXTextureGutterHelper +C-TYPE: ID3DXTextureGutterHelper TYPEDEF: ID3DXTextureGutterHelper* LPD3DXTEXTUREGUTTERHELPER ; -c-type: ID3DXPRTBuffer +C-TYPE: ID3DXPRTBuffer TYPEDEF: ID3DXPRTBuffer* LPD3DXPRTBUFFER ; STRUCT: D3DXATTRIBUTERANGE @@ -177,7 +177,7 @@ COM-INTERFACE: ID3DXBaseMesh IUnknown "{7ED943DD-52E8-40b5-A8D8-76685C406330}" HRESULT GenerateAdjacency ( FLOAT Epsilon, DWORD* pAdjacency ) HRESULT UpdateSemantics ( D3DVERTEXELEMENT9* Declaration ) ; -c-type: IStream +C-TYPE: IStream COM-INTERFACE: ID3DXMesh ID3DXBaseMesh "{4020E5C2-1403-4929-883F-E2E849FAC195}" HRESULT LockAttributeBuffer ( DWORD Flags, DWORD** ppData ) @@ -761,7 +761,7 @@ FUNCTION: HRESULT D3DXComputeTangent ( DWORD Wrap, DWORD* pAdjacency ) ; -c-type: D3DXUVATLASCB +C-TYPE: D3DXUVATLASCB TYPEDEF: D3DXUVATLASCB* LPD3DXUVATLASCB ; FUNCTION: HRESULT D3DXUVAtlasCreate ( @@ -933,8 +933,8 @@ STRUCT: D3DXSHPRTSPLITMESHCLUSTERDATA TYPEDEF: void* LPD3DXSHPRTSIMCB ; -c-type: ID3DXTextureGutterHelper -c-type: ID3DXPRTBuffer +C-TYPE: ID3DXTextureGutterHelper +C-TYPE: ID3DXPRTBuffer COM-INTERFACE: ID3DXPRTBuffer IUnknown "{F1827E47-00A8-49cd-908C-9D11955F8728}" UINT GetNumSamples ( ) @@ -956,7 +956,7 @@ COM-INTERFACE: ID3DXPRTBuffer IUnknown "{F1827E47-00A8-49cd-908C-9D11955F8728}" HRESULT ExtractToMesh ( UINT NumCoefficients, D3DDECLUSAGE Usage, UINT UsageIndexStart, LPD3DXMESH pScene ) ; -c-type: ID3DXPRTCompBuffer +C-TYPE: ID3DXPRTCompBuffer TYPEDEF: ID3DXPRTCompBuffer* LPD3DXPRTCOMPBUFFER ; COM-INTERFACE: ID3DXPRTCompBuffer IUnknown "{A758D465-FE8D-45ad-9CF0-D01E56266A07}" @@ -998,7 +998,7 @@ COM-INTERFACE: ID3DXTextureGutterHelper IUnknown "{838F01EC-9729-4527-AADB-DF70A HRESULT SetTexelMap ( D3DXVECTOR2* pTexelData ) HRESULT SetGutterMap ( BYTE* pGutterData ) ; -c-type: ID3DXPRTEngine +C-TYPE: ID3DXPRTEngine TYPEDEF: ID3DXPRTEngine* LPD3DXPRTENGINE ; COM-INTERFACE: ID3DXPRTEngine IUnknown "{683A4278-CD5F-4d24-90AD-C4E1B6855D53}" @@ -1126,7 +1126,7 @@ FUNCTION: HRESULT ALIAS: D3DXSavePRTBufferToFile D3DXSavePRTBufferToFileW ; -c-type: D3DXPRTCOMPBUFFER +C-TYPE: D3DXPRTCOMPBUFFER TYPEDEF: D3DXPRTCOMPBUFFER* LPD3DXPRTCOMPBUFFER ; FUNCTION: HRESULT diff --git a/ffi/windows/directx/d3dx9shader/d3dx9shader.factor b/ffi/windows/directx/d3dx9shader/d3dx9shader.factor index 48e5c2fecf..06893963d5 100644 --- a/ffi/windows/directx/d3dx9shader/d3dx9shader.factor +++ b/ffi/windows/directx/d3dx9shader/d3dx9shader.factor @@ -4,7 +4,7 @@ windows.directx.d3d9 windows.directx.d3dx9core windows.directx.d3dx9math windows.types ; IN: windows.directx.d3dx9shader -library: d3dx9 +LIBRARY: d3dx9 : D3DXSHADER_DEBUG ( -- n ) 1 0 shift ; inline : D3DXSHADER_SKIPVALIDATION ( -- n ) 1 1 shift ; inline @@ -101,7 +101,7 @@ STRUCT: D3DXCONSTANT_DESC { DefaultValue LPCVOID } ; TYPEDEF: D3DXCONSTANT_DESC* LPD3DXCONSTANT_DESC ; -c-type: ID3DXConstantTable +C-TYPE: ID3DXConstantTable TYPEDEF: ID3DXConstantTable* LPD3DXCONSTANTTABLE ; COM-INTERFACE: ID3DXConstantTable IUnknown "{AB3C758F-093E-4356-B762-4DB18F1B3A01}" @@ -130,7 +130,7 @@ COM-INTERFACE: ID3DXConstantTable IUnknown "{AB3C758F-093E-4356-B762-4DB18F1B3A0 HRESULT SetMatrixTransposeArray ( LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, D3DXMATRIX* pMatrix, UINT Count ) HRESULT SetMatrixTransposePointerArray ( LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, D3DXMATRIX** ppMatrix, UINT Count ) ; -c-type: ID3DXTextureShader +C-TYPE: ID3DXTextureShader TYPEDEF: ID3DXTextureShader* LPD3DXTEXTURESHADER ; COM-INTERFACE: ID3DXTextureShader IUnknown "{3E3D67F8-AA7A-405d-A857-BA01D4758426}" @@ -163,7 +163,7 @@ ENUM: D3DXINCLUDE_TYPE D3DXINC_SYSTEM ; TYPEDEF: D3DXINCLUDE_TYPE* LPD3DXINCLUDE_TYPE ; -c-type: ID3DXInclude +C-TYPE: ID3DXInclude TYPEDEF: ID3DXInclude* LPD3DXINCLUDE ; COM-INTERFACE: ID3DXInclude f "{00000000-0000-0000-0000-000000000000}" diff --git a/ffi/windows/directx/d3dx9shape/d3dx9shape.factor b/ffi/windows/directx/d3dx9shape/d3dx9shape.factor index 1bd9b47cb2..0da752151b 100644 --- a/ffi/windows/directx/d3dx9shape/d3dx9shape.factor +++ b/ffi/windows/directx/d3dx9shape/d3dx9shape.factor @@ -3,7 +3,7 @@ windows.directx.d3d9 windows.directx.d3dx9core windows.directx.d3dx9mesh windows.types ; IN: windows.directx.d3dx9shape -library: d3dx9 +LIBRARY: d3dx9 TYPEDEF: void* LPGLYPHMETRICSFLOAT ; diff --git a/ffi/windows/directx/d3dx9tex/d3dx9tex.factor b/ffi/windows/directx/d3dx9tex/d3dx9tex.factor index 3f7f827e53..4f14454d69 100644 --- a/ffi/windows/directx/d3dx9tex/d3dx9tex.factor +++ b/ffi/windows/directx/d3dx9tex/d3dx9tex.factor @@ -4,7 +4,7 @@ windows.directx.d3dx9core windows.directx.d3dx9shader windows.types ; IN: windows.directx.d3dx9tex -library: d3dx9 +LIBRARY: d3dx9 : D3DX_FILTER_NONE ( -- n ) 1 0 shift ; inline : D3DX_FILTER_POINT ( -- n ) 2 0 shift ; inline diff --git a/ffi/windows/directx/d3dx9xof/d3dx9xof.factor b/ffi/windows/directx/d3dx9xof/d3dx9xof.factor index 7622340dfc..0f79dbbd6c 100644 --- a/ffi/windows/directx/d3dx9xof/d3dx9xof.factor +++ b/ffi/windows/directx/d3dx9xof/d3dx9xof.factor @@ -2,7 +2,7 @@ USING: alien.syntax classes.struct windows.com windows.com.syntax windows.directx windows.kernel32 windows.ole32 windows.types ; IN: windows.directx.d3dx9xof -library: d3dx9 +LIBRARY: d3dx9 TYPEDEF: DWORD D3DXF_FILEFORMAT ; @@ -31,11 +31,11 @@ STRUCT: D3DXF_FILELOADMEMORY { lpMemory LPCVOID } { dSize SIZE_T } ; -c-type: ID3DXFile -c-type: ID3DXFileSaveObject -c-type: ID3DXFileSaveData -c-type: ID3DXFileEnumObject -c-type: ID3DXFileData +C-TYPE: ID3DXFile +C-TYPE: ID3DXFileSaveObject +C-TYPE: ID3DXFileSaveData +C-TYPE: ID3DXFileEnumObject +C-TYPE: ID3DXFileData TYPEDEF: ID3DXFile* LPD3DXFILE ; TYPEDEF: ID3DXFile** LPLPD3DXFILE ; diff --git a/ffi/windows/directx/dinput/dinput.factor b/ffi/windows/directx/dinput/dinput.factor index d1ce91847b..f8f13e81c5 100644 --- a/ffi/windows/directx/dinput/dinput.factor +++ b/ffi/windows/directx/dinput/dinput.factor @@ -3,7 +3,7 @@ alien alien.c-types alien.syntax kernel system namespaces math classes.struct windows.types windows.directx ; IN: windows.directx.dinput -library: dinput +LIBRARY: dinput TYPEDEF: DWORD D3DCOLOR ; diff --git a/ffi/windows/directx/dwrite/dwrite.factor b/ffi/windows/directx/dwrite/dwrite.factor index 83eee56c9d..b989506d6b 100755 --- a/ffi/windows/directx/dwrite/dwrite.factor +++ b/ffi/windows/directx/dwrite/dwrite.factor @@ -3,7 +3,7 @@ windows.com.syntax windows.directx.dcommon windows.kernel32 windows.ole32 windows.types windows.directx ; IN: windows.directx.dwrite -library: dwrite +LIBRARY: dwrite ENUM: DWRITE_FONT_FILE_TYPE DWRITE_FONT_FILE_TYPE_UNKNOWN @@ -112,7 +112,7 @@ ENUM: DWRITE_FACTORY_TYPE DWRITE_FACTORY_TYPE_SHARED DWRITE_FACTORY_TYPE_ISOLATED ; -c-type: IDWriteFontFileStream +C-TYPE: IDWriteFontFileStream COM-INTERFACE: IDWriteFontFileLoader IUnknown "{727cad4e-d6af-4c9e-8a08-d695b11caa49}" HRESULT CreateStreamFromKey ( void* fontFileReferenceKey, UINT32 fontFileReferenceKeySize, IDWriteFontFileStream** fontFileStream ) ; @@ -162,7 +162,7 @@ COM-INTERFACE: IDWriteRenderingParams IUnknown "{2f0da53a-2add-47cd-82ee-d9ec346 DWRITE_PIXEL_GEOMETRY GetPixelGeometry ( ) DWRITE_RENDERING_MODE GetRenderingMode ( ) ; -c-type: ID2D1SimplifiedGeometrySink +C-TYPE: ID2D1SimplifiedGeometrySink TYPEDEF: ID2D1SimplifiedGeometrySink IDWriteGeometrySink ; @@ -183,8 +183,8 @@ COM-INTERFACE: IDWriteFontFace IUnknown "{5f49804d-7024-4d43-bfa9-d25984f53849}" HRESULT GetGdiCompatibleMetrics ( FLOAT emSize, FLOAT pixelsPerDip, DWRITE_MATRIX* transform, DWRITE_FONT_METRICS* fontFaceMetrics ) HRESULT GetGdiCompatibleGlyphMetrics ( FLOAT emSize, FLOAT pixelsPerDip, DWRITE_MATRIX* transform, BOOL useGdiNatural, USHORT* glyphIndices, UINT32 glyphCount, DWRITE_GLYPH_METRICS* glyphMetrics, BOOL isSideways ) ; -c-type: IDWriteFactory -c-type: IDWriteFontFileEnumerator +C-TYPE: IDWriteFactory +C-TYPE: IDWriteFontFileEnumerator COM-INTERFACE: IDWriteFontCollectionLoader IUnknown "{cca920e4-52f0-492b-bfa8-29c72ee0a468}" HRESULT CreateEnumeratorFromKey ( IDWriteFactory* factory, void* collectionKey, UINT32 collectionKeySize, IDWriteFontFileEnumerator** fontFileEnumerator ) ; @@ -201,8 +201,8 @@ COM-INTERFACE: IDWriteLocalizedStrings IUnknown "{08256209-099a-4b34-b86d-c22b11 HRESULT GetStringLength ( UINT32 index, UINT32* length ) HRESULT GetString ( UINT32 index, WCHAR* stringBuffer, UINT32 size ) ; -c-type: IDWriteFontFamily -c-type: IDWriteFont +C-TYPE: IDWriteFontFamily +C-TYPE: IDWriteFont COM-INTERFACE: IDWriteFontCollection IUnknown "{a84cee02-3eea-4eee-a827-87c1a02a0fcc}" UINT32 GetFontFamilyCount ( ) @@ -361,8 +361,8 @@ STRUCT: DWRITE_TRIMMING { delimiter UINT32 } { delimiterCount UINT32 } ; -c-type: IDWriteTypography -c-type: IDWriteInlineObject +C-TYPE: IDWriteTypography +C-TYPE: IDWriteInlineObject COM-INTERFACE: IDWriteTextFormat IUnknown "{9c906818-31d7-4fd3-a151-7c5e225db55a}" HRESULT SetTextAlignment ( DWRITE_TEXT_ALIGNMENT textAlignment ) @@ -533,7 +533,7 @@ STRUCT: DWRITE_HIT_TEST_METRICS { isText BOOL } { isTrimmed BOOL } ; -c-type: IDWriteTextRenderer +C-TYPE: IDWriteTextRenderer COM-INTERFACE: IDWriteInlineObject IUnknown "{8339FDE3-106F-47ab-8373-1C6295EB10B3}" HRESULT Draw ( void* clientDrawingContext, IDWriteTextRenderer* renderer, FLOAT originX, FLOAT originY, BOOL isSideways, BOOL isRightToLeft, IUnknown* clientDrawingEffect ) @@ -603,7 +603,7 @@ COM-INTERFACE: IDWriteBitmapRenderTarget IUnknown "{5e5a32a3-8dff-4773-9ff6-0696 HRESULT GetSize ( SIZE* size ) HRESULT Resize ( UINT32 width, UINT32 height ) ; -c-type: LOGFONTW +C-TYPE: LOGFONTW COM-INTERFACE: IDWriteGdiInterop IUnknown "{1edd9491-9853-4299-898f-6432983b6f3a}" HRESULT CreateFontFromLOGFONT ( LOGFONTW* logFont, IDWriteFont** font ) diff --git a/ffi/windows/directx/dxfile/dxfile.factor b/ffi/windows/directx/dxfile/dxfile.factor index 72c0b19efa..32299c4839 100755 --- a/ffi/windows/directx/dxfile/dxfile.factor +++ b/ffi/windows/directx/dxfile/dxfile.factor @@ -2,7 +2,7 @@ USING: alien.syntax alien.c-types classes.struct windows.com windows.com.syntax windows.kernel32 windows.ole32 windows.types ; IN: windows.directx.dxfile -library: d3dxof +LIBRARY: d3dxof TYPEDEF: DWORD DXFILEFORMAT ; @@ -29,25 +29,25 @@ STRUCT: DXFILELOADMEMORY { dSize DWORD } ; TYPEDEF: DXFILELOADMEMORY* LPDXFILELOADMEMORY ; -c-type: IDirectXFile +C-TYPE: IDirectXFile TYPEDEF: IDirectXFile* LPDIRECTXFILE ; TYPEDEF: IDirectXFile** LPLPDIRECTXFILE ; -c-type: IDirectXFileEnumObject +C-TYPE: IDirectXFileEnumObject TYPEDEF: IDirectXFileEnumObject* LPDIRECTXFILEENUMOBJECT ; TYPEDEF: IDirectXFileEnumObject** LPLPDIRECTXFILEENUMOBJECT ; -c-type: IDirectXFileSaveObject +C-TYPE: IDirectXFileSaveObject TYPEDEF: IDirectXFileSaveObject* LPDIRECTXFILESAVEOBJECT ; TYPEDEF: IDirectXFileSaveObject** LPLPDIRECTXFILESAVEOBJECT ; -c-type: IDirectXFileObject +C-TYPE: IDirectXFileObject TYPEDEF: IDirectXFileObject* LPDIRECTXFILEOBJECT ; TYPEDEF: IDirectXFileObject** LPLPDIRECTXFILEOBJECT ; -c-type: IDirectXFileData +C-TYPE: IDirectXFileData TYPEDEF: IDirectXFileData* LPDIRECTXFILEDATA ; TYPEDEF: IDirectXFileData** LPLPDIRECTXFILEDATA ; -c-type: IDirectXFileDataReference +C-TYPE: IDirectXFileDataReference TYPEDEF: IDirectXFileDataReference* LPDIRECTXFILEDATAREFERENCE ; TYPEDEF: IDirectXFileDataReference** LPLPDIRECTXFILEDATAREFERENCE ; -c-type: IDirectXFileBinary +C-TYPE: IDirectXFileBinary TYPEDEF: IDirectXFileBinary* LPDIRECTXFILEBINARY ; TYPEDEF: IDirectXFileBinary** LPLPDIRECTXFILEBINARY ; diff --git a/ffi/windows/directx/dxgi/dxgi.factor b/ffi/windows/directx/dxgi/dxgi.factor index 012a7ac497..d110b7ec36 100644 --- a/ffi/windows/directx/dxgi/dxgi.factor +++ b/ffi/windows/directx/dxgi/dxgi.factor @@ -3,7 +3,7 @@ windows.directx.dxgiformat windows.directx.dxgitype windows.kernel32 windows.ole32 windows.types windows.directx ; IN: windows.directx.dxgi -library: dxgi +LIBRARY: dxgi CONSTANT: DXGI_CPU_ACCESS_NONE 0 ; CONSTANT: DXGI_CPU_ACCESS_DYNAMIC 1 ; @@ -119,7 +119,7 @@ COM-INTERFACE: IDXGISurface1 IDXGISurface "{4AE63092-6327-4c1b-80AE-BFE12EA32B86 HRESULT GetDC ( BOOL Discard, HDC* phdc ) HRESULT ReleaseDC ( RECT* pDirtyRect ) ; -c-type: IDXGIOutput +C-TYPE: IDXGIOutput COM-INTERFACE: IDXGIAdapter IDXGIObject "{2411e7e1-12ac-4ccf-bd14-9798e8534dc0}" HRESULT EnumOutputs ( UINT Output, IDXGIOutput** ppOutput ) HRESULT GetDesc ( DXGI_ADAPTER_DESC* pDesc ) diff --git a/ffi/windows/directx/x3daudio/x3daudio.factor b/ffi/windows/directx/x3daudio/x3daudio.factor index 5b9ae612e7..94746a47c8 100644 --- a/ffi/windows/directx/x3daudio/x3daudio.factor +++ b/ffi/windows/directx/x3daudio/x3daudio.factor @@ -2,7 +2,7 @@ USING: alien.c-types alien.syntax classes.struct windows.directx windows.directx.d3dx10math windows.types ; IN: windows.directx.x3daudio -library: x3daudio +LIBRARY: x3daudio CONSTANT: X3DAUDIO_HANDLE_BYTESIZE 20 ; diff --git a/ffi/windows/directx/xact3/xact3.factor b/ffi/windows/directx/xact3/xact3.factor index c9d3beaced..e5b04093c6 100644 --- a/ffi/windows/directx/xact3/xact3.factor +++ b/ffi/windows/directx/xact3/xact3.factor @@ -3,14 +3,14 @@ windows.com.syntax windows.directx windows.directx.xaudio2 windows.kernel32 windows.types ; IN: windows.directx.xact3 -library: xactengine +LIBRARY: xactengine -c-type: IXACT3SoundBank -c-type: IXACT3WaveBank -c-type: IXACT3Cue -c-type: IXACT3Wave -c-type: IXACT3Engine -c-type: XACT_NOTIFICATION +C-TYPE: IXACT3SoundBank +C-TYPE: IXACT3WaveBank +C-TYPE: IXACT3Cue +C-TYPE: IXACT3Wave +C-TYPE: IXACT3Engine +C-TYPE: XACT_NOTIFICATION TYPEDEF: WORD XACTINDEX ; TYPEDEF: BYTE XACTNOTIFICATIONTYPE ; @@ -104,8 +104,8 @@ CONSTANT: XACT_STATE_PAUSED 0x00000040 ; CONSTANT: XACT_STATE_INUSE 0x00000080 ; CONSTANT: XACT_STATE_PREPAREFAILED 0x80000000 ; -c-type: XACT_READFILE_CB -c-type: XACT_GETOVERLAPPEDRESULT_CB +C-TYPE: XACT_READFILE_CB +C-TYPE: XACT_GETOVERLAPPEDRESULT_CB : XACT_FLAG_GLOBAL_SETTINGS_MANAGEDATA ( -- z ) XACT_FLAG_MANAGEDATA ; inline @@ -115,7 +115,7 @@ STRUCT: XACT_FILEIO_CALLBACKS { getOverlappedResultCallback XACT_GETOVERLAPPEDRESULT_CB* } ; TYPEDEF: XACT_FILEIO_CALLBACKS* PXACT_FILEIO_CALLBACKS ; -c-type: XACT_NOTIFICATION_CALLBACK +C-TYPE: XACT_NOTIFICATION_CALLBACK CONSTANT: XACT_RENDERER_ID_LENGTH 0xff ; CONSTANT: XACT_RENDERER_NAME_LENGTH 0xff ; diff --git a/ffi/windows/directx/xapofx/xapofx.factor b/ffi/windows/directx/xapofx/xapofx.factor index 4702fdb878..8309a45017 100644 --- a/ffi/windows/directx/xapofx/xapofx.factor +++ b/ffi/windows/directx/xapofx/xapofx.factor @@ -2,7 +2,7 @@ USING: alien.c-types alien.syntax classes.struct windows.com windows.directx windows.ole32 windows.types ; IN: windows.directx.xapofx -library: xapofx +LIBRARY: xapofx CONSTANT: FXEQ_MIN_FRAMERATE 22000 ; CONSTANT: FXEQ_MAX_FRAMERATE 48000 ; diff --git a/ffi/windows/directx/xaudio2/xaudio2.factor b/ffi/windows/directx/xaudio2/xaudio2.factor index d77b73605c..778b587351 100644 --- a/ffi/windows/directx/xaudio2/xaudio2.factor +++ b/ffi/windows/directx/xaudio2/xaudio2.factor @@ -3,7 +3,7 @@ windows.com windows.com.syntax windows.directx windows.directx.audiodefs windows.types ; IN: windows.directx.xaudio2 -library: xaudio2 +LIBRARY: xaudio2 CONSTANT: XAUDIO2_MAX_BUFFER_BYTES 0x80000000 ; CONSTANT: XAUDIO2_MAX_QUEUED_BUFFERS 64 ; @@ -114,7 +114,7 @@ STRUCT: XAUDIO2_VOICE_DETAILS { InputChannels UINT32 } { InputSampleRate UINT32 } ; -c-type: IXAudio2Voice +C-TYPE: IXAudio2Voice STRUCT: XAUDIO2_SEND_DESCRIPTOR { Flags UINT32 } @@ -200,11 +200,11 @@ CONSTANT: XAUDIO2_LOG_LOCKS 0x0080 ; CONSTANT: XAUDIO2_LOG_MEMORY 0x0100 ; CONSTANT: XAUDIO2_LOG_STREAMING 0x1000 ; -c-type: IXAudio2EngineCallback -c-type: IXAudio2VoiceCallback -c-type: IXAudio2SourceVoice -c-type: IXAudio2SubmixVoice -c-type: IXAudio2MasteringVoice +C-TYPE: IXAudio2EngineCallback +C-TYPE: IXAudio2VoiceCallback +C-TYPE: IXAudio2SourceVoice +C-TYPE: IXAudio2SubmixVoice +C-TYPE: IXAudio2MasteringVoice COM-INTERFACE: IXAudio2 IUnknown "{8bcf1f58-9fe7-4583-8ac6-e2adc465c8bb}" HRESULT GetDeviceCount ( UINT32* pCount ) diff --git a/ffi/windows/directx/xinput/xinput.factor b/ffi/windows/directx/xinput/xinput.factor index d1f844f15c..17919889fe 100755 --- a/ffi/windows/directx/xinput/xinput.factor +++ b/ffi/windows/directx/xinput/xinput.factor @@ -2,7 +2,7 @@ USING: alien.c-types alien.syntax classes.struct windows.directx windows.kernel32 windows.types ; IN: windows.directx.xinput -library: xinput +LIBRARY: xinput CONSTANT: XINPUT_DEVTYPE_GAMEPAD 1 ; CONSTANT: XINPUT_DEVSUBTYPE_GAMEPAD 1 ; diff --git a/ffi/windows/dwmapi/dwmapi.factor b/ffi/windows/dwmapi/dwmapi.factor index 51fc58cd14..683c5bbf6f 100755 --- a/ffi/windows/dwmapi/dwmapi.factor +++ b/ffi/windows/dwmapi/dwmapi.factor @@ -24,7 +24,7 @@ STRUCT: DWM_BLURBEHIND COMPILE< "dwmapi" "dwmapi.dll" stdcall add-library COMPILE> -library: dwmapi +LIBRARY: dwmapi FUNCTION: HRESULT DwmExtendFrameIntoClientArea ( HWND hWnd, MARGINS* pMarInset ) ; FUNCTION: HRESULT DwmEnableBlurBehindWindow ( HWND hWnd, DWM_BLURBEHIND* pBlurBehind ) ; diff --git a/ffi/windows/gdi32/gdi32.factor b/ffi/windows/gdi32/gdi32.factor index 62ca7d045e..8a38c0e56b 100644 --- a/ffi/windows/gdi32/gdi32.factor +++ b/ffi/windows/gdi32/gdi32.factor @@ -1269,7 +1269,7 @@ CONSTANT: NTM_DSIG 0x00200000 ; CONSTANT: GGI_MARK_NONEXISTING_GLYPHS 1 ; -library: gdi32 +LIBRARY: gdi32 ! FUNCTION: AbortDoc ! FUNCTION: AbortPath @@ -1415,11 +1415,11 @@ FUNCTION: HBRUSH CreateSolidBrush ( COLORREF colorref ) ; ! FUNCTION: DdEntry9 ! FUNCTION: DeleteColorSpace FUNCTION: BOOL DeleteDC ( HDC hdc ) ; -destructor: DeleteDC +DESTRUCTOR: DeleteDC ! FUNCTION: DeleteEnhMetaFile ! FUNCTION: DeleteMetaFile FUNCTION: BOOL DeleteObject ( HGDIOBJ hObject ) ; -destructor: DeleteObject +DESTRUCTOR: DeleteObject FUNCTION: int DescribePixelFormat ( HDC hdc, int iPixelFormat, UINT nBytes, PIXELFORMATDESCRIPTOR* ppfd ) ; ! FUNCTION: DeviceCapabilitiesExA ! FUNCTION: DeviceCapabilitiesExW diff --git a/ffi/windows/gdiplus/gdiplus.factor b/ffi/windows/gdiplus/gdiplus.factor index 63234a3856..8acfa8385a 100644 --- a/ffi/windows/gdiplus/gdiplus.factor +++ b/ffi/windows/gdiplus/gdiplus.factor @@ -5,12 +5,12 @@ windows.kernel32 windows.ole32 windows.types ; FROM: alien.c-types => float ; IN: windows.gdiplus -library: gdiplus +LIBRARY: gdiplus FUNCTION: void* GdipAlloc ( SIZE_T size ) ; FUNCTION: void GdipFree ( void* mem ) ; -destructor: GdipFree +DESTRUCTOR: GdipFree TYPEDEF: float REAL ; @@ -915,34 +915,34 @@ STRUCT: ColorMap { oldColor GpColor } { newColor GpColor } ; -c-type: GpGraphics -c-type: GpPen -c-type: GpBrush -c-type: GpHatch -c-type: GpSolidFill -c-type: GpPath -c-type: GpMatrix -c-type: GpPathIterator -c-type: GpCustomLineCap -c-type: GpAdjustableArrowCap -c-type: GpImage -c-type: GpMetafile -c-type: GpImageAttributes -c-type: GpCachedBitmap -c-type: GpBitmap -c-type: GpPathGradient -c-type: GpLineGradient -c-type: GpTexture -c-type: GpFont -c-type: GpFontCollection -c-type: GpFontFamily -c-type: GpStringFormat -c-type: GpRegion -c-type: CGpEffect +C-TYPE: GpGraphics +C-TYPE: GpPen +C-TYPE: GpBrush +C-TYPE: GpHatch +C-TYPE: GpSolidFill +C-TYPE: GpPath +C-TYPE: GpMatrix +C-TYPE: GpPathIterator +C-TYPE: GpCustomLineCap +C-TYPE: GpAdjustableArrowCap +C-TYPE: GpImage +C-TYPE: GpMetafile +C-TYPE: GpImageAttributes +C-TYPE: GpCachedBitmap +C-TYPE: GpBitmap +C-TYPE: GpPathGradient +C-TYPE: GpLineGradient +C-TYPE: GpTexture +C-TYPE: GpFont +C-TYPE: GpFontCollection +C-TYPE: GpFontFamily +C-TYPE: GpStringFormat +C-TYPE: GpRegion +C-TYPE: CGpEffect ! dummy out other windows types we don't care to define yet -c-type: LOGFONTA -c-type: LOGFONTW +C-TYPE: LOGFONTA +C-TYPE: LOGFONTW FUNCTION: GpStatus GdipCreateAdjustableArrowCap ( REAL x, REAL x, BOOL x, GpAdjustableArrowCap** x ) ; FUNCTION: GpStatus GdipGetAdjustableArrowCapFillState ( GpAdjustableArrowCap* x, BOOL* x ) ; @@ -1631,4 +1631,4 @@ CONSTANT: standard-gdi+-startup-input : stop-gdi+ ( token -- ) GdiplusShutdown ; -destructor: stop-gdi+ +DESTRUCTOR: stop-gdi+ diff --git a/ffi/windows/iphlpapi/iphlpapi.factor b/ffi/windows/iphlpapi/iphlpapi.factor index a04ba652f2..dbfcf38b38 100644 --- a/ffi/windows/iphlpapi/iphlpapi.factor +++ b/ffi/windows/iphlpapi/iphlpapi.factor @@ -8,7 +8,7 @@ make refs sequences sequences.extras windows.errors windows.kernel32 windows.types windows.winsock fry ; IN: windows.iphlpapi -library: iphlpapi +LIBRARY: iphlpapi COMPILE< CONSTANT: DEFAULT_MINIMUM_ENTITIES 32 ; diff --git a/ffi/windows/kernel32/kernel32.factor b/ffi/windows/kernel32/kernel32.factor index d244f43450..adc19fbf38 100644 --- a/ffi/windows/kernel32/kernel32.factor +++ b/ffi/windows/kernel32/kernel32.factor @@ -856,7 +856,7 @@ TYPEDEF: PROCESSENTRY32* LPPROCESSENTRY32 ; : RT_ANIICON ( -- id ) 22 MAKEINTRESOURCE ; inline : RT_MANIFEST ( -- id ) 24 MAKEINTRESOURCE ; inline -library: kernel32 +LIBRARY: kernel32 ! FUNCTION: _hread ! FUNCTION: _hwrite ! FUNCTION: _lclose diff --git a/ffi/windows/ntdll/ntdll.factor b/ffi/windows/ntdll/ntdll.factor index 94593ea19b..0491ccd3fb 100644 --- a/ffi/windows/ntdll/ntdll.factor +++ b/ffi/windows/ntdll/ntdll.factor @@ -3,7 +3,7 @@ USING: alien.c-types alien.syntax classes.struct windows.types ; IN: windows.ntdll -library: ntdll +LIBRARY: ntdll TYPEDEF: uint NTSTATUS ; diff --git a/ffi/windows/ole32/ole32.factor b/ffi/windows/ole32/ole32.factor index 2ddab73d42..4fdc7e7dce 100644 --- a/ffi/windows/ole32/ole32.factor +++ b/ffi/windows/ole32/ole32.factor @@ -6,7 +6,7 @@ grouping classes.struct combinators.smart ; SPECIALIZED-ARRAY: uchar IN: windows.ole32 -library: ole32 +LIBRARY: ole32 TYPEDEF: GUID* REFGUID ; TYPEDEF: void* LPUNKNOWN ; diff --git a/ffi/windows/opengl32/opengl32.factor b/ffi/windows/opengl32/opengl32.factor index 20d790296c..443255b833 100644 --- a/ffi/windows/opengl32/opengl32.factor +++ b/ffi/windows/opengl32/opengl32.factor @@ -42,7 +42,7 @@ CONSTANT: WGL_SWAP_UNDERLAY14 0x20000000 ; CONSTANT: WGL_SWAP_UNDERLAY15 0x40000000 ; -library: gl +LIBRARY: gl ! FUNCTION: int ReleaseDC ( HWND hWnd, HDC hDC ) ; diff --git a/ffi/windows/psapi/psapi.factor b/ffi/windows/psapi/psapi.factor index a4bc2e34f7..8c8cc2afed 100644 --- a/ffi/windows/psapi/psapi.factor +++ b/ffi/windows/psapi/psapi.factor @@ -3,7 +3,7 @@ USING: alien.syntax windows.types ; IN: windows.psapi -library: psapi +LIBRARY: psapi FUNCTION: BOOL EnumDeviceDrivers ( LPVOID* lpImageBase, DWORD cb, LPDWORD lpcbNeeded ) ; diff --git a/ffi/windows/shell32/shell32.factor b/ffi/windows/shell32/shell32.factor index 9bb9e8194b..21f41fbbba 100644 --- a/ffi/windows/shell32/shell32.factor +++ b/ffi/windows/shell32/shell32.factor @@ -79,7 +79,7 @@ CONSTANT: ERROR_FILE_NOT_FOUND 2 ; CONSTANT: SHGFP_TYPE_CURRENT 0 ; CONSTANT: SHGFP_TYPE_DEFAULT 1 ; -library: shell32 +LIBRARY: shell32 FUNCTION: HRESULT SHGetFolderPathW ( HWND hwndOwner, int nFolder, HANDLE hToken, DWORD dwReserved, LPTSTR pszPath ) ; ALIAS: SHGetFolderPath SHGetFolderPathW ; diff --git a/ffi/windows/user32/user32.factor b/ffi/windows/user32/user32.factor index 73e07e550c..51779a4c3d 100644 --- a/ffi/windows/user32/user32.factor +++ b/ffi/windows/user32/user32.factor @@ -1007,7 +1007,7 @@ STRUCT: DEVMODE TYPEDEF: DEVMODE* PDEVMODE ; TYPEDEF: DEVMODE* LPDEVMODE ; -library: user32 +LIBRARY: user32 FUNCTION: HKL ActivateKeyboardLayout ( HKL hkl, UINT Flags ) ; FUNCTION: BOOL AdjustWindowRect ( LPRECT lpRect, DWORD dwStyle, BOOL bMenu ) ; diff --git a/ffi/windows/usp10/usp10.factor b/ffi/windows/usp10/usp10.factor index 584c477f54..710dae9d5e 100644 --- a/ffi/windows/usp10/usp10.factor +++ b/ffi/windows/usp10/usp10.factor @@ -4,7 +4,7 @@ USING: alien.c-types alien.syntax alien.destructors classes.struct windows.types ; IN: windows.usp10 -library: usp10 +LIBRARY: usp10 STRUCT: SCRIPT_CONTROL { flags DWORD } ; @@ -57,8 +57,8 @@ CONSTANT: SCRIPT_JUSTIFFY_RESERVED4 15 ; STRUCT: SCRIPT_VISATTR { flags WORD } ; -c-type: SCRIPT_CACHE -c-type: ABC +C-TYPE: SCRIPT_CACHE +C-TYPE: ABC FUNCTION: HRESULT ScriptShape ( HDC hdc, @@ -266,7 +266,7 @@ FUNCTION: HRESULT ScriptStringFree ( SCRIPT_STRING_ANALYSIS* pssa ) ; -destructor: ScriptStringFree +DESTRUCTOR: ScriptStringFree FUNCTION: SIZE* ScriptString_pSize ( SCRIPT_STRING_ANALYSIS ssa ) ; diff --git a/ffi/windows/winmm/winmm.factor b/ffi/windows/winmm/winmm.factor index 5451952961..a37fa6a790 100644 --- a/ffi/windows/winmm/winmm.factor +++ b/ffi/windows/winmm/winmm.factor @@ -4,7 +4,7 @@ USING: alien.c-types alien.syntax byte-arrays formatting kernel math windows.types ; IN: windows.winmm -library: winmm +LIBRARY: winmm TYPEDEF: int MCIERROR ; diff --git a/ffi/windows/winsock/winsock.factor b/ffi/windows/winsock/winsock.factor index 740231cffb..931de361fa 100644 --- a/ffi/windows/winsock/winsock.factor +++ b/ffi/windows/winsock/winsock.factor @@ -116,7 +116,7 @@ CONSTANT: SD_BOTH 2 ; CONSTANT: SOL_SOCKET 0xffff ; -c-type: sockaddr +C-TYPE: sockaddr STRUCT: sockaddr-in { family short } @@ -169,7 +169,7 @@ STRUCT: fd_set { fd_count uint } { fd_array SOCKET[64] } ; -library: winsock +LIBRARY: winsock FUNCTION: int setsockopt ( SOCKET s, int level, int optname, c-string optval, int optlen ) ; FUNCTION: int ioctlsocket ( SOCKET s, long cmd, ulong* *argp ) ; @@ -406,7 +406,7 @@ FUNCTION: DWORD WSAWaitForMultipleEvents ( DWORD cEvents, BOOL fAlertable ) ; -library: mswsock +LIBRARY: mswsock FUNCTION: int AcceptEx ( SOCKET listen, SOCKET accept, diff --git a/ffi/x11/glx/glx.factor b/ffi/x11/glx/glx.factor index 6dc57b9142..3e3d06cbe7 100644 --- a/ffi/x11/glx/glx.factor +++ b/ffi/x11/glx/glx.factor @@ -8,7 +8,7 @@ specialized-arrays accessors ; SPECIALIZED-ARRAY: int IN: x11.glx -library: glx +LIBRARY: glx ! Visual Config Attributes (glXGetConfig, glXGetFBConfigAttrib) CONSTANT: GLX_USE_GL 1 ; ! support GLX rendering ; diff --git a/ffi/x11/xinput2/ffi/ffi.factor b/ffi/x11/xinput2/ffi/ffi.factor index e9a79b8c5c..ceaa89856d 100644 --- a/ffi/x11/xinput2/ffi/ffi.factor +++ b/ffi/x11/xinput2/ffi/ffi.factor @@ -7,7 +7,7 @@ IN: x11.xinput2.ffi COMPILE< "xinput2" "libXi.so" cdecl add-library COMPILE> -library: xinput2 +LIBRARY: xinput2 ! ********* diff --git a/ffi/x11/xlib/xlib.factor b/ffi/x11/xlib/xlib.factor index d685ea8fd8..4d39518c56 100644 --- a/ffi/x11/xlib/xlib.factor +++ b/ffi/x11/xlib/xlib.factor @@ -17,7 +17,7 @@ literals ; FROM: alien.c-types => short ; IN: x11.xlib -library: xlib +LIBRARY: xlib TYPEDEF: ulong XID ; TYPEDEF: XID Window ; @@ -32,12 +32,12 @@ TYPEDEF: XID KeySym ; TYPEDEF: ulong Atom ; TYPEDEF: c-string XPointer ; -c-type: Screen +C-TYPE: Screen TYPEDEF: void* GC ; -c-type: Visual -c-type: XExtData -c-type: XFontProp -c-type: XComposeStatus +C-TYPE: Visual +C-TYPE: XExtData +C-TYPE: XFontProp +C-TYPE: XComposeStatus TYPEDEF: void* XIM ; TYPEDEF: void* XIC ; @@ -281,7 +281,7 @@ X-FUNCTION: int XFreePixmap ( Display* display, Pixmap pixmap ) ; ! 5.2 - Creating, Recoloring, and Freeing Cursors -c-type: XColor +C-TYPE: XColor X-FUNCTION: Cursor XCreatePixmapCursor ( Display* display, Pixmap source, Pixmap mask, XColor* foreground_color, XColor* background_color, uint x, uint y ) ; X-FUNCTION: int XFreeCursor ( Display* display, Cursor cursor ) ; diff --git a/frameworks/db/postgresql/ffi/ffi.factor b/frameworks/db/postgresql/ffi/ffi.factor index e70ef95e40..63dd46c828 100644 --- a/frameworks/db/postgresql/ffi/ffi.factor +++ b/frameworks/db/postgresql/ffi/ffi.factor @@ -59,19 +59,19 @@ TYPEDEF: int PostgresPollingStatusType ; TYPEDEF: int PGTransactionStatusType ; TYPEDEF: int PGVerbosity ; -c-type: PGconn -c-type: PGresult -c-type: PGcancel +C-TYPE: PGconn +C-TYPE: PGresult +C-TYPE: PGcancel TYPEDEF: uint Oid ; TYPEDEF: char pqbool ; -c-type: PQconninfoOption -c-type: PGnotify -c-type: PQArgBlock -c-type: PQprintOpt -c-type: SSL -c-type: FILE +C-TYPE: PQconninfoOption +C-TYPE: PGnotify +C-TYPE: PQArgBlock +C-TYPE: PQprintOpt +C-TYPE: SSL +C-TYPE: FILE -library: postgresql +LIBRARY: postgresql ! Exported functions of libpq diff --git a/frameworks/db/sqlite/ffi/ffi.factor b/frameworks/db/sqlite/ffi/ffi.factor index e657f3c35a..a626ab8531 100644 --- a/frameworks/db/sqlite/ffi/ffi.factor +++ b/frameworks/db/sqlite/ffi/ffi.factor @@ -99,12 +99,12 @@ CONSTANT: SQLITE_OPEN_TEMP_JOURNAL 0x00001000 ; CONSTANT: SQLITE_OPEN_SUBJOURNAL 0x00002000 ; CONSTANT: SQLITE_OPEN_MASTER_JOURNAL 0x00004000 ; -c-type: sqlite3 -c-type: sqlite3_stmt +C-TYPE: sqlite3 +C-TYPE: sqlite3_stmt TYPEDEF: longlong sqlite3_int64 ; TYPEDEF: ulonglong sqlite3_uint64 ; -library: sqlite +LIBRARY: sqlite FUNCTION: int sqlite3_open ( c-string filename, void* ppDb ) ; FUNCTION: int sqlite3_close ( sqlite3* pDb ) ; FUNCTION: c-string sqlite3_errmsg ( sqlite3* pDb ) ; diff --git a/frameworks/game/input/gtk/gtk.factor b/frameworks/game/input/gtk/gtk.factor index 497687bb23..850e27bcd0 100644 --- a/frameworks/game/input/gtk/gtk.factor +++ b/frameworks/game/input/gtk/gtk.factor @@ -9,7 +9,7 @@ SINGLETON: gtk-game-input-backend gtk-game-input-backend game-input-backend set-global -library: gdk +LIBRARY: gdk FUNCTION: Display* gdk_x11_display_get_xdisplay ( GdkDisplay* display ) ; : get-dpy ( -- dpy ) diff --git a/language/alien/cxx/demangle/libstdcxx/libstdcxx.factor b/language/alien/cxx/demangle/libstdcxx/libstdcxx.factor index cbb016e2db..e1c47801f0 100644 --- a/language/alien/cxx/demangle/libstdcxx/libstdcxx.factor +++ b/language/alien/cxx/demangle/libstdcxx/libstdcxx.factor @@ -21,7 +21,7 @@ ERROR: invalid-demangle-args name ; : mangled-name? ( name -- ? ) "_Z" head? ; -destructor: (free) +DESTRUCTOR: (free) :: demangle ( mangled-name -- c++-name ) 0 ulong :> length diff --git a/language/alien/destructors/destructors.factor b/language/alien/destructors/destructors.factor index 0444cc3234..c599fac517 100644 --- a/language/alien/destructors/destructors.factor +++ b/language/alien/destructors/destructors.factor @@ -29,4 +29,4 @@ M: F-destructor dispose alien>> F N ndrop ; FUNCTOR> -SYNTAX: destructor: scan-word define-destructor ; +SYNTAX: DESTRUCTOR: scan-word define-destructor ; diff --git a/language/alien/handles/handles.factor b/language/alien/handles/handles.factor index 07f2b1042a..9d3b0eefa1 100644 --- a/language/alien/handles/handles.factor +++ b/language/alien/handles/handles.factor @@ -32,7 +32,7 @@ PRIVATE> : release-alien-handle ( int -- ) alien-handles get-global delete-at ; inline -destructor: release-alien-handle +DESTRUCTOR: release-alien-handle : ( object -- void* ) ; inline @@ -45,4 +45,4 @@ destructor: release-alien-handle : release-alien-handle-ptr ( alien -- ) alien-address release-alien-handle ; inline -destructor: release-alien-handle-ptr +DESTRUCTOR: release-alien-handle-ptr diff --git a/libs/chipmunk/ffi/ffi.factor b/libs/chipmunk/ffi/ffi.factor index 031a51b9e3..16cf3af435 100644 --- a/libs/chipmunk/ffi/ffi.factor +++ b/libs/chipmunk/ffi/ffi.factor @@ -16,7 +16,7 @@ COMPILE< "chipmunk" deploy-library COMPILE> -library: chipmunk +LIBRARY: chipmunk ! chipmunk_types.h TYPEDEF: double cpFloat ; @@ -192,7 +192,7 @@ FUNCTION: cpVect cpBBClampVect ( cpBB bb, cpVect v ) ; FUNCTION: cpVect cpBBWrapVect ( cpBB bb, cpVect v ) ; ! cpBody.h -c-type: cpBody +C-TYPE: cpBody CALLBACK: void cpBodyVelocityFunc ( cpBody* body, cpVect gravity, cpFloat damping, cpFloat dt ) ; CALLBACK: void cpBodyPositionFunc ( cpBody* body, cpFloat dt ) ; @@ -341,8 +341,8 @@ CALLBACK: cpFloat cpSpaceHashSegmentQueryFunc ( void* obj1, void* obj2, void* da FUNCTION: void cpSpaceHashSegmentQuery ( cpSpaceHash* hash, void* obj, cpVect a, cpVect b, cpFloat t_exit, cpSpaceHashSegmentQueryFunc func, void* data ) ; ! cpShape.h -c-type: cpShape -c-type: cpShapeClass +C-TYPE: cpShape +C-TYPE: cpShapeClass STRUCT: cpSegmentQueryInfo { shape cpShape* } @@ -461,9 +461,9 @@ TYPED: cpPolyShapeContainsVertPartial ( poly: cpPolyShape v: cpVect n: cpVect -- ] 2curry [ max ] reduce 0.0 <= ; inline ! cpArbiter.h -c-type: cpArbiter -c-type: cpSpace -c-type: cpCollisionHandler +C-TYPE: cpArbiter +C-TYPE: cpSpace +C-TYPE: cpCollisionHandler STRUCT: cpContact { p cpVect } @@ -544,8 +544,8 @@ FUNCTION: int cpCollideShapes ( cpShape* a, cpShape* b, cpContact** arr ) ; ! cpConstraint.h -c-type: cpConstraintClass -c-type: cpConstraint +C-TYPE: cpConstraintClass +C-TYPE: cpConstraint CALLBACK: void cpConstraintPreStepFunction ( cpConstraint* constraint, cpFloat dt, cpFloat dt_inv ) ; CALLBACK: void cpConstraintApplyImpulseFunction ( cpConstraint* constraint ) ; @@ -760,7 +760,7 @@ FUNCTION: cpSimpleMotor* cpSimpleMotorInit ( cpSimpleMotor* joint, cpBody* a, cp FUNCTION: cpConstraint* cpSimpleMotorNew ( cpBody* a, cpBody* b, cpFloat rate ) ; ! cpSpace.h -c-type: cpSpace +C-TYPE: cpSpace CALLBACK: int cpCollisionBeginFunc ( cpArbiter* arb, cpSpace* space, void* data ) ; CALLBACK: int cpCollisionPreSolveFunc ( cpArbiter* arb, cpSpace* space, void* data ) ; diff --git a/libs/compression/snappy/ffi/ffi.factor b/libs/compression/snappy/ffi/ffi.factor index 8318e3a737..30701ffbde 100644 --- a/libs/compression/snappy/ffi/ffi.factor +++ b/libs/compression/snappy/ffi/ffi.factor @@ -10,7 +10,7 @@ COMPILE< "snappy" { { [ os unix? ] [ "libsnappy.so" ] } } cond cdecl add-library COMPILE> -library: snappy +LIBRARY: snappy ENUM: snappy_status SNAPPY_OK SNAPPY_INVALID_INPUT SNAPPY_BUFFER_TOO_SMALL ; diff --git a/libs/compression/zlib/ffi/ffi.factor b/libs/compression/zlib/ffi/ffi.factor index ea945029e4..3d8032b630 100644 --- a/libs/compression/zlib/ffi/ffi.factor +++ b/libs/compression/zlib/ffi/ffi.factor @@ -10,7 +10,7 @@ COMPILE< "zlib" { { [ os unix? ] [ "libz.so" ] } } cond cdecl add-library COMPILE> -library: zlib +LIBRARY: zlib TYPEDEF: void Bytef ; TYPEDEF: ulong uLongf ; diff --git a/libs/libc/libc.factor b/libs/libc/libc.factor index 9b4511366c..7f3d50ad67 100644 --- a/libs/libc/libc.factor +++ b/libs/libc/libc.factor @@ -9,7 +9,7 @@ IN: libc HOOK: strerror os ( errno -- str ) ; -library: factor +LIBRARY: factor FUNCTION-ALIAS: errno int err_no ( ) ; @@ -21,7 +21,7 @@ FUNCTION-ALIAS: set-errno void set_err_no ( int err-no ) ; : preserve-errno ( quot -- ) errno [ call ] dip set-errno ; inline -library: libc +LIBRARY: libc FUNCTION-ALIAS: (malloc) void* malloc ( size_t size ) ; @@ -117,7 +117,7 @@ FUNCTION: size_t strlen ( c-string alien ) ; FUNCTION: int system ( c-string command ) ; -destructor: free +DESTRUCTOR: free ! For libc.linux, libc.windows, libc.macosx... COMPILE< "libc." os name>> append require COMPILE> diff --git a/libs/libc/linux/linux.factor b/libs/libc/linux/linux.factor index 62b1c14b03..c435286fa6 100644 --- a/libs/libc/linux/linux.factor +++ b/libs/libc/linux/linux.factor @@ -1,7 +1,7 @@ USING: alien.c-types alien.syntax destructors kernel system ; IN: libc -library: libc +LIBRARY: libc CONSTANT: EPERM 1 ; CONSTANT: ENOENT 2 ; diff --git a/libs/libc/macosx/macosx.factor b/libs/libc/macosx/macosx.factor index 4ee82859c5..a65ac56977 100644 --- a/libs/libc/macosx/macosx.factor +++ b/libs/libc/macosx/macosx.factor @@ -2,7 +2,7 @@ USING: alien.c-types alien.strings alien.syntax destructors kernel system ; IN: libc -library: libc +LIBRARY: libc CONSTANT: EPERM 1 ; CONSTANT: ENOENT 2 ; diff --git a/libs/libc/windows/windows.factor b/libs/libc/windows/windows.factor index 95df0e2c3c..a7ee1ace1c 100644 --- a/libs/libc/windows/windows.factor +++ b/libs/libc/windows/windows.factor @@ -2,7 +2,7 @@ USING: alien.c-types alien.strings alien.syntax destructors io.encodings.utf8 kernel libc system ; IN: libc -library: libc +LIBRARY: libc ! From errno.h in msvc 10: CONSTANT: EPERM 1 ; @@ -104,7 +104,7 @@ CONSTANT: SIGABRT 22 ; CONSTANT: SIGABRT_COMPAT 6 ; -library: libc +LIBRARY: libc FUNCTION: int strerror_s ( char *buffer, size_t numberOfElements, int errnum ) ; diff --git a/libs/magic/ffi/ffi.factor b/libs/magic/ffi/ffi.factor index be4dd28271..b8962137ae 100644 --- a/libs/magic/ffi/ffi.factor +++ b/libs/magic/ffi/ffi.factor @@ -11,7 +11,7 @@ COMPILE< "magic" { { [ os unix? ] [ "libmagic.so" ] } } cond cdecl add-library COMPILE> -library: magic +LIBRARY: magic CONSTANT: MAGIC_NONE 0x000000 ; CONSTANT: MAGIC_DEBUG 0x000001 ; @@ -52,4 +52,4 @@ FUNCTION: int magic_compile ( magic_t magic, c-string path ) ; FUNCTION: int magic_check ( magic_t magic, c-string path ) ; FUNCTION: int magic_errno ( magic_t magic ) ; -destructor: magic_close +DESTRUCTOR: magic_close diff --git a/libs/math/blas/ffi/ffi.factor b/libs/math/blas/ffi/ffi.factor index 71bb52f0da..4c58a73ac2 100644 --- a/libs/math/blas/ffi/ffi.factor +++ b/libs/math/blas/ffi/ffi.factor @@ -9,7 +9,7 @@ add-fortran-library deploy-blas? get [ "blas" deploy-library ] when COMPILE> -library: blas +LIBRARY: blas ! Level 1 BLAS (scalar-vector and vector-vector) diff --git a/libs/math/libm/libm.factor b/libs/math/libm/libm.factor index a0544e5385..16bd582ca2 100644 --- a/libs/math/libm/libm.factor +++ b/libs/math/libm/libm.factor @@ -4,7 +4,7 @@ USING: alien alien.c-types alien.syntax words ; FROM: math => float mod ; IN: math.libm -library: libm +LIBRARY: libm FUNCTION-ALIAS: facos double acos ( double x ) ; diff --git a/libs/random/c/c.factor b/libs/random/c/c.factor index 0215e56a06..1782cb275e 100644 --- a/libs/random/c/c.factor +++ b/libs/random/c/c.factor @@ -5,7 +5,7 @@ USING: alien.c-types alien.syntax kernel random ; IN: random.c -library: libc +LIBRARY: libc FUNCTION: int rand ( ) ; diff --git a/libs/tokyo/alien/tcadb/tcadb.factor b/libs/tokyo/alien/tcadb/tcadb.factor index ca1fb556be..fc953994ff 100644 --- a/libs/tokyo/alien/tcadb/tcadb.factor +++ b/libs/tokyo/alien/tcadb/tcadb.factor @@ -5,7 +5,7 @@ combinators kernel tokyo.alien.tchdb tokyo.alien.tcutil tokyo.alien.tcbdb tokyo.alien.tcfdb tokyo.alien.tctdb ; IN: tokyo.alien.tcadb -library: tokyocabinet +LIBRARY: tokyocabinet TYPEDEF: void* TCADB ; diff --git a/libs/tokyo/alien/tcbdb/tcbdb.factor b/libs/tokyo/alien/tcbdb/tcbdb.factor index 546cc327e1..54e1ddf6fd 100644 --- a/libs/tokyo/alien/tcbdb/tcbdb.factor +++ b/libs/tokyo/alien/tcbdb/tcbdb.factor @@ -4,7 +4,7 @@ USING: alien alien.c-types alien.libraries alien.syntax combinators kernel tokyo.alien.tchdb tokyo.alien.tcutil ; IN: tokyo.alien.tcbdb -library: tokyocabinet +LIBRARY: tokyocabinet TYPEDEF: void* TCBDB ; diff --git a/libs/tokyo/alien/tchdb/tchdb.factor b/libs/tokyo/alien/tchdb/tchdb.factor index ea083f8a69..ee3118e069 100644 --- a/libs/tokyo/alien/tchdb/tchdb.factor +++ b/libs/tokyo/alien/tchdb/tchdb.factor @@ -4,10 +4,10 @@ USING: alien alien.c-types alien.libraries alien.syntax combinators kernel tokyo.alien.tcutil ; IN: tokyo.alien.tchdb -library: tokyocabinet +LIBRARY: tokyocabinet -c-type: TCXSTR -c-type: TCHDB +C-TYPE: TCXSTR +C-TYPE: TCHDB CONSTANT: HDBFOPEN 1 ; CONSTANT: HDBFFATAL 2 ; diff --git a/libs/tokyo/alien/tcrdb/tcrdb.factor b/libs/tokyo/alien/tcrdb/tcrdb.factor index 39cc38334f..a7ba39b178 100644 --- a/libs/tokyo/alien/tcrdb/tcrdb.factor +++ b/libs/tokyo/alien/tcrdb/tcrdb.factor @@ -11,9 +11,9 @@ COMPILE< "tokyotyrant" { { [ os windows? ] [ "tokyotyrant.dll" ] } } cond cdecl add-library COMPILE> -library: tokyotyrant +LIBRARY: tokyotyrant -c-type: TCRDB +C-TYPE: TCRDB ! STRUCT: TCRDB ! { mmtx pthread_mutex_t } ! { eckey pthread_key_t } @@ -94,7 +94,7 @@ CONSTANT: RDBITOPT TDBITOPT ; CONSTANT: RDBITVOID TDBITVOID ; CONSTANT: RDBITKEEP TDBITKEEP ; -c-type: RDBQRY +C-TYPE: RDBQRY ! STRUCT: RDBQRY ! { rdb TCRDB* } ! { args TCLIST* } ; diff --git a/libs/tokyo/alien/tctdb/tctdb.factor b/libs/tokyo/alien/tctdb/tctdb.factor index 020b54d925..33aaf67e78 100644 --- a/libs/tokyo/alien/tctdb/tctdb.factor +++ b/libs/tokyo/alien/tctdb/tctdb.factor @@ -4,11 +4,11 @@ USING: alien alien.c-types alien.libraries alien.syntax combinators kernel tokyo.alien.tchdb tokyo.alien.tcutil ; IN: tokyo.alien.tctdb -library: tokyocabinet +LIBRARY: tokyocabinet -c-type: TDBIDX -c-type: TCTDB -c-type: TCMAP +C-TYPE: TDBIDX +C-TYPE: TCTDB +C-TYPE: TCMAP CONSTANT: TDBFOPEN HDBFOPEN ; CONSTANT: TDBFFATAL HDBFFATAL ; @@ -34,8 +34,8 @@ CONSTANT: TDBITOPT 9998 ; CONSTANT: TDBITVOID 9999 ; CONSTANT: TDBITKEEP 16777216 ; -c-type: TDBCOND -c-type: TDBQRY +C-TYPE: TDBCOND +C-TYPE: TDBQRY CONSTANT: TDBQCSTREQ 0 ; CONSTANT: TDBQCSTRINC 1 ; diff --git a/libs/tokyo/alien/tcutil/tcutil.factor b/libs/tokyo/alien/tcutil/tcutil.factor index afa802569c..76985fc489 100644 --- a/libs/tokyo/alien/tcutil/tcutil.factor +++ b/libs/tokyo/alien/tcutil/tcutil.factor @@ -10,7 +10,7 @@ COMPILE< "tokyocabinet" { { [ os windows? ] [ "tokyocabinet.dll" ] } } cond cdecl add-library COMPILE> -library: tokyocabinet +LIBRARY: tokyocabinet CONSTANT: TCDBTHASH 0 ; CONSTANT: TCDBTBTREE 1 ; @@ -20,7 +20,7 @@ CONSTANT: TCDBTTABLE 3 ; ! FIXME: on windows 64bits this isn't correct, because long is 32bits there, and time_t is int64 TYPEDEF: long tokyo_time_t ; -c-type: TCLIST +C-TYPE: TCLIST FUNCTION: TCLIST* tclistnew ( ) ; FUNCTION: TCLIST* tclistnew2 ( int anum ) ; diff --git a/libs/yaml/ffi/ffi.factor b/libs/yaml/ffi/ffi.factor index 3a54c3779b..aa60bc49da 100644 --- a/libs/yaml/ffi/ffi.factor +++ b/libs/yaml/ffi/ffi.factor @@ -11,9 +11,9 @@ COMPILE< "libyaml" { "yaml" "yaml-0" "libyaml-0-2" } find-library-from-list cdecl add-library COMPILE> -c-type: FILE +C-TYPE: FILE -library: libyaml +LIBRARY: libyaml ! /** ! * @defgroup version Version Information @@ -235,7 +235,7 @@ STRUCT: yaml_token_t ! */ FUNCTION: void yaml_token_delete ( yaml_token_t *token ) ; -destructor: yaml_token_delete +DESTRUCTOR: yaml_token_delete ! /** @} */ @@ -518,7 +518,7 @@ yaml_mapping_end_event_initialize ( yaml_event_t *event ) ; FUNCTION: void yaml_event_delete ( yaml_event_t *event ) ; -destructor: yaml_event_delete +DESTRUCTOR: yaml_event_delete ! /** @} */ @@ -686,7 +686,7 @@ yaml_document_initialize ( yaml_document_t *document, FUNCTION: void yaml_document_delete ( yaml_document_t *document ) ; -destructor: yaml_document_delete +DESTRUCTOR: yaml_document_delete ! /** ! * Get a node of a YAML document. @@ -1053,7 +1053,7 @@ yaml_parser_initialize ( yaml_parser_t *parser ) ; FUNCTION: void yaml_parser_delete ( yaml_parser_t *parser ) ; -destructor: yaml_parser_delete +DESTRUCTOR: yaml_parser_delete ! /** ! * Set a string input. @@ -1412,7 +1412,7 @@ yaml_emitter_initialize ( yaml_emitter_t *emitter ) ; FUNCTION: void yaml_emitter_delete ( yaml_emitter_t *emitter ) ; -destructor: yaml_emitter_delete +DESTRUCTOR: yaml_emitter_delete ! /** ! * Set a string output. diff --git a/libs/zeromq/ffi/ffi.factor b/libs/zeromq/ffi/ffi.factor index ffa3eda610..acf4463a20 100644 --- a/libs/zeromq/ffi/ffi.factor +++ b/libs/zeromq/ffi/ffi.factor @@ -13,7 +13,7 @@ COMPILE< "zmq" { { [ os unix? ] [ "libzmq.so" ] } } cond cdecl add-library COMPILE> -library: zmq +LIBRARY: zmq ! ! 0MQ versioning support. diff --git a/tools/file-picker/linux/linux.factor b/tools/file-picker/linux/linux.factor index d193ae8ad8..2946567b61 100644 --- a/tools/file-picker/linux/linux.factor +++ b/tools/file-picker/linux/linux.factor @@ -5,7 +5,7 @@ IN: file-picker.linux PRIVATE< -library: gtk +LIBRARY: gtk FUNCTION: GtkWidget* gtk_file_chooser_dialog_new ( gchar* title, diff --git a/tools/file-picker/windows/windows.factor b/tools/file-picker/windows/windows.factor index 5a5cc87131..afa2904fc2 100644 --- a/tools/file-picker/windows/windows.factor +++ b/tools/file-picker/windows/windows.factor @@ -4,7 +4,7 @@ io.encodings.string io.encodings.utf8 kernel libc literals math system windows windows.kernel32 windows.shell32 windows.types windows.user32 ; IN: file-picker.windows -library: shell32 +LIBRARY: shell32 TYPEDEF: void* PIDLIST_ABSOLUTE ; TYPEDEF: void* PCIDLIST_ABSOLUTE ; diff --git a/tools/tools/disassembler/udis/udis.factor b/tools/tools/disassembler/udis/udis.factor index cba24027fa..856b761881 100644 --- a/tools/tools/disassembler/udis/udis.factor +++ b/tools/tools/disassembler/udis/udis.factor @@ -13,7 +13,7 @@ COMPILE< "libudis86" { { [ os unix? ] [ "libudis86.so" ] } } cond cdecl add-library COMPILE> -library: libudis86 +LIBRARY: libudis86 TYPEDEF: void ud ;