From 048703d6ce9dd76c16d406b34bcf65c23f8d281e Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sat, 4 Jun 2016 16:29:00 -0700 Subject: [PATCH] factor: LIBRARY: -> library: --- .../io/files/trash/windows/windows.factor | 2 +- core/alien/alien-docs.factor | 2 +- core/alien/libraries/libraries-docs.factor | 2 +- ffi/atk/ffi/ffi.factor | 2 +- ffi/cairo/ffi/ffi.factor | 2 +- 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/cuda/demos/hello-world/hello-world.factor | 2 +- ffi/cuda/demos/prefix-sum/prefix-sum.factor | 2 +- ffi/cuda/ffi/ffi.factor | 2 +- ffi/cuda/gl/ffi/ffi.factor | 2 +- ffi/cuda/prettyprint/prettyprint.factor | 2 +- ffi/cuda/syntax/syntax.factor | 2 +- ffi/curl/ffi/ffi.factor | 2 +- ffi/curses/ffi/ffi.factor | 2 +- ffi/fftw/ffi/ffi.factor | 2 +- ffi/forestdb/ffi/ffi.factor | 2 +- ffi/freetype/freetype.factor | 2 +- ffi/gdbm/ffi/ffi.factor | 2 +- ffi/gdk/ffi/ffi.factor | 2 +- 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 | 2 +- ffi/gmodule/ffi/ffi.factor | 2 +- ffi/gobject/ffi/ffi.factor | 2 +- 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 | 2 +- ffi/gtk/gl/ffi/ffi.factor | 2 +- ffi/libtls/ffi/ffi.factor | 2 +- ffi/libudev/libudev.factor | 2 +- ffi/libusb/libusb.factor | 2 +- ffi/lua/lua.factor | 2 +- 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 | 2 +- ffi/opencl/ffi/ffi.factor | 2 +- ffi/opengl/gl/gl.factor | 2 +- ffi/opengl/gl/windows/windows.factor | 2 +- ffi/opengl/glu/glu.factor | 4 ++-- ffi/openssl/libcrypto/libcrypto.factor | 2 +- ffi/openssl/libssl/libssl.factor | 2 +- ffi/pango/cairo/ffi/ffi.factor | 2 +- ffi/pango/ffi/ffi.factor | 2 +- ffi/pcre/ffi/ffi.factor | 2 +- ffi/python/ffi/ffi.factor | 2 +- ffi/readline/ffi/ffi.factor | 2 +- ffi/system-info/macosx/macosx.factor | 2 +- ffi/unix/ffi/ffi.factor | 2 +- ffi/windows/advapi32/advapi32.factor | 2 +- ffi/windows/com/com.factor | 2 +- ffi/windows/crypt32/crypt32.factor | 2 +- ffi/windows/ddk/hid/hid.factor | 2 +- ffi/windows/ddk/setupapi/setupapi.factor | 2 +- ffi/windows/ddk/winusb/winusb.factor | 2 +- ffi/windows/directx/d2d1/d2d1.factor | 2 +- ffi/windows/directx/d3d10/d3d10.factor | 2 +- ffi/windows/directx/d3d10_1/d3d10_1.factor | 2 +- .../directx/d3d10_1shader/d3d10_1shader.factor | 2 +- .../directx/d3d10effect/d3d10effect.factor | 2 +- ffi/windows/directx/d3d10misc/d3d10misc.factor | 2 +- .../directx/d3d10shader/d3d10shader.factor | 2 +- ffi/windows/directx/d3d11/d3d11.factor | 2 +- .../directx/d3d11shader/d3d11shader.factor | 2 +- ffi/windows/directx/d3d9/d3d9.factor | 2 +- .../directx/d3dcompiler/d3dcompiler.factor | 2 +- ffi/windows/directx/d3dcsx/d3dcsx.factor | 2 +- .../directx/d3dx10async/d3dx10async.factor | 2 +- ffi/windows/directx/d3dx10core/d3dx10core.factor | 2 +- ffi/windows/directx/d3dx10mesh/d3dx10mesh.factor | 2 +- ffi/windows/directx/d3dx10tex/d3dx10tex.factor | 2 +- .../directx/d3dx11async/d3dx11async.factor | 2 +- ffi/windows/directx/d3dx11core/d3dx11core.factor | 2 +- ffi/windows/directx/d3dx11tex/d3dx11tex.factor | 2 +- ffi/windows/directx/d3dx9anim/d3dx9anim.factor | 2 +- ffi/windows/directx/d3dx9core/d3dx9core.factor | 2 +- .../directx/d3dx9effect/d3dx9effect.factor | 2 +- ffi/windows/directx/d3dx9math/d3dx9math.factor | 2 +- ffi/windows/directx/d3dx9mesh/d3dx9mesh.factor | 2 +- .../directx/d3dx9shader/d3dx9shader.factor | 2 +- ffi/windows/directx/d3dx9shape/d3dx9shape.factor | 2 +- ffi/windows/directx/d3dx9tex/d3dx9tex.factor | 2 +- ffi/windows/directx/d3dx9xof/d3dx9xof.factor | 2 +- ffi/windows/directx/dinput/dinput.factor | 2 +- ffi/windows/directx/dwrite/dwrite.factor | 2 +- ffi/windows/directx/dxfile/dxfile.factor | 2 +- ffi/windows/directx/dxgi/dxgi.factor | 2 +- ffi/windows/directx/x3daudio/x3daudio.factor | 2 +- ffi/windows/directx/xact3/xact3.factor | 2 +- ffi/windows/directx/xapofx/xapofx.factor | 2 +- ffi/windows/directx/xaudio2/xaudio2.factor | 2 +- ffi/windows/directx/xinput/xinput.factor | 2 +- ffi/windows/dwmapi/dwmapi.factor | 2 +- ffi/windows/gdi32/gdi32.factor | 2 +- ffi/windows/gdiplus/gdiplus.factor | 2 +- 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 | 2 +- ffi/windows/winmm/winmm.factor | 2 +- ffi/windows/winsock/winsock.factor | 4 ++-- ffi/x11/glx/glx.factor | 2 +- ffi/x11/xinput2/ffi/ffi.factor | 2 +- ffi/x11/xlib/xlib.factor | 2 +- frameworks/db/postgresql/ffi/ffi.factor | 2 +- frameworks/db/sqlite/ffi/ffi.factor | 2 +- frameworks/game/input/gtk/gtk.factor | 2 +- language/alien/fortran/fortran-docs.factor | 8 ++++---- language/alien/fortran/fortran-tests.factor | 2 +- language/alien/fortran/fortran.factor | 2 +- language/alien/parser/parser-tests.factor | 2 +- language/alien/prettyprint/prettyprint.factor | 2 +- language/alien/syntax/syntax-docs.factor | 16 ++++++++-------- language/alien/syntax/syntax.factor | 1 + language/compiler/tests/alien.factor | 2 +- language/compiler/tests/linkage-errors.factor | 2 +- language/compiler/tests/x87-regression.factor | 2 +- libs/chipmunk/ffi/ffi.factor | 2 +- libs/compression/snappy/ffi/ffi.factor | 2 +- libs/compression/zlib/ffi/ffi.factor | 2 +- libs/libc/libc.factor | 4 ++-- libs/libc/linux/linux.factor | 2 +- libs/libc/macosx/macosx.factor | 2 +- libs/libc/windows/windows.factor | 4 ++-- libs/magic/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 | 2 +- libs/tokyo/alien/tcrdb/tcrdb.factor | 2 +- libs/tokyo/alien/tctdb/tctdb.factor | 2 +- libs/tokyo/alien/tcutil/tcutil.factor | 2 +- libs/yaml/ffi/ffi.factor | 2 +- 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 +- .../alien/cxx/syntax/syntax-tests.factor | 8 ++++---- .../alien/inline/syntax/syntax-docs.factor | 16 ++++++++-------- .../alien/inline/syntax/syntax-tests.factor | 12 ++++++------ unmaintained/alien/inline/syntax/syntax.factor | 4 ++-- .../alien/marshall/syntax/syntax-docs.factor | 2 +- .../alien/marshall/syntax/syntax-tests.factor | 4 ++-- unmaintained/cryptlib/libcl/libcl.factor | 2 +- unmaintained/db/mysql/ffi/ffi.factor | 2 +- unmaintained/javascriptcore/ffi/ffi.factor | 2 +- unmaintained/jni/jni-internals.factor | 2 +- unmaintained/ldap/libldap/libldap.factor | 2 +- unmaintained/llvm/clang/ffi/ffi.factor | 2 +- unmaintained/llvm/core/core.factor | 4 ++-- unmaintained/llvm/engine/engine.factor | 2 +- unmaintained/odbc/odbc.factor | 2 +- unmaintained/oracle/liboci/liboci.factor | 2 +- unmaintained/pdf/libhpdf/libhpdf.factor | 2 +- 170 files changed, 204 insertions(+), 203 deletions(-) diff --git a/collections/io/files/trash/windows/windows.factor b/collections/io/files/trash/windows/windows.factor index e5d512c005..7ee3fd5464 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 >" } " parse-time evaluation block." $nl "This ensures that if the logical library is later used in the same file, for example by a " { $link postpone: FUNCTION: } " definition. Otherwise, the " { $link add-library } " call will happen too late, after compilation, and the C function calls will not refer to the correct library." diff --git a/ffi/atk/ffi/ffi.factor b/ffi/atk/ffi/ffi.factor index d6dbbf922e..22ff412a29 100644 --- a/ffi/atk/ffi/ffi.factor +++ b/ffi/atk/ffi/ffi.factor @@ -6,7 +6,7 @@ in: atk.ffi << "gobject.ffi" require >> -LIBRARY: atk +library: atk << "atk" { { [ os windows? ] [ "libatk-1.0-0.dll" ] } diff --git a/ffi/cairo/ffi/ffi.factor b/ffi/cairo/ffi/ffi.factor index 0902c32d07..37ce93b84f 100644 --- a/ffi/cairo/ffi/ffi.factor +++ b/ffi/cairo/ffi/ffi.factor @@ -14,7 +14,7 @@ in: cairo.ffi { [ os unix? ] [ "libcairo.so" ] } } cond cdecl add-library >> -LIBRARY: cairo +library: cairo FUNCTION: int cairo_version ( ) ; FUNCTION: c-string cairo_version_string ( ) ; diff --git a/ffi/clutter/cally/ffi/ffi.factor b/ffi/clutter/cally/ffi/ffi.factor index 69b6ace2d0..00757f24a1 100644 --- a/ffi/clutter/cally/ffi/ffi.factor +++ b/ffi/clutter/cally/ffi/ffi.factor @@ -9,7 +9,7 @@ in: clutter.cally.ffi "clutter.ffi" require >> -LIBRARY: clutter.cally +library: clutter.cally << "clutter.cally" { diff --git a/ffi/clutter/cogl/ffi/ffi.factor b/ffi/clutter/cogl/ffi/ffi.factor index f5173923b0..06618dee34 100644 --- a/ffi/clutter/cogl/ffi/ffi.factor +++ b/ffi/clutter/cogl/ffi/ffi.factor @@ -8,7 +8,7 @@ in: clutter.cogl.ffi "gobject.ffi" require >> -LIBRARY: clutter.cogl +library: clutter.cogl << "clutter.cogl" { diff --git a/ffi/clutter/ffi/ffi.factor b/ffi/clutter/ffi/ffi.factor index 873aac8ab4..13e4edb31b 100644 --- a/ffi/clutter/ffi/ffi.factor +++ b/ffi/clutter/ffi/ffi.factor @@ -12,7 +12,7 @@ in: clutter.ffi "clutter.json.ffi" require >> -LIBRARY: clutter +library: clutter << "clutter" { diff --git a/ffi/clutter/gtk/ffi/ffi.factor b/ffi/clutter/gtk/ffi/ffi.factor index 91dded3b78..ba88cc3b36 100644 --- a/ffi/clutter/gtk/ffi/ffi.factor +++ b/ffi/clutter/gtk/ffi/ffi.factor @@ -9,7 +9,7 @@ in: clutter.gtk.ffi "gtk.ffi" require >> -LIBRARY: clutter.gtk +library: clutter.gtk << "clutter.gtk" { diff --git a/ffi/clutter/json/ffi/ffi.factor b/ffi/clutter/json/ffi/ffi.factor index f2fd0f4039..6683ed8083 100644 --- a/ffi/clutter/json/ffi/ffi.factor +++ b/ffi/clutter/json/ffi/ffi.factor @@ -9,7 +9,7 @@ in: clutter.json.ffi "gio.ffi" require >> -LIBRARY: clutter.json +library: clutter.json << "clutter.json" { diff --git a/ffi/cuda/demos/hello-world/hello-world.factor b/ffi/cuda/demos/hello-world/hello-world.factor index 3ecd92b98f..e483957e6d 100644 --- a/ffi/cuda/demos/hello-world/hello-world.factor +++ b/ffi/cuda/demos/hello-world/hello-world.factor @@ -6,7 +6,7 @@ destructors io io.encodings.string io.encodings.utf8 kernel locals math math.parser namespaces sequences strings ; in: cuda.demos.hello-world -CUDA-LIBRARY: hello cuda32 "vocab:cuda/demos/hello-world/hello.ptx" +CUDA-library: hello cuda32 "vocab:cuda/demos/hello-world/hello.ptx" CUDA-FUNCTION: helloWorld ( char* string-ptr ) ; diff --git a/ffi/cuda/demos/prefix-sum/prefix-sum.factor b/ffi/cuda/demos/prefix-sum/prefix-sum.factor index 19c465ac91..8245160d25 100644 --- a/ffi/cuda/demos/prefix-sum/prefix-sum.factor +++ b/ffi/cuda/demos/prefix-sum/prefix-sum.factor @@ -3,7 +3,7 @@ USING: alien.c-types cuda cuda.contexts cuda.libraries cuda.syntax locals ; in: cuda.demos.prefix-sum -CUDA-LIBRARY: prefix-sum cuda32 "vocab:cuda/demos/prefix-sum/prefix-sum.ptx" +CUDA-library: prefix-sum cuda32 "vocab:cuda/demos/prefix-sum/prefix-sum.ptx" CUDA-FUNCTION: prefix_sum_block ( uint* in, uint* out, uint n ) ; diff --git a/ffi/cuda/ffi/ffi.factor b/ffi/cuda/ffi/ffi.factor index 48f5795bc1..c870a0cc89 100644 --- a/ffi/cuda/ffi/ffi.factor +++ b/ffi/cuda/ffi/ffi.factor @@ -11,7 +11,7 @@ in: cuda.ffi } cond add-library >> -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 fee65109f3..55a559bcda 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/prettyprint/prettyprint.factor b/ffi/cuda/prettyprint/prettyprint.factor index 0391803845..de8b1dc483 100644 --- a/ffi/cuda/prettyprint/prettyprint.factor +++ b/ffi/cuda/prettyprint/prettyprint.factor @@ -8,7 +8,7 @@ PREDICATE: cuda-function-word < word def>> { [ length 14 = ] [ last \ cuda-invoke eq? ] } 1&& ; : pprint-cuda-library ( library -- ) - [ \ CUDA-LIBRARY: [ text ] pprint-prefix ] when* ; + [ \ CUDA-library: [ text ] pprint-prefix ] when* ; : pprint-cuda-function ( word quot -- ) [ diff --git a/ffi/cuda/syntax/syntax.factor b/ffi/cuda/syntax/syntax.factor index 8c47104b06..843ef1ae87 100644 --- a/ffi/cuda/syntax/syntax.factor +++ b/ffi/cuda/syntax/syntax.factor @@ -4,7 +4,7 @@ USING: alien.parser cuda.libraries fry kernel lexer namespaces parser ; in: cuda.syntax -SYNTAX: CUDA-LIBRARY: +SYNTAX: CUDA-library: scan-token scan-word scan-object '[ _ _ add-cuda-library ] [ current-cuda-library set-global ] bi ; diff --git a/ffi/curl/ffi/ffi.factor b/ffi/curl/ffi/ffi.factor index 3ae2b46b27..75e8e944a7 100644 --- a/ffi/curl/ffi/ffi.factor +++ b/ffi/curl/ffi/ffi.factor @@ -9,7 +9,7 @@ in: curl.ffi { [ os unix? ] [ "libcurl.so" ] } } cond cdecl add-library >> -LIBRARY: curl +library: curl ! curl.h diff --git a/ffi/curses/ffi/ffi.factor b/ffi/curses/ffi/ffi.factor index 0706c93d37..bcebf90750 100644 --- a/ffi/curses/ffi/ffi.factor +++ b/ffi/curses/ffi/ffi.factor @@ -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/fftw/ffi/ffi.factor b/ffi/fftw/ffi/ffi.factor index 8c5bf894e0..d005a6d69b 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 << "fftw3" { { [ os windows? ] [ "libfftw3-3.dll" ] } diff --git a/ffi/forestdb/ffi/ffi.factor b/ffi/forestdb/ffi/ffi.factor index e78e0c7237..afc9658978 100644 --- a/ffi/forestdb/ffi/ffi.factor +++ b/ffi/forestdb/ffi/ffi.factor @@ -8,7 +8,7 @@ in: forestdb.ffi << "forestdb" dup find-library cdecl add-library >> -LIBRARY: forestdb +library: forestdb ! Begin fdb_types.h diff --git a/ffi/freetype/freetype.factor b/ffi/freetype/freetype.factor index c966c4826a..62a33438f3 100644 --- a/ffi/freetype/freetype.factor +++ b/ffi/freetype/freetype.factor @@ -10,7 +10,7 @@ in: freetype { [ t ] [ drop ] } } cond >> -LIBRARY: freetype +library: freetype TYPEDEF: uchar FT_Byte ; TYPEDEF: void* FT_Bytes ; diff --git a/ffi/gdbm/ffi/ffi.factor b/ffi/gdbm/ffi/ffi.factor index 297e8b0854..bd07e0eba8 100755 --- a/ffi/gdbm/ffi/ffi.factor +++ b/ffi/gdbm/ffi/ffi.factor @@ -8,7 +8,7 @@ in: gdbm.ffi { "gdbm" "gdbm3" "libgdbm-3" } find-library-from-list cdecl add-library >> -LIBRARY: libgdbm +library: libgdbm C-GLOBAL: c-string gdbm_version ; diff --git a/ffi/gdk/ffi/ffi.factor b/ffi/gdk/ffi/ffi.factor index 0545e2fff2..4e6eb8aa69 100644 --- a/ffi/gdk/ffi/ffi.factor +++ b/ffi/gdk/ffi/ffi.factor @@ -11,7 +11,7 @@ in: gdk.ffi "gdk.pixbuf.ffi" require >> -LIBRARY: gdk +library: gdk << "gdk" { diff --git a/ffi/gdk/gl/ffi/ffi.factor b/ffi/gdk/gl/ffi/ffi.factor index ea9ff2104d..e616a5e1c1 100644 --- a/ffi/gdk/gl/ffi/ffi.factor +++ b/ffi/gdk/gl/ffi/ffi.factor @@ -8,7 +8,7 @@ in: gdk.gl.ffi "gdk.ffi" require >> -LIBRARY: gdk.gl +library: gdk.gl << "gdk.gl" { diff --git a/ffi/gdk/pixbuf/ffi/ffi.factor b/ffi/gdk/pixbuf/ffi/ffi.factor index 616f8462de..2e75288321 100644 --- a/ffi/gdk/pixbuf/ffi/ffi.factor +++ b/ffi/gdk/pixbuf/ffi/ffi.factor @@ -8,7 +8,7 @@ in: gdk.pixbuf.ffi << "gio.ffi" require >> -LIBRARY: gdk.pixbuf +library: gdk.pixbuf << "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 23db2d878c..c7a73490bd 100644 --- a/ffi/gio/ffi/ffi.factor +++ b/ffi/gio/ffi/ffi.factor @@ -6,7 +6,7 @@ in: gio.ffi << "gobject.ffi" require >> -LIBRARY: gio +library: gio << "gio" { { [ os windows? ] [ "libgio-2.0-0.dll" ] } diff --git a/ffi/glib/ffi/ffi.factor b/ffi/glib/ffi/ffi.factor index 232f57e06a..20ab7d9511 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 << "glib" { { [ os windows? ] [ "libglib-2.0-0.dll" ] } diff --git a/ffi/gmodule/ffi/ffi.factor b/ffi/gmodule/ffi/ffi.factor index 995c4c90d9..51f9a7f421 100644 --- a/ffi/gmodule/ffi/ffi.factor +++ b/ffi/gmodule/ffi/ffi.factor @@ -6,7 +6,7 @@ in: gmodule.ffi << "glib.ffi" require >> -LIBRARY: gmodule +library: gmodule << "gmodule" { { [ os windows? ] [ "libgmodule-2.0-0.dll" ] } diff --git a/ffi/gobject/ffi/ffi.factor b/ffi/gobject/ffi/ffi.factor index 6ea07c7455..43b432b936 100644 --- a/ffi/gobject/ffi/ffi.factor +++ b/ffi/gobject/ffi/ffi.factor @@ -9,7 +9,7 @@ in: gobject.ffi << "glib.ffi" require >> use: glib.ffi -LIBRARY: gobject +library: gobject << "gobject" { { [ os windows? ] [ "libgobject-2.0-0.dll" ] } diff --git a/ffi/gstreamer/base/ffi/ffi.factor b/ffi/gstreamer/base/ffi/ffi.factor index c65fb76b64..473a506cf4 100644 --- a/ffi/gstreamer/base/ffi/ffi.factor +++ b/ffi/gstreamer/base/ffi/ffi.factor @@ -8,7 +8,7 @@ in: gstreamer.base.ffi "gstreamer.ffi" require >> -LIBRARY: gstreamer.base +library: gstreamer.base << "gstreamer.base" { diff --git a/ffi/gstreamer/controller/ffi/ffi.factor b/ffi/gstreamer/controller/ffi/ffi.factor index 87ae585147..2912b1a97f 100644 --- a/ffi/gstreamer/controller/ffi/ffi.factor +++ b/ffi/gstreamer/controller/ffi/ffi.factor @@ -8,7 +8,7 @@ in: gstreamer.controller.ffi "gstreamer.ffi" require >> -LIBRARY: gstreamer.controller +library: gstreamer.controller << "gstreamer.controller" { diff --git a/ffi/gstreamer/ffi/ffi.factor b/ffi/gstreamer/ffi/ffi.factor index bb73832383..46f1e4c867 100644 --- a/ffi/gstreamer/ffi/ffi.factor +++ b/ffi/gstreamer/ffi/ffi.factor @@ -10,7 +10,7 @@ in: gstreamer.ffi "gmodule.ffi" require >> -LIBRARY: gstreamer +library: gstreamer << "gstreamer" { diff --git a/ffi/gstreamer/net/ffi/ffi.factor b/ffi/gstreamer/net/ffi/ffi.factor index 7cd6c83364..5215a194df 100644 --- a/ffi/gstreamer/net/ffi/ffi.factor +++ b/ffi/gstreamer/net/ffi/ffi.factor @@ -8,7 +8,7 @@ in: gstreamer.net.ffi "gstreamer.ffi" require >> -LIBRARY: gstreamer.net +library: gstreamer.net << "gstreamer.net" { diff --git a/ffi/gtk/ffi/ffi.factor b/ffi/gtk/ffi/ffi.factor index 60168c20d4..bbf083188f 100644 --- a/ffi/gtk/ffi/ffi.factor +++ b/ffi/gtk/ffi/ffi.factor @@ -11,7 +11,7 @@ in: gtk.ffi "gdk.ffi" require >> -LIBRARY: gtk +library: gtk << "gtk" { diff --git a/ffi/gtk/gl/ffi/ffi.factor b/ffi/gtk/gl/ffi/ffi.factor index 5710f8ec79..7867c32d1c 100644 --- a/ffi/gtk/gl/ffi/ffi.factor +++ b/ffi/gtk/gl/ffi/ffi.factor @@ -9,7 +9,7 @@ in: gtk.gl.ffi "gdk.gl.ffi" require >> -LIBRARY: gtk.gl +library: gtk.gl << "gtk.gl" { diff --git a/ffi/libtls/ffi/ffi.factor b/ffi/libtls/ffi/ffi.factor index 46cca37ad4..379597c8fd 100644 --- a/ffi/libtls/ffi/ffi.factor +++ b/ffi/libtls/ffi/ffi.factor @@ -12,7 +12,7 @@ in: libtls.ffi c-type: tls_config c-type: tls_ctx -LIBRARY: libtls +library: libtls FUNCTION: int tls_init ( ) ; FUNCTION: c-string tls_error ( tls_ctx* ctx ) ; diff --git a/ffi/libudev/libudev.factor b/ffi/libudev/libudev.factor index 4d5e5ae96f..07665ff09a 100644 --- a/ffi/libudev/libudev.factor +++ b/ffi/libudev/libudev.factor @@ -6,7 +6,7 @@ in: libudev << "libudev" "libudev.so" cdecl add-library >> -LIBRARY: libudev +library: libudev c-type: udev diff --git a/ffi/libusb/libusb.factor b/ffi/libusb/libusb.factor index 2f2e749fc9..b6ead17f5c 100644 --- a/ffi/libusb/libusb.factor +++ b/ffi/libusb/libusb.factor @@ -12,7 +12,7 @@ in: libusb { [ os macosx? ] [ "libusb-1.0.dylib" ] } { [ os unix? ] [ "libusb-1.0.so" ] } } cond cdecl add-library >> -LIBRARY: libusb +library: libusb : libusb_cpu_to_le16 ( x -- y ) 2 >native-endian le> ; inline diff --git a/ffi/lua/lua.factor b/ffi/lua/lua.factor index 16131219ec..a92fe026f9 100644 --- a/ffi/lua/lua.factor +++ b/ffi/lua/lua.factor @@ -11,7 +11,7 @@ in: lua { [ os unix? ] [ "liblua5.1.so" ] } } cond cdecl add-library >> -LIBRARY: liblua5.1 +library: liblua5.1 ! luaconf.h TYPEDEF: double LUA_NUMBER ; diff --git a/ffi/ogg/ogg.factor b/ffi/ogg/ogg.factor index 88c3c5fe15..b5acbc21d7 100644 --- a/ffi/ogg/ogg.factor +++ b/ffi/ogg/ogg.factor @@ -23,7 +23,7 @@ in: ogg "ogg" deploy-library >> -LIBRARY: ogg +library: ogg STRUCT: oggpack-buffer { endbyte long } diff --git a/ffi/ogg/theora/theora.factor b/ffi/ogg/theora/theora.factor index 9821a484ee..bd1a9166e0 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 b20f935217..6e649d5304 100644 --- a/ffi/ogg/vorbis/vorbis.factor +++ b/ffi/ogg/vorbis/vorbis.factor @@ -24,7 +24,7 @@ in: ogg.vorbis "vorbis" deploy-library >> -LIBRARY: vorbis +library: vorbis STRUCT: vorbis-info { version int } diff --git a/ffi/openal/alut/alut.factor b/ffi/openal/alut/alut.factor index 7077609afd..b954d4b309 100755 --- a/ffi/openal/alut/alut.factor +++ b/ffi/openal/alut/alut.factor @@ -18,7 +18,7 @@ in: openal.alut << os macosx? [ "alut" deploy-library ] unless >> -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 94642843e1..8c29ef2f71 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 127d355e2e..d07a565eaa 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 4276ae658a..ab78804e76 100755 --- a/ffi/openal/openal.factor +++ b/ffi/openal/openal.factor @@ -19,7 +19,7 @@ in: openal << os unix? [ "openal" deploy-library ] unless >> -LIBRARY: openal +library: openal TYPEDEF: char ALboolean ; TYPEDEF: char ALchar ; diff --git a/ffi/opencl/ffi/ffi.factor b/ffi/opencl/ffi/ffi.factor index eaab251af3..4e07dca4e7 100644 --- a/ffi/opencl/ffi/ffi.factor +++ b/ffi/opencl/ffi/ffi.factor @@ -10,7 +10,7 @@ in: opencl.ffi { [ os macosx? ] [ "/System/Library/Frameworks/OpenCL.framework/OpenCL" cdecl ] } { [ os unix? ] [ "libOpenCL.so" cdecl ] } } cond add-library >> -LIBRARY: opencl +library: opencl ! cl_platform.h TYPEDEF: char cl_char ; diff --git a/ffi/opengl/gl/gl.factor b/ffi/opengl/gl/gl.factor index 4ce4d8ed76..6150873b0a 100644 --- a/ffi/opengl/gl/gl.factor +++ b/ffi/opengl/gl/gl.factor @@ -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 << os linux? [ diff --git a/ffi/opengl/gl/windows/windows.factor b/ffi/opengl/gl/windows/windows.factor index a906aa0134..cfb94fbd17 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 aee88aa8d8..0776c2b99f 100644 --- a/ffi/opengl/glu/glu.factor +++ b/ffi/opengl/glu/glu.factor @@ -14,7 +14,7 @@ os { >> -LIBRARY: glu +library: glu ! These are defined as structs in glu.h, but we only ever use pointers to them c-type: GLUnurbs @@ -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 ) ; diff --git a/ffi/openssl/libcrypto/libcrypto.factor b/ffi/openssl/libcrypto/libcrypto.factor index 04ad47b00b..cee4ef4e4d 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 diff --git a/ffi/openssl/libssl/libssl.factor b/ffi/openssl/libssl/libssl.factor index 780235680e..60c6c6a25d 100644 --- a/ffi/openssl/libssl/libssl.factor +++ b/ffi/openssl/libssl/libssl.factor @@ -183,7 +183,7 @@ CONSTANT: SSL_ERROR_WANT_ACCEPT 8 ; c-type: SSL_CTX c-type: SSL_SESSION -LIBRARY: libssl +library: libssl ! =============================================== ! stack.h diff --git a/ffi/pango/cairo/ffi/ffi.factor b/ffi/pango/cairo/ffi/ffi.factor index feb5911cd3..ff753e2c30 100644 --- a/ffi/pango/cairo/ffi/ffi.factor +++ b/ffi/pango/cairo/ffi/ffi.factor @@ -6,7 +6,7 @@ in: pango.cairo.ffi << "pango.ffi" require >> -LIBRARY: pango.cairo +library: pango.cairo << "pango.cairo" { { [ os windows? ] [ "libpangocairo-1.0-0.dll" ] } diff --git a/ffi/pango/ffi/ffi.factor b/ffi/pango/ffi/ffi.factor index c24b35ecef..e3a9a7337f 100644 --- a/ffi/pango/ffi/ffi.factor +++ b/ffi/pango/ffi/ffi.factor @@ -7,7 +7,7 @@ in: pango.ffi << "gobject.ffi" require >> -LIBRARY: pango +library: pango << "pango" { { [ os windows? ] [ "libpango-1.0-0.dll" ] } diff --git a/ffi/pcre/ffi/ffi.factor b/ffi/pcre/ffi/ffi.factor index 286714557e..5428e30fff 100644 --- a/ffi/pcre/ffi/ffi.factor +++ b/ffi/pcre/ffi/ffi.factor @@ -14,7 +14,7 @@ in: pcre.ffi { [ os unix? ] [ "libpcre.so" ] } } cond cdecl add-library >> -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 9a3b13c654..8f39d2932a 100644 --- a/ffi/python/ffi/ffi.factor +++ b/ffi/python/ffi/ffi.factor @@ -11,7 +11,7 @@ cdecl add-library >> ! 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 diff --git a/ffi/readline/ffi/ffi.factor b/ffi/readline/ffi/ffi.factor index 011dab6bf2..8d340cd1e9 100644 --- a/ffi/readline/ffi/ffi.factor +++ b/ffi/readline/ffi/ffi.factor @@ -11,7 +11,7 @@ in: readline.ffi { [ os unix? ] [ "libreadline.so" ] } } cond cdecl add-library >> -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 f20d6bfbd3..dc98dd28b2 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 84d3dab95f..3b8f1dbc3d 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/windows/advapi32/advapi32.factor b/ffi/windows/advapi32/advapi32.factor index d46654fb82..cd7e35d1d7 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 513539cc22..bb3dd296ef 100644 --- a/ffi/windows/com/com.factor +++ b/ffi/windows/com/com.factor @@ -3,7 +3,7 @@ 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 ) diff --git a/ffi/windows/crypt32/crypt32.factor b/ffi/windows/crypt32/crypt32.factor index bb1dfc52f4..0c9b2fecf3 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 00150b0cbb..af9dbd3b19 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 << "hid" "hid.dll" stdcall add-library >> -LIBRARY: hid +library: hid TYPEDEF: LONG NTSTATUS ; TYPEDEF: USHORT USAGE ; diff --git a/ffi/windows/ddk/setupapi/setupapi.factor b/ffi/windows/ddk/setupapi/setupapi.factor index dcf2c8e305..a9ab03332d 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 << "setupapi" "setupapi.dll" stdcall add-library >> -LIBRARY: setupapi +library: setupapi TYPEDEF: DWORDLONG SP_LOG_TOKEN ; TYPEDEF: DWORDLONG* PSP_LOG_TOKEN ; diff --git a/ffi/windows/ddk/winusb/winusb.factor b/ffi/windows/ddk/winusb/winusb.factor index a5d22955b5..a88308c425 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 << "winusb" "winusb.dll" stdcall add-library >> -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 54949d58e3..b2c0e4a2a4 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 ; diff --git a/ffi/windows/directx/d3d10/d3d10.factor b/ffi/windows/directx/d3d10/d3d10.factor index dbfe2eb27c..485b0d3244 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 ; diff --git a/ffi/windows/directx/d3d10_1/d3d10_1.factor b/ffi/windows/directx/d3d10_1/d3d10_1.factor index 1b00e9e828..af0ce25a0e 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 85cfc560cb..24971a9d5b 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 ; diff --git a/ffi/windows/directx/d3d10effect/d3d10effect.factor b/ffi/windows/directx/d3d10effect/d3d10effect.factor index e465689890..43d7313fff 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 ; diff --git a/ffi/windows/directx/d3d10misc/d3d10misc.factor b/ffi/windows/directx/d3d10misc/d3d10misc.factor index 16e46ef5c4..0510c0892d 100644 --- a/ffi/windows/directx/d3d10misc/d3d10misc.factor +++ b/ffi/windows/directx/d3d10misc/d3d10misc.factor @@ -3,7 +3,7 @@ windows.directx windows.directx.d3d10 windows.directx.dxgi windows.types ; in: windows.directx.d3d10misc -LIBRARY: d3d10 +library: d3d10 c-type: ID3D10Blob TYPEDEF: ID3D10Blob* LPD3D10BLOB ; diff --git a/ffi/windows/directx/d3d10shader/d3d10shader.factor b/ffi/windows/directx/d3d10shader/d3d10shader.factor index 21aa25147f..5e6cd62d61 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 fc81e11e1d..627401eb7c 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 ; diff --git a/ffi/windows/directx/d3d11shader/d3d11shader.factor b/ffi/windows/directx/d3d11shader/d3d11shader.factor index 1130a26c6b..3101c33a97 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 ; diff --git a/ffi/windows/directx/d3d9/d3d9.factor b/ffi/windows/directx/d3d9/d3d9.factor index 932c457f12..0f6a438a96 100644 --- a/ffi/windows/directx/d3d9/d3d9.factor +++ b/ffi/windows/directx/d3d9/d3d9.factor @@ -3,7 +3,7 @@ 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 ; diff --git a/ffi/windows/directx/d3dcompiler/d3dcompiler.factor b/ffi/windows/directx/d3dcompiler/d3dcompiler.factor index 6090153489..a8786ba133 100644 --- a/ffi/windows/directx/d3dcompiler/d3dcompiler.factor +++ b/ffi/windows/directx/d3dcompiler/d3dcompiler.factor @@ -1,7 +1,7 @@ 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 diff --git a/ffi/windows/directx/d3dcsx/d3dcsx.factor b/ffi/windows/directx/d3dcsx/d3dcsx.factor index d03666cd86..521f1fb75e 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 b8fa64c3e6..3e051b5deb 100644 --- a/ffi/windows/directx/d3dx10async/d3dx10async.factor +++ b/ffi/windows/directx/d3dx10async/d3dx10async.factor @@ -3,7 +3,7 @@ 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 diff --git a/ffi/windows/directx/d3dx10core/d3dx10core.factor b/ffi/windows/directx/d3dx10core/d3dx10core.factor index e1b6f2a81a..09bca43dbb 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 ; diff --git a/ffi/windows/directx/d3dx10mesh/d3dx10mesh.factor b/ffi/windows/directx/d3dx10mesh/d3dx10mesh.factor index a656f765c2..f71dcb250c 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 bcf1958f73..59ef572aef 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 ab82d9315d..cad31cb840 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 e395f2bd63..1001e8d933 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 e0b0f18cd8..8c3929b738 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 b1e4b8127f..04ebd07a27 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 ; diff --git a/ffi/windows/directx/d3dx9core/d3dx9core.factor b/ffi/windows/directx/d3dx9core/d3dx9core.factor index 21cf596f95..d377ff6bb7 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 ; diff --git a/ffi/windows/directx/d3dx9effect/d3dx9effect.factor b/ffi/windows/directx/d3dx9effect/d3dx9effect.factor index 80dae03820..924567acc3 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 ; diff --git a/ffi/windows/directx/d3dx9math/d3dx9math.factor b/ffi/windows/directx/d3dx9math/d3dx9math.factor index a2a0a31bc9..6b7758f116 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 ; diff --git a/ffi/windows/directx/d3dx9mesh/d3dx9mesh.factor b/ffi/windows/directx/d3dx9mesh/d3dx9mesh.factor index b19a1fa190..4cb5a718d9 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 ; diff --git a/ffi/windows/directx/d3dx9shader/d3dx9shader.factor b/ffi/windows/directx/d3dx9shader/d3dx9shader.factor index c959b596a3..352e5a4d1e 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 diff --git a/ffi/windows/directx/d3dx9shape/d3dx9shape.factor b/ffi/windows/directx/d3dx9shape/d3dx9shape.factor index e8a366b388..00242629c7 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 f2f17a05c7..aa180e565e 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 b614aa5506..244d305df0 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 ; diff --git a/ffi/windows/directx/dinput/dinput.factor b/ffi/windows/directx/dinput/dinput.factor index eee119328c..cf3ed4eea8 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 a66879a296..0f81237e82 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 diff --git a/ffi/windows/directx/dxfile/dxfile.factor b/ffi/windows/directx/dxfile/dxfile.factor index f3d3006bcd..4aebd9d210 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 ; diff --git a/ffi/windows/directx/dxgi/dxgi.factor b/ffi/windows/directx/dxgi/dxgi.factor index 1b3b7e1604..4bd5957a7a 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 ; diff --git a/ffi/windows/directx/x3daudio/x3daudio.factor b/ffi/windows/directx/x3daudio/x3daudio.factor index 28c1ef5c2c..f500e07338 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 a547ed10ce..d520faacf1 100644 --- a/ffi/windows/directx/xact3/xact3.factor +++ b/ffi/windows/directx/xact3/xact3.factor @@ -3,7 +3,7 @@ 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 diff --git a/ffi/windows/directx/xapofx/xapofx.factor b/ffi/windows/directx/xapofx/xapofx.factor index e3776b5ee2..aecdfd142b 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 fcb0f65817..03998e1dac 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 ; diff --git a/ffi/windows/directx/xinput/xinput.factor b/ffi/windows/directx/xinput/xinput.factor index ef2aa3963d..ef9f1e29ab 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 518c84d9f3..9c6ea951dc 100755 --- a/ffi/windows/dwmapi/dwmapi.factor +++ b/ffi/windows/dwmapi/dwmapi.factor @@ -24,7 +24,7 @@ STRUCT: DWM_BLURBEHIND << "dwmapi" "dwmapi.dll" stdcall add-library >> -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 8641d91f26..dc2d0a6efd 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 diff --git a/ffi/windows/gdiplus/gdiplus.factor b/ffi/windows/gdiplus/gdiplus.factor index ba3b983046..e95dbc4cbf 100644 --- a/ffi/windows/gdiplus/gdiplus.factor +++ b/ffi/windows/gdiplus/gdiplus.factor @@ -5,7 +5,7 @@ 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 ) ; diff --git a/ffi/windows/iphlpapi/iphlpapi.factor b/ffi/windows/iphlpapi/iphlpapi.factor index 991b882525..0698675caa 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 << CONSTANT: DEFAULT_MINIMUM_ENTITIES 32 ; diff --git a/ffi/windows/kernel32/kernel32.factor b/ffi/windows/kernel32/kernel32.factor index 5e26098ed0..8898721759 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 4af6d4c1c4..e1394f4c0b 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 67ae0f6f80..ba57e8cbf5 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 851d8bbcf8..091ec2a747 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 76c928a898..7705152126 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 e02f3f2e5d..a021e6789e 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 e2979c682d..2a645c2ff5 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 95813c1258..29d4591665 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 } ; diff --git a/ffi/windows/winmm/winmm.factor b/ffi/windows/winmm/winmm.factor index 1f8f87d458..e72b2e2ff9 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 d404f19b2a..b53b07b8cc 100644 --- a/ffi/windows/winsock/winsock.factor +++ b/ffi/windows/winsock/winsock.factor @@ -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 1d6241ec11..f6dd73a225 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 ed25ee1527..feff07b74b 100644 --- a/ffi/x11/xinput2/ffi/ffi.factor +++ b/ffi/x11/xinput2/ffi/ffi.factor @@ -7,7 +7,7 @@ in: x11.xinput2.ffi << "xinput2" "libXi.so" cdecl add-library >> -LIBRARY: xinput2 +library: xinput2 ! ********* diff --git a/ffi/x11/xlib/xlib.factor b/ffi/x11/xlib/xlib.factor index f0377bb980..04182e2170 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 ; diff --git a/frameworks/db/postgresql/ffi/ffi.factor b/frameworks/db/postgresql/ffi/ffi.factor index dabbf29661..483eee2245 100644 --- a/frameworks/db/postgresql/ffi/ffi.factor +++ b/frameworks/db/postgresql/ffi/ffi.factor @@ -71,7 +71,7 @@ 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 3b064c0cbc..24361a20bd 100644 --- a/frameworks/db/sqlite/ffi/ffi.factor +++ b/frameworks/db/sqlite/ffi/ffi.factor @@ -104,7 +104,7 @@ 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 cf778b51bb..cb1da9f0ac 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/fortran/fortran-docs.factor b/language/alien/fortran/fortran-docs.factor index 1598fd34ba..e1c3d320bc 100644 --- a/language/alien/fortran/fortran-docs.factor +++ b/language/alien/fortran/fortran-docs.factor @@ -37,14 +37,14 @@ HELP: SUBROUTINE: { $syntax "SUBROUTINE: NAME ( [!]ARGUMENT-TYPE NAME, ... ) ;" } { $description "Declares a Fortran subroutine binding with the given arguments. See " { $link "alien.fortran-types" } " for a list of supported types." } ; -HELP: LIBRARY: -{ $syntax "LIBRARY: name" } +HELP: library: +{ $syntax "library: name" } { $values { "name" "a logical library name" } } { $description "Sets the logical library for subsequent " { $link postpone: FUNCTION: } " and " { $link postpone: SUBROUTINE: } " definitions. The given library name must have been opened with a previous call to " { $link add-fortran-library } "." } ; HELP: add-fortran-library { $values { "name" string } { "soname" string } { "fortran-abi" symbol } } -{ $description "Opens the shared library in the file specified by " { $snippet "soname" } " under the logical name " { $snippet "name" } " so that it may be used in subsequent " { $link postpone: LIBRARY: } " and " { $link fortran-invoke } " calls. Functions and subroutines from the library will be defined using the specified " { $snippet "fortran-abi" } ", which must be one of the supported " { $link "alien.fortran-abis" } "." } +{ $description "Opens the shared library in the file specified by " { $snippet "soname" } " under the logical name " { $snippet "name" } " so that it may be used in subsequent " { $link postpone: library: } " and " { $link fortran-invoke } " calls. Functions and subroutines from the library will be defined using the specified " { $snippet "fortran-abi" } ", which must be one of the supported " { $link "alien.fortran-abis" } "." } ; HELP: fortran-invoke @@ -60,7 +60,7 @@ ARTICLE: "alien.fortran" "Fortran FFI" "alien.fortran-types" "alien.fortran-abis" add-fortran-library - postpone: LIBRARY: + postpone: library: postpone: FUNCTION: postpone: SUBROUTINE: fortran-invoke diff --git a/language/alien/fortran/fortran-tests.factor b/language/alien/fortran/fortran-tests.factor index fcd4d0b59c..94ca9a57ac 100644 --- a/language/alien/fortran/fortran-tests.factor +++ b/language/alien/fortran/fortran-tests.factor @@ -9,7 +9,7 @@ QUALIFIED-WITH: alien.c-types c ; in: alien.fortran.tests << intel-unix-abi "(alien.fortran-tests)" (add-fortran-library) >> -LIBRARY: (alien.fortran-tests) +library: (alien.fortran-tests) STRUCT: fortran_test_record { FOO int } { BAR double[2] } diff --git a/language/alien/fortran/fortran.factor b/language/alien/fortran/fortran.factor index 63e842d485..cff9285aef 100755 --- a/language/alien/fortran/fortran.factor +++ b/language/alien/fortran/fortran.factor @@ -448,7 +448,7 @@ SYNTAX: FUNCTION: scan-token current-library get scan-token ")" parse-tokens [ "()" subseq? ] reject ";" expect define-fortran-function ; -SYNTAX: LIBRARY: +SYNTAX: library: scan-token [ current-library set ] [ set-fortran-abi ] bi ; diff --git a/language/alien/parser/parser-tests.factor b/language/alien/parser/parser-tests.factor index f54fc4aa9a..dcc35edb77 100644 --- a/language/alien/parser/parser-tests.factor +++ b/language/alien/parser/parser-tests.factor @@ -105,7 +105,7 @@ CALLBACK: void* alien-parser-callback-effect-test ( int *arg1 float arg2 ) ; { t } [ \ alien-parser-callback-effect-test inline? ] unit-test ! Reported by mnestic -TYPEDEF: int alien-parser-test-int ! reasonably unique name... ; +TYPEDEF: int alien-parser-test-int ; ! reasonably unique name... { "OK!" } [ [ diff --git a/language/alien/prettyprint/prettyprint.factor b/language/alien/prettyprint/prettyprint.factor index bb05a59a44..c6c7a2a7a3 100644 --- a/language/alien/prettyprint/prettyprint.factor +++ b/language/alien/prettyprint/prettyprint.factor @@ -65,7 +65,7 @@ M: typedef-word synopsis* ] if-empty ; : pprint-library ( library -- ) - [ \ LIBRARY: [ text ] pprint-prefix ] when* ; + [ \ library: [ text ] pprint-prefix ] when* ; : pprint-function ( word quot -- ) [ def>> first pprint-c-type ] diff --git a/language/alien/syntax/syntax-docs.factor b/language/alien/syntax/syntax-docs.factor index 44c5233e35..967a0e377c 100644 --- a/language/alien/syntax/syntax-docs.factor +++ b/language/alien/syntax/syntax-docs.factor @@ -19,8 +19,8 @@ ARTICLE: "syntax-aliens" "Alien object literal syntax" postpone: DLL" } ; -HELP: LIBRARY: -{ $syntax "LIBRARY: name" } +HELP: library: +{ $syntax "library: name" } { $values { "name" "a logical library name" } } { $description "Sets the logical library for consequent " { $link postpone: FUNCTION: } ", " { $link postpone: C-GLOBAL: } " and " { $link postpone: CALLBACK: } " definitions, as well as " { $link postpone: &: } " forms." } { $notes "Logical library names are defined with the " { $link add-library } " word." } ; @@ -28,7 +28,7 @@ HELP: LIBRARY: HELP: FUNCTION: { $syntax "FUNCTION: return name ( parameters )" } { $values { "return" "a C return type" } { "name" "a C function name" } { "parameters" "a comma-separated sequence of type/name pairs; " { $snippet "type1 arg1, type2 arg2, ..." } } } -{ $description "Defines a new word " { $snippet "name" } " which calls the C library function with the same " { $snippet "name" } " in the logical library given by the most recent " { $link postpone: LIBRARY: } " declaration." +{ $description "Defines a new word " { $snippet "name" } " which calls the C library function with the same " { $snippet "name" } " in the logical library given by the most recent " { $link postpone: library: } " declaration." $nl "The new word must be compiled before being executed." } { $examples @@ -40,7 +40,7 @@ $nl } "You can define a word for invoking it:" { $unchecked-example - "LIBRARY: foo\nFUNCTION: void the_answer ( c-string question, int value )" + "library: foo\nFUNCTION: void the_answer ( c-string question, int value )" "\"the question\" 42 the_answer" "The answer to the question is 42." } } @@ -51,7 +51,7 @@ HELP: FUNCTION-ALIAS: { $syntax "FUNCTION-ALIAS: factor-name return c_name ( parameters ) ;" } { $values { "factor-name" "a Factor word name" } { "return" "a C return type" } { "name" "a C function name" } { "parameters" "a comma-separated sequence of type/name pairs; " { $snippet "type1 arg1, type2 arg2, ..." } } } -{ $description "Defines a new word " { $snippet "factor-name" } " which calls the C library function named " { $snippet "c_name" } " in the logical library given by the most recent " { $link postpone: LIBRARY: } " declaration." +{ $description "Defines a new word " { $snippet "factor-name" } " which calls the C library function named " { $snippet "c_name" } " in the logical library given by the most recent " { $link postpone: library: } " declaration." $nl "The new word must be compiled before being executed." } { $notes "Note that the parentheses and commas are only syntax sugar and can be omitted. They serve no purpose other than to make the declaration easier to read." } ; @@ -94,7 +94,7 @@ STRUCT: forward { x backward* } ;" } } HELP: CALLBACK: { $syntax "CALLBACK: return type ( parameters )" } { $values { "return" "a C return type" } { "type" "a type name" } { "parameters" "a comma-separated sequence of type/name pairs; " { $snippet "type1 arg1, type2 arg2, ..." } } } -{ $description "Defines a new function pointer C type word " { $snippet "type" } ". The newly defined word works both as a C type and as a wrapper for " { $link alien-callback } " for callbacks that accept the given return type and parameters. The ABI of the callback is decided from the ABI of the active " { $link postpone: LIBRARY: } " declaration." } +{ $description "Defines a new function pointer C type word " { $snippet "type" } ". The newly defined word works both as a C type and as a wrapper for " { $link alien-callback } " for callbacks that accept the given return type and parameters. The ABI of the callback is decided from the ABI of the active " { $link postpone: library: } " declaration." } { $examples { $code "CALLBACK: bool FakeCallback ( int message, void* payload )" @@ -111,7 +111,7 @@ HELP: CALLBACK: HELP: &: { $syntax "&: symbol" } { $values { "symbol" "A C global variable name" } } -{ $description "Pushes the address of a symbol named " { $snippet "symbol" } " from the current library, set with " { $link postpone: LIBRARY: } "." } ; +{ $description "Pushes the address of a symbol named " { $snippet "symbol" } " from the current library, set with " { $link postpone: library: } "." } ; HELP: typedef { $values { "old" "a C type" } { "new" "a C type" } } @@ -123,7 +123,7 @@ HELP: typedef HELP: C-GLOBAL: { $syntax "C-GLOBAL: type name ;" } { $values { "type" "a C type" } { "name" "a C global variable name" } } -{ $description "Defines a getter " { $snippet "name" } " and setter " { $snippet "set-name" } " for the global value in the current library, set with " { $link postpone: LIBRARY: } "." } ; +{ $description "Defines a getter " { $snippet "name" } " and setter " { $snippet "set-name" } " for the global value in the current library, set with " { $link postpone: library: } "." } ; ARTICLE: "alien.enums" "Enumeration types" "The " { $vocab-link "alien.enums" } " vocab contains the implementation for " { $link postpone: ENUM: } " C types, and provides words for converting between enum singletons and integers. It is possible to dispatch off of members of an enum." diff --git a/language/alien/syntax/syntax.factor b/language/alien/syntax/syntax.factor index 2c9f79e4b3..3fae042d06 100755 --- a/language/alien/syntax/syntax.factor +++ b/language/alien/syntax/syntax.factor @@ -13,6 +13,7 @@ SYNTAX: ALIEN: 16 scan-base suffix! ; SYNTAX: BAD-ALIEN suffix! ; SYNTAX: LIBRARY: scan-token current-library set ; +SYNTAX: library: scan-token current-library set ; SYNTAX: FUNCTION: (FUNCTION:) make-function define-inline ; diff --git a/language/compiler/tests/alien.factor b/language/compiler/tests/alien.factor index d27ea1df2c..4b3a98902f 100755 --- a/language/compiler/tests/alien.factor +++ b/language/compiler/tests/alien.factor @@ -36,7 +36,7 @@ in: compiler.tests.alien "f-fastcall" libfactor-ffi-tests-path fastcall add-library >> -LIBRARY: f-cdecl +library: f-cdecl FUNCTION: void ffi_test_0 ( ) ; [ ] [ ffi_test_0 ] unit-test diff --git a/language/compiler/tests/linkage-errors.factor b/language/compiler/tests/linkage-errors.factor index a0e09a35fe..41aee21102 100644 --- a/language/compiler/tests/linkage-errors.factor +++ b/language/compiler/tests/linkage-errors.factor @@ -23,7 +23,7 @@ FUNCTION: void this_does_not_exist ( ) ; << "no_such_library" "no_such_library" cdecl add-library >> -LIBRARY: no_such_library +library: no_such_library FUNCTION: void no_such_function ( ) ; diff --git a/language/compiler/tests/x87-regression.factor b/language/compiler/tests/x87-regression.factor index 7998593b22..729d124e9b 100644 --- a/language/compiler/tests/x87-regression.factor +++ b/language/compiler/tests/x87-regression.factor @@ -2,7 +2,7 @@ in: compiler.tests.x87-regression USING: math.floats.env alien.syntax alien.c-types compiler.test tools.test kernel math ; -LIBRARY: libm +library: libm FUNCTION: double sqrt ( double x ) ; [ { } ] [ diff --git a/libs/chipmunk/ffi/ffi.factor b/libs/chipmunk/ffi/ffi.factor index 6f7bd33b35..2f58ed832d 100644 --- a/libs/chipmunk/ffi/ffi.factor +++ b/libs/chipmunk/ffi/ffi.factor @@ -16,7 +16,7 @@ in: chipmunk.ffi "chipmunk" deploy-library >> -LIBRARY: chipmunk +library: chipmunk ! chipmunk_types.h TYPEDEF: double cpFloat ; diff --git a/libs/compression/snappy/ffi/ffi.factor b/libs/compression/snappy/ffi/ffi.factor index ec2e5a3306..71fdfc782f 100644 --- a/libs/compression/snappy/ffi/ffi.factor +++ b/libs/compression/snappy/ffi/ffi.factor @@ -10,7 +10,7 @@ in: compression.snappy.ffi { [ os unix? ] [ "libsnappy.so" ] } } cond cdecl add-library >> -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 a3d9c28a65..d908e3b1c3 100644 --- a/libs/compression/zlib/ffi/ffi.factor +++ b/libs/compression/zlib/ffi/ffi.factor @@ -10,7 +10,7 @@ in: compression.zlib.ffi { [ os unix? ] [ "libz.so" ] } } cond cdecl add-library >> -LIBRARY: zlib +library: zlib TYPEDEF: void Bytef ; TYPEDEF: ulong uLongf ; diff --git a/libs/libc/libc.factor b/libs/libc/libc.factor index ff0ee64a29..3a3075f076 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 ) ; diff --git a/libs/libc/linux/linux.factor b/libs/libc/linux/linux.factor index bb1c7b0b00..91896f6fb2 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 12f57a32bd..ce0914dcfb 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 34ff20d927..40d48bdc64 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 f2fc25d867..2361d20622 100644 --- a/libs/magic/ffi/ffi.factor +++ b/libs/magic/ffi/ffi.factor @@ -11,7 +11,7 @@ in: magic.ffi { [ os unix? ] [ "libmagic.so" ] } } cond cdecl add-library >> -LIBRARY: magic +library: magic CONSTANT: MAGIC_NONE 0x000000 ; CONSTANT: MAGIC_DEBUG 0x000001 ; diff --git a/libs/math/libm/libm.factor b/libs/math/libm/libm.factor index 1e2567d869..d08f1d280e 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 aa561b9542..f0045a04be 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 3eba38f833..01585ddf6f 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 c980c55868..efe45adcbe 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 e07eea084d..9a4088bf63 100644 --- a/libs/tokyo/alien/tchdb/tchdb.factor +++ b/libs/tokyo/alien/tchdb/tchdb.factor @@ -4,7 +4,7 @@ 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 diff --git a/libs/tokyo/alien/tcrdb/tcrdb.factor b/libs/tokyo/alien/tcrdb/tcrdb.factor index b77f7f0e3b..b81a4f7cba 100644 --- a/libs/tokyo/alien/tcrdb/tcrdb.factor +++ b/libs/tokyo/alien/tcrdb/tcrdb.factor @@ -11,7 +11,7 @@ in: tokyo.alien.tcrdb { [ os windows? ] [ "tokyotyrant.dll" ] } } cond cdecl add-library >> -LIBRARY: tokyotyrant +library: tokyotyrant c-type: TCRDB ! STRUCT: TCRDB diff --git a/libs/tokyo/alien/tctdb/tctdb.factor b/libs/tokyo/alien/tctdb/tctdb.factor index 42576de0cd..d7dae524ca 100644 --- a/libs/tokyo/alien/tctdb/tctdb.factor +++ b/libs/tokyo/alien/tctdb/tctdb.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.tctdb -LIBRARY: tokyocabinet +library: tokyocabinet c-type: TDBIDX c-type: TCTDB diff --git a/libs/tokyo/alien/tcutil/tcutil.factor b/libs/tokyo/alien/tcutil/tcutil.factor index 70ac214c27..36d828d379 100644 --- a/libs/tokyo/alien/tcutil/tcutil.factor +++ b/libs/tokyo/alien/tcutil/tcutil.factor @@ -10,7 +10,7 @@ in: tokyo.alien.tcutil { [ os windows? ] [ "tokyocabinet.dll" ] } } cond cdecl add-library >> -LIBRARY: tokyocabinet +library: tokyocabinet CONSTANT: TCDBTHASH 0 ; CONSTANT: TCDBTBTREE 1 ; diff --git a/libs/yaml/ffi/ffi.factor b/libs/yaml/ffi/ffi.factor index 2e72eee9b7..b20adadf5e 100644 --- a/libs/yaml/ffi/ffi.factor +++ b/libs/yaml/ffi/ffi.factor @@ -13,7 +13,7 @@ in: yaml.ffi c-type: FILE -LIBRARY: libyaml +library: libyaml ! /** ! * @defgroup version Version Information diff --git a/libs/zeromq/ffi/ffi.factor b/libs/zeromq/ffi/ffi.factor index cbb9e5576a..e86f154a38 100644 --- a/libs/zeromq/ffi/ffi.factor +++ b/libs/zeromq/ffi/ffi.factor @@ -13,7 +13,7 @@ in: zeromq.ffi { [ os unix? ] [ "libzmq.so" ] } } cond cdecl add-library >> -LIBRARY: zmq +library: zmq ! ! 0MQ versioning support. diff --git a/tools/file-picker/linux/linux.factor b/tools/file-picker/linux/linux.factor index 3cb1a568c9..e36cddf186 100644 --- a/tools/file-picker/linux/linux.factor +++ b/tools/file-picker/linux/linux.factor @@ -5,7 +5,7 @@ in: file-picker.linux > -LIBRARY: libudis86 +library: libudis86 TYPEDEF: void ud ; diff --git a/unmaintained/alien/cxx/syntax/syntax-tests.factor b/unmaintained/alien/cxx/syntax/syntax-tests.factor index 5c230cbaf1..fb695989a8 100644 --- a/unmaintained/alien/cxx/syntax/syntax-tests.factor +++ b/unmaintained/alien/cxx/syntax/syntax-tests.factor @@ -4,8 +4,8 @@ USING: tools.test alien.cxx.syntax alien.inline.syntax alien.marshall.syntax alien.marshall accessors kernel ; in: alien.cxx.syntax.tests -DELETE-C-LIBRARY: test -C-LIBRARY: test +DELETE-C-library: test +C-library: test COMPILE-AS-C++ @@ -33,8 +33,8 @@ ALIAS: new_string ; [ "abc" ] [ "abc" to-string ] unit-test -DELETE-C-LIBRARY: inheritance -C-LIBRARY: inheritance +DELETE-C-library: inheritance +C-library: inheritance COMPILE-AS-C++ diff --git a/unmaintained/alien/inline/syntax/syntax-docs.factor b/unmaintained/alien/inline/syntax/syntax-docs.factor index f7daf29c00..614a681497 100644 --- a/unmaintained/alien/inline/syntax/syntax-docs.factor +++ b/unmaintained/alien/inline/syntax/syntax-docs.factor @@ -5,7 +5,7 @@ in: alien.inline.syntax HELP: ;C-LIBRARY { $syntax ";C-LIBRARY" } -{ $description "Writes, compiles, and links code generated since previous invocation of " { $link postpone: C-LIBRARY: } "." } +{ $description "Writes, compiles, and links code generated since previous invocation of " { $link postpone: C-library: } "." } { $see-also postpone: compile-c-library } ; HELP: C-FRAMEWORK: @@ -21,7 +21,7 @@ HELP: C-FUNCTION: "USING: alien.inline.syntax prettyprint ;" "in: cmath.ffi" "" - "C-LIBRARY: cmathlib" + "C-library: cmathlib" "" "C-FUNCTION: int add ( int a, int b )" " return a + b;" @@ -39,15 +39,15 @@ HELP: C-INCLUDE: { $description "Appends an include line to the C library in scope." } { $see-also postpone: c-include } ; -HELP: C-LIBRARY: -{ $syntax "C-LIBRARY: name" } +HELP: C-library: +{ $syntax "C-library: name" } { $description "Starts a new C library scope. Other " { $snippet "alien.inline" } " syntax can be used after this word." } { $examples { $example "USING: alien.inline.syntax ;" "in: rectangle.ffi" "" - "C-LIBRARY: rectlib" + "C-library: rectlib" "" "C-STRUCTURE: rectangle { \"int\" \"width\" } { \"int\" \"height\" } ;" "" @@ -82,10 +82,10 @@ HELP: C-TYPEDEF: HELP: COMPILE-AS-C++ { $syntax "COMPILE-AS-C++" } -{ $description "Insert this word anywhere between " { $link postpone: C-LIBRARY: } " and " { $link postpone: ;C-LIBRARY } " and the generated code will be treated as C++ with " { $snippet "extern \"C\"" } " prepended to each function prototype." } ; +{ $description "Insert this word anywhere between " { $link postpone: C-library: } " and " { $link postpone: ;C-LIBRARY } " and the generated code will be treated as C++ with " { $snippet "extern \"C\"" } " prepended to each function prototype." } ; -HELP: DELETE-C-LIBRARY: -{ $syntax "DELETE-C-LIBRARY: name" } +HELP: DELETE-C-library: +{ $syntax "DELETE-C-library: name" } { $description "Deletes the shared library file corresponding to " { $snippet "name" } " . " } { $notes { $list diff --git a/unmaintained/alien/inline/syntax/syntax-tests.factor b/unmaintained/alien/inline/syntax/syntax-tests.factor index 3ab07b0acf..ff9616a846 100644 --- a/unmaintained/alien/inline/syntax/syntax-tests.factor +++ b/unmaintained/alien/inline/syntax/syntax-tests.factor @@ -4,8 +4,8 @@ USING: alien.inline alien.inline.syntax io.directories io.files kernel namespaces tools.test alien.c-types alien.data alien.structs ; in: alien.inline.syntax.tests -DELETE-C-LIBRARY: test -C-LIBRARY: test +DELETE-C-library: test +C-library: test C-FUNCTION: const-int add ( int a, int b ) return a + b; @@ -44,8 +44,8 @@ C-FUNCTION: int area ( rectangle c ) ] unit-test -DELETE-C-LIBRARY: cpplib -C-LIBRARY: cpplib +DELETE-C-library: cpplib +C-library: cpplib COMPILE-AS-C++ @@ -62,8 +62,8 @@ C-FUNCTION: const-char* hello ( ) [ "hello world" ] [ hello ] unit-test -DELETE-C-LIBRARY: compile-error -C-LIBRARY: compile-error +DELETE-C-library: compile-error +C-library: compile-error C-FUNCTION: char* breakme ( ) return not a string; diff --git a/unmaintained/alien/inline/syntax/syntax.factor b/unmaintained/alien/inline/syntax/syntax.factor index 1feb3c0c91..3513a047a5 100644 --- a/unmaintained/alien/inline/syntax/syntax.factor +++ b/unmaintained/alien/inline/syntax/syntax.factor @@ -4,7 +4,7 @@ USING: alien.inline lexer multiline namespaces parser ; in: alien.inline.syntax -SYNTAX: C-LIBRARY: scan define-c-library ; +SYNTAX: C-library: scan define-c-library ; SYNTAX: COMPILE-AS-C++ t library-is-c++ set ; @@ -26,6 +26,6 @@ SYNTAX: C-STRUCTURE: SYNTAX: ;C-LIBRARY compile-c-library ; -SYNTAX: DELETE-C-LIBRARY: scan delete-inline-library ; +SYNTAX: DELETE-C-library: scan delete-inline-library ; SYNTAX: " parse-multiline-string raw-c ; diff --git a/unmaintained/alien/marshall/syntax/syntax-docs.factor b/unmaintained/alien/marshall/syntax/syntax-docs.factor index 5ac624cea1..5489a1f51a 100644 --- a/unmaintained/alien/marshall/syntax/syntax-docs.factor +++ b/unmaintained/alien/marshall/syntax/syntax-docs.factor @@ -15,7 +15,7 @@ HELP: CM-FUNCTION: "USING: alien.inline.syntax alien.marshall.syntax prettyprint ;" "in: example" "" - "C-LIBRARY: exlib" + "C-library: exlib" "" "C-INCLUDE: " "C-INCLUDE: " diff --git a/unmaintained/alien/marshall/syntax/syntax-tests.factor b/unmaintained/alien/marshall/syntax/syntax-tests.factor index 54e6d10e62..57b0eb592f 100644 --- a/unmaintained/alien/marshall/syntax/syntax-tests.factor +++ b/unmaintained/alien/marshall/syntax/syntax-tests.factor @@ -4,8 +4,8 @@ USING: alien.inline.syntax alien.marshall.syntax destructors tools.test accessors kernel ; in: alien.marshall.syntax.tests -DELETE-C-LIBRARY: test -C-LIBRARY: test +DELETE-C-library: test +C-library: test C-INCLUDE: C-INCLUDE: diff --git a/unmaintained/cryptlib/libcl/libcl.factor b/unmaintained/cryptlib/libcl/libcl.factor index 4df80c1f1e..613fa575e4 100644 --- a/unmaintained/cryptlib/libcl/libcl.factor +++ b/unmaintained/cryptlib/libcl/libcl.factor @@ -988,7 +988,7 @@ TYPEDEF: int CRYPT_HANDLE ; { -50 "Need resource to proceed" } } ; -LIBRARY: libcl +library: libcl ! =============================================== ! cryptlib.h diff --git a/unmaintained/db/mysql/ffi/ffi.factor b/unmaintained/db/mysql/ffi/ffi.factor index 32a42fcf71..d1aa7b132f 100644 --- a/unmaintained/db/mysql/ffi/ffi.factor +++ b/unmaintained/db/mysql/ffi/ffi.factor @@ -11,7 +11,7 @@ in: db.mysql.ffi { [ os unix? ] [ "libmysqlclient.so.14" cdecl ] } } cond add-library >> -LIBRARY: mysql +library: mysql FUNCTION: void* mysql_init ( void* mysql ) ; FUNCTION: char* mysql_error ( void* mysql ) ; diff --git a/unmaintained/javascriptcore/ffi/ffi.factor b/unmaintained/javascriptcore/ffi/ffi.factor index 7890cfed01..c23e1aa891 100644 --- a/unmaintained/javascriptcore/ffi/ffi.factor +++ b/unmaintained/javascriptcore/ffi/ffi.factor @@ -16,7 +16,7 @@ in: javascriptcore.ffi } cond >> -LIBRARY: javascriptcore +library: javascriptcore TYPEDEF: void* JSContextGroupRef ; TYPEDEF: void* JSContextRef ; diff --git a/unmaintained/jni/jni-internals.factor b/unmaintained/jni/jni-internals.factor index 1a50ae466b..41f7d91492 100644 --- a/unmaintained/jni/jni-internals.factor +++ b/unmaintained/jni/jni-internals.factor @@ -3,7 +3,7 @@ in: jni-internals USING: kernel alien arrays sequences ; -LIBRARY: jvm +library: jvm TYPEDEF: int jint ; TYPEDEF: uchar jboolean ; diff --git a/unmaintained/ldap/libldap/libldap.factor b/unmaintained/ldap/libldap/libldap.factor index 063eed1343..93f66a5756 100644 --- a/unmaintained/ldap/libldap/libldap.factor +++ b/unmaintained/ldap/libldap/libldap.factor @@ -84,7 +84,7 @@ C-STRUCT: ldap { "int" "ld_refhoplimit" } { "ulong" "ld_options" } ; -LIBRARY: libldap +library: libldap ! =============================================== ! ldap.h diff --git a/unmaintained/llvm/clang/ffi/ffi.factor b/unmaintained/llvm/clang/ffi/ffi.factor index 34f7d62902..c6acdeac26 100644 --- a/unmaintained/llvm/clang/ffi/ffi.factor +++ b/unmaintained/llvm/clang/ffi/ffi.factor @@ -9,7 +9,7 @@ in: llvm.clang.ffi { [ os unix? ] [ "/usrlibclang.so" ] } } cond cdecl add-library >> -LIBRARY: libclang +library: libclang c-type: CXTranslationUnitImpl diff --git a/unmaintained/llvm/core/core.factor b/unmaintained/llvm/core/core.factor index 866bdfdc47..27896db083 100644 --- a/unmaintained/llvm/core/core.factor +++ b/unmaintained/llvm/core/core.factor @@ -20,7 +20,7 @@ in: llvm.core ! llvm-c/Core.h -LIBRARY: LLVMCore +library: LLVMCore TYPEDEF: uint unsigned ; TYPEDEF: unsigned enum ; @@ -407,7 +407,7 @@ FUNCTION: int LLVMCreateMemoryBufferWithContentsOfFile FUNCTION: void LLVMDisposeMemoryBuffer ( LLVMMemoryBufferRef MemBuf ) ; -LIBRARY: LLVMBitReader +library: LLVMBitReader FUNCTION: int LLVMParseBitcode ( LLVMMemoryBufferRef MemBuf, LLVMModuleRef* OutModule, c-string* OutMessage ) ; diff --git a/unmaintained/llvm/engine/engine.factor b/unmaintained/llvm/engine/engine.factor index 1791003ad6..98958d2a96 100644 --- a/unmaintained/llvm/engine/engine.factor +++ b/unmaintained/llvm/engine/engine.factor @@ -15,7 +15,7 @@ in: llvm.engine ! llvm-c/ExecutionEngine.h -LIBRARY: LLVMExecutionEngine +library: LLVMExecutionEngine TYPEDEF: void* LLVMGenericValueRef ; TYPEDEF: void* LLVMExecutionEngineRef ; diff --git a/unmaintained/odbc/odbc.factor b/unmaintained/odbc/odbc.factor index 8d6d0597c8..859882785c 100644 --- a/unmaintained/odbc/odbc.factor +++ b/unmaintained/odbc/odbc.factor @@ -7,7 +7,7 @@ in: odbc << "odbc" "odbc32.dll" stdcall add-library >> -LIBRARY: odbc +library: odbc TYPEDEF: void* usb_dev_handle* ; TYPEDEF: short SQLRETURN ; diff --git a/unmaintained/oracle/liboci/liboci.factor b/unmaintained/oracle/liboci/liboci.factor index 67f62b797e..0660963ac4 100644 --- a/unmaintained/oracle/liboci/liboci.factor +++ b/unmaintained/oracle/liboci/liboci.factor @@ -161,7 +161,7 @@ TYPEDEF: void oci_svc_ctx ; TYPEDEF: void oci_session ; TYPEDEF: void oci_stmt ; -LIBRARY: oci +library: oci ! =============================================== ! ociap.h diff --git a/unmaintained/pdf/libhpdf/libhpdf.factor b/unmaintained/pdf/libhpdf/libhpdf.factor index 51facb2026..eeb6c30cf3 100644 --- a/unmaintained/pdf/libhpdf/libhpdf.factor +++ b/unmaintained/pdf/libhpdf/libhpdf.factor @@ -129,7 +129,7 @@ CONSTANT: HPDF_PAGE_MODE_EOF 4 ; { 0x1075 "HPDF_INVALID_FONT\nAn invalid font-handle was specified." } } ; -LIBRARY: libhpdf +library: libhpdf ! =============================================== ! hpdf.h