From 3efabac7ffa684dd6bf092faf12387da6fa28744 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sat, 4 Jun 2016 16:10:23 -0700 Subject: [PATCH] factor: DESTRUCTOR: -> destructor: --- collections/io/files/acls/macosx/macosx.factor | 2 +- ffi/cairo/ffi/ffi.factor | 4 ++-- ffi/core-foundation/core-foundation.factor | 2 +- ffi/core-graphics/core-graphics.factor | 4 ++-- ffi/cuda/contexts/contexts.factor | 4 ++-- ffi/cuda/gl/gl.factor | 4 ++-- ffi/cuda/memory/memory.factor | 2 +- ffi/curl/curl.factor | 4 ++-- ffi/ecdsa/ecdsa.factor | 4 ++-- ffi/fftw/ffi/ffi.factor | 2 +- ffi/gdbm/gdbm.factor | 2 +- ffi/gdk/ffi/ffi.factor | 2 +- ffi/glib/ffi/ffi.factor | 4 ++-- ffi/gobject/ffi/ffi.factor | 2 +- ffi/gtk/ffi/ffi.factor | 2 +- ffi/ifaddrs/ifaddrs.factor | 2 +- ffi/libtls/ffi/ffi.factor | 4 ++-- ffi/openal/openal.factor | 4 ++-- ffi/opengl/glu/glu.factor | 6 +++--- ffi/openssl/libcrypto/libcrypto.factor | 2 +- ffi/openssl/libssl/libssl.factor | 2 +- ffi/pango/ffi/ffi.factor | 4 ++-- ffi/python/ffi/ffi.factor | 2 +- ffi/windows/com/com.factor | 2 +- ffi/windows/gdi32/gdi32.factor | 4 ++-- ffi/windows/gdiplus/gdiplus.factor | 4 ++-- ffi/windows/usp10/usp10.factor | 2 +- language/alien/cxx/demangle/libstdcxx/libstdcxx.factor | 2 +- language/alien/destructors/destructors-docs.factor | 8 ++++---- language/alien/destructors/destructors.factor | 2 +- language/alien/handles/handles.factor | 4 ++-- libs/libc/libc.factor | 2 +- libs/magic/ffi/ffi.factor | 2 +- libs/yaml/ffi/ffi.factor | 10 +++++----- 34 files changed, 56 insertions(+), 56 deletions(-) diff --git a/collections/io/files/acls/macosx/macosx.factor b/collections/io/files/acls/macosx/macosx.factor index 0cd9fdf21d..f68e93c6af 100644 --- a/collections/io/files/acls/macosx/macosx.factor +++ b/collections/io/files/acls/macosx/macosx.factor @@ -34,7 +34,7 @@ in: io.files.acls.macosx : 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/ffi/cairo/ffi/ffi.factor b/ffi/cairo/ffi/ffi.factor index 89bb12c734..e54d923a6c 100644 --- a/ffi/cairo/ffi/ffi.factor +++ b/ffi/cairo/ffi/ffi.factor @@ -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/core-foundation/core-foundation.factor b/ffi/core-foundation/core-foundation.factor index af8559b4ef..39938bcf7b 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-graphics/core-graphics.factor b/ffi/core-graphics/core-graphics.factor index b51c0780a7..a15db31a1a 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 d2ab9c4c95..0dc9c94db3 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/gl/gl.factor b/ffi/cuda/gl/gl.factor index db7c4cdfbd..c69ca89ba5 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 4eb29d308e..e8f52aa40d 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 40caad321a..b48823ad5f 100644 --- a/ffi/curl/curl.factor +++ b/ffi/curl/curl.factor @@ -10,9 +10,9 @@ in: curl > [ 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 0e99eb3da6..9cec3fbafe 100644 --- a/ffi/fftw/ffi/ffi.factor +++ b/ffi/fftw/ffi/ffi.factor @@ -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/gdbm/gdbm.factor b/ffi/gdbm/gdbm.factor index 8f3f7130ff..a4eb9e4465 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 93ff259446..c894c8eb9f 100644 --- a/ffi/gdk/ffi/ffi.factor +++ b/ffi/gdk/ffi/ffi.factor @@ -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/glib/ffi/ffi.factor b/ffi/glib/ffi/ffi.factor index d6695d3b56..232f57e06a 100644 --- a/ffi/glib/ffi/ffi.factor +++ b/ffi/glib/ffi/ffi.factor @@ -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/gobject/ffi/ffi.factor b/ffi/gobject/ffi/ffi.factor index 111c40d1ed..6ea07c7455 100644 --- a/ffi/gobject/ffi/ffi.factor +++ b/ffi/gobject/ffi/ffi.factor @@ -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/gtk/ffi/ffi.factor b/ffi/gtk/ffi/ffi.factor index d625a78dbd..60168c20d4 100644 --- a/ffi/gtk/ffi/ffi.factor +++ b/ffi/gtk/ffi/ffi.factor @@ -25,7 +25,7 @@ IMPLEMENT-STRUCTS: GtkTreeIter ; GIR: vocab:gtk/Gtk-3.0.gir -DESTRUCTOR: gtk_widget_destroy +destructor: gtk_widget_destroy ! [ alGenSources ] keep ; diff --git a/ffi/opengl/glu/glu.factor b/ffi/opengl/glu/glu.factor index 763846e0fd..a872387490 100644 --- a/ffi/opengl/glu/glu.factor +++ b/ffi/opengl/glu/glu.factor @@ -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 0c98847050..1dd1e55c7c 100644 --- a/ffi/openssl/libcrypto/libcrypto.factor +++ b/ffi/openssl/libcrypto/libcrypto.factor @@ -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 580096777c..f6739961d3 100644 --- a/ffi/openssl/libssl/libssl.factor +++ b/ffi/openssl/libssl/libssl.factor @@ -615,7 +615,7 @@ 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 FUNCTION: X509_STORE* X509_STORE_new ( ) ; diff --git a/ffi/pango/ffi/ffi.factor b/ffi/pango/ffi/ffi.factor index e8b93e3656..c24b35ecef 100644 --- a/ffi/pango/ffi/ffi.factor +++ b/ffi/pango/ffi/ffi.factor @@ -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 ! :> length diff --git a/language/alien/destructors/destructors-docs.factor b/language/alien/destructors/destructors-docs.factor index 1a10051858..92ce8b9873 100644 --- a/language/alien/destructors/destructors-docs.factor +++ b/language/alien/destructors/destructors-docs.factor @@ -1,8 +1,8 @@ in: alien.destructors USING: help.markup help.syntax alien destructors ; -HELP: DESTRUCTOR: -{ $syntax "DESTRUCTOR: word" } +HELP: destructor: +{ $syntax "destructor: word" } { $description "Defines four things:" { $list { "a tuple named " { $snippet "word" } " with a single slot holding a " { $link c-ptr } } @@ -15,7 +15,7 @@ HELP: DESTRUCTOR: "Suppose you are writing a binding to the GLib library, which as a " { $snippet "g_object_unref" } " function. Then you can define the function and destructor like so," { $code "FUNCTION: void g_object_unref ( gpointer object ) ;" - "DESTRUCTOR: g_object_unref" + "destructor: g_object_unref" } "Now, memory management becomes easier:" { $code @@ -25,6 +25,6 @@ HELP: DESTRUCTOR: ARTICLE: "alien.destructors" "Alien destructors" "The " { $vocab-link "alien.destructors" } " vocabulary defines a utility parsing word for defining new disposable classes." -{ $subsections postpone: DESTRUCTOR: } ; +{ $subsections postpone: destructor: } ; ABOUT: "alien.destructors" diff --git a/language/alien/destructors/destructors.factor b/language/alien/destructors/destructors.factor index 47908a754d..8e3d1a0d7c 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 6512a09a51..37bf79e725 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/libc/libc.factor b/libs/libc/libc.factor index 6c49158548..ff0ee64a29 100644 --- a/libs/libc/libc.factor +++ b/libs/libc/libc.factor @@ -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... << "libc." os name>> append require >> diff --git a/libs/magic/ffi/ffi.factor b/libs/magic/ffi/ffi.factor index 675f44497a..8ce1767f8e 100644 --- a/libs/magic/ffi/ffi.factor +++ b/libs/magic/ffi/ffi.factor @@ -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/yaml/ffi/ffi.factor b/libs/yaml/ffi/ffi.factor index f09b4195e4..b434a718f4 100644 --- a/libs/yaml/ffi/ffi.factor +++ b/libs/yaml/ffi/ffi.factor @@ -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.