diff --git a/ffi/core-foundation/fsevents/fsevents.factor b/ffi/core-foundation/fsevents/fsevents.factor index 15076d0c00..034483fc54 100644 --- a/ffi/core-foundation/fsevents/fsevents.factor +++ b/ffi/core-foundation/fsevents/fsevents.factor @@ -135,7 +135,7 @@ FUNCTION: CFStringRef FSEventStreamCopyDescription ( FSEventStreamRef streamRef flags FSEventStreamCreate ; -C-GLOBAL: void* kCFRunLoopCommonModes +C-GLOBAL: void* kCFRunLoopCommonModes ; : schedule-event-stream ( event-stream -- ) CFRunLoopGetMain diff --git a/ffi/core-text/core-text.factor b/ffi/core-text/core-text.factor index e54cba7ec2..8143e814f1 100644 --- a/ffi/core-text/core-text.factor +++ b/ffi/core-text/core-text.factor @@ -10,14 +10,14 @@ in: core-text TYPEDEF: void* CTLineRef ; -C-GLOBAL: CFStringRef kCTFontAttributeName -C-GLOBAL: CFStringRef kCTKernAttributeName -C-GLOBAL: CFStringRef kCTLigatureAttributeName -C-GLOBAL: CFStringRef kCTForegroundColorAttributeName -C-GLOBAL: CFStringRef kCTParagraphStyleAttributeName -C-GLOBAL: CFStringRef kCTUnderlineStyleAttributeName -C-GLOBAL: CFStringRef kCTVerticalFormsAttributeName -C-GLOBAL: CFStringRef kCTGlyphInfoAttributeName +C-GLOBAL: CFStringRef kCTFontAttributeName ; +C-GLOBAL: CFStringRef kCTKernAttributeName ; +C-GLOBAL: CFStringRef kCTLigatureAttributeName ; +C-GLOBAL: CFStringRef kCTForegroundColorAttributeName ; +C-GLOBAL: CFStringRef kCTParagraphStyleAttributeName ; +C-GLOBAL: CFStringRef kCTUnderlineStyleAttributeName ; +C-GLOBAL: CFStringRef kCTVerticalFormsAttributeName ; +C-GLOBAL: CFStringRef kCTGlyphInfoAttributeName ; FUNCTION: CTLineRef CTLineCreateWithAttributedString ( CFAttributedStringRef string ) ; diff --git a/ffi/core-text/fonts/fonts.factor b/ffi/core-text/fonts/fonts.factor index 2cf45b4bbd..e6f3a2a0de 100644 --- a/ffi/core-text/fonts/fonts.factor +++ b/ffi/core-text/fonts/fonts.factor @@ -18,28 +18,28 @@ TYPEDEF: void* CTFontDescriptorRef ; : kCTFontVerticalTrait ( -- n ) 11 2^ ; inline : kCTFontUIOptimizedTrait ( -- n ) 12 2^ ; inline -C-GLOBAL: CFStringRef kCTFontSymbolicTrait -C-GLOBAL: CFStringRef kCTFontWeightTrait -C-GLOBAL: CFStringRef kCTFontWidthTrait -C-GLOBAL: CFStringRef kCTFontSlantTrait +C-GLOBAL: CFStringRef kCTFontSymbolicTrait ; +C-GLOBAL: CFStringRef kCTFontWeightTrait ; +C-GLOBAL: CFStringRef kCTFontWidthTrait ; +C-GLOBAL: CFStringRef kCTFontSlantTrait ; -C-GLOBAL: CFStringRef kCTFontNameAttribute -C-GLOBAL: CFStringRef kCTFontDisplayNameAttribute -C-GLOBAL: CFStringRef kCTFontFamilyNameAttribute -C-GLOBAL: CFStringRef kCTFontStyleNameAttribute -C-GLOBAL: CFStringRef kCTFontTraitsAttribute -C-GLOBAL: CFStringRef kCTFontVariationAttribute -C-GLOBAL: CFStringRef kCTFontSizeAttribute -C-GLOBAL: CFStringRef kCTFontMatrixAttribute -C-GLOBAL: CFStringRef kCTFontCascadeListAttribute -C-GLOBAL: CFStringRef kCTFontCharacterSetAttribute -C-GLOBAL: CFStringRef kCTFontLanguagesAttribute -C-GLOBAL: CFStringRef kCTFontBaselineAdjustAttribute -C-GLOBAL: CFStringRef kCTFontMacintoshEncodingsAttribute -C-GLOBAL: CFStringRef kCTFontFeaturesAttribute -C-GLOBAL: CFStringRef kCTFontFeatureSettingsAttribute -C-GLOBAL: CFStringRef kCTFontFixedAdvanceAttribute -C-GLOBAL: CFStringRef kCTFontOrientationAttribute +C-GLOBAL: CFStringRef kCTFontNameAttribute ; +C-GLOBAL: CFStringRef kCTFontDisplayNameAttribute ; +C-GLOBAL: CFStringRef kCTFontFamilyNameAttribute ; +C-GLOBAL: CFStringRef kCTFontStyleNameAttribute ; +C-GLOBAL: CFStringRef kCTFontTraitsAttribute ; +C-GLOBAL: CFStringRef kCTFontVariationAttribute ; +C-GLOBAL: CFStringRef kCTFontSizeAttribute ; +C-GLOBAL: CFStringRef kCTFontMatrixAttribute ; +C-GLOBAL: CFStringRef kCTFontCascadeListAttribute ; +C-GLOBAL: CFStringRef kCTFontCharacterSetAttribute ; +C-GLOBAL: CFStringRef kCTFontLanguagesAttribute ; +C-GLOBAL: CFStringRef kCTFontBaselineAdjustAttribute ; +C-GLOBAL: CFStringRef kCTFontMacintoshEncodingsAttribute ; +C-GLOBAL: CFStringRef kCTFontFeaturesAttribute ; +C-GLOBAL: CFStringRef kCTFontFeatureSettingsAttribute ; +C-GLOBAL: CFStringRef kCTFontFixedAdvanceAttribute ; +C-GLOBAL: CFStringRef kCTFontOrientationAttribute ; FUNCTION: CTFontDescriptorRef CTFontDescriptorCreateWithAttributes ( CFDictionaryRef attributes diff --git a/ffi/curses/ffi/ffi.factor b/ffi/curses/ffi/ffi.factor index 163afc74c0..2e5b004e2e 100644 --- a/ffi/curses/ffi/ffi.factor +++ b/ffi/curses/ffi/ffi.factor @@ -83,7 +83,7 @@ STRUCT: MEVENT LIBRARY: curses -C-GLOBAL: void* stdscr +C-GLOBAL: void* stdscr ; FUNCTION: WINDOW* initscr ( ) ; FUNCTION: int endwin ( ) ; @@ -248,8 +248,8 @@ FUNCTION: bool can_change_color ( ) ; FUNCTION: int color_content ( short color, short* r, short* g, short* b ) ; FUNCTION: int pair_content ( short pair, short* f, short* b ) ; -C-GLOBAL: int COLORS -C-GLOBAL: int COLOR_PAIRS +C-GLOBAL: int COLORS ; +C-GLOBAL: int COLOR_PAIRS ; : COLOR_PAIR ( n -- n' ) 8 shift ; inline foldable diff --git a/ffi/gdbm/ffi/ffi.factor b/ffi/gdbm/ffi/ffi.factor index 09776e9713..8cef4d8534 100755 --- a/ffi/gdbm/ffi/ffi.factor +++ b/ffi/gdbm/ffi/ffi.factor @@ -10,7 +10,7 @@ cdecl add-library >> LIBRARY: libgdbm -C-GLOBAL: c-string gdbm_version +C-GLOBAL: c-string gdbm_version ; CONSTANT: GDBM_SYNC 0x20 ; CONSTANT: GDBM_NOLOCK 0x40 ; @@ -42,6 +42,6 @@ FUNCTION: int gdbm_exists ( GDBM_FILE dbf, datum key ) ; FUNCTION: int gdbm_setopt ( GDBM_FILE dbf, int option, int* value, int size ) ; FUNCTION: int gdbm_fdesc ( GDBM_FILE dbf ) ; -C-GLOBAL: int gdbm_errno +C-GLOBAL: int gdbm_errno ; FUNCTION: c-string gdbm_strerror ( int errno ) ; diff --git a/ffi/readline/ffi/ffi.factor b/ffi/readline/ffi/ffi.factor index 4ccbe081e0..011dab6bf2 100644 --- a/ffi/readline/ffi/ffi.factor +++ b/ffi/readline/ffi/ffi.factor @@ -100,11 +100,11 @@ CONSTANT: ISFUNC 0 ; CONSTANT: ISKMAP 1 ; CONSTANT: ISMACR 2 ; -C-GLOBAL: KEYMAP_ENTRY_ARRAY emacs_standard_keymap -C-GLOBAL: KEYMAP_ENTRY_ARRAY emacs_meta_keymap -C-GLOBAL: KEYMAP_ENTRY_ARRAY emacs_ctlx_keymap -C-GLOBAL: KEYMAP_ENTRY_ARRAY vi_insertion_keymap -C-GLOBAL: KEYMAP_ENTRY_ARRAY vi_movement_keymap +C-GLOBAL: KEYMAP_ENTRY_ARRAY emacs_standard_keymap ; +C-GLOBAL: KEYMAP_ENTRY_ARRAY emacs_meta_keymap ; +C-GLOBAL: KEYMAP_ENTRY_ARRAY emacs_ctlx_keymap ; +C-GLOBAL: KEYMAP_ENTRY_ARRAY vi_insertion_keymap ; +C-GLOBAL: KEYMAP_ENTRY_ARRAY vi_movement_keymap ; FUNCTION: Keymap rl_copy_keymap ( Keymap k ) ; FUNCTION: Keymap rl_make_keymap ( ) ; @@ -112,29 +112,29 @@ FUNCTION: void rl_discard_keymap ( Keymap k ) ; CALLBACK: c-string tilde_hook_func_t ( c-string s ) ; -C-GLOBAL: tilde_hook_func_t* tilde_expansion_preexpansion_hook -C-GLOBAL: tilde_hook_func_t* tilde_expansion_failure_hook -C-GLOBAL: char** tilde_additional_prefixes -C-GLOBAL: char** tilde_additional_suffixes +C-GLOBAL: tilde_hook_func_t* tilde_expansion_preexpansion_hook ; +C-GLOBAL: tilde_hook_func_t* tilde_expansion_failure_hook ; +C-GLOBAL: char** tilde_additional_prefixes ; +C-GLOBAL: char** tilde_additional_suffixes ; FUNCTION: c-string tilde_expand ( c-string s ) ; FUNCTION: c-string tilde_expand_word ( c-string s ) ; FUNCTION: c-string tilde_find_word ( c-string arg1, int arg2, int* arg3 ) ; -C-GLOBAL: int history_base -C-GLOBAL: int history_length -C-GLOBAL: int history_max_entries -C-GLOBAL: char history_expansion_char -C-GLOBAL: char history_subst_char -C-GLOBAL: c-string history_word_delimiters -C-GLOBAL: char history_comment_char -C-GLOBAL: c-string history_no_expand_chars -C-GLOBAL: c-string history_search_delimiter_chars -C-GLOBAL: int history_quotes_inhibit_expansion -C-GLOBAL: int history_write_timestamps -C-GLOBAL: int max_input_history -C-GLOBAL: rl_linebuf_func_t* history_inhibit_expansion_function +C-GLOBAL: int history_base ; +C-GLOBAL: int history_length ; +C-GLOBAL: int history_max_entries ; +C-GLOBAL: char history_expansion_char ; +C-GLOBAL: char history_subst_char ; +C-GLOBAL: c-string history_word_delimiters ; +C-GLOBAL: char history_comment_char ; +C-GLOBAL: c-string history_no_expand_chars ; +C-GLOBAL: c-string history_search_delimiter_chars ; +C-GLOBAL: int history_quotes_inhibit_expansion ; +C-GLOBAL: int history_write_timestamps ; +C-GLOBAL: int max_input_history ; +C-GLOBAL: rl_linebuf_func_t* history_inhibit_expansion_function ; CALLBACK: int rl_intfunc_t ( int i ) ; CALLBACK: int rl_icpfunc_t ( c-string s ) ; @@ -159,13 +159,13 @@ STRUCT: UNDO_LIST { text char* } { what undo_code } ; -C-GLOBAL: UNDO_LIST* rl_undo_list +C-GLOBAL: UNDO_LIST* rl_undo_list ; STRUCT: FUNMAP { name c-string } { function rl_command_func_t* } ; -C-GLOBAL: FUNMAP** funmap +C-GLOBAL: FUNMAP** funmap ; FUNCTION: int rl_digit_argument ( int arg1, int arg2 ) ; FUNCTION: int rl_universal_argument ( int arg, int arg ) ; @@ -501,87 +501,87 @@ FUNCTION: c-string rl_filename_completion_function ( c-string FUNCTION: int rl_completion_mode ( rl_command_func_t* p ) ; -C-GLOBAL: c-string rl_library_version -C-GLOBAL: int rl_readline_version -C-GLOBAL: int rl_gnu_readline_p -C-GLOBAL: int rl_readline_state -C-GLOBAL: int rl_editing_mode -C-GLOBAL: int rl_insert_mode -C-GLOBAL: c-string rl_readline_name -C-GLOBAL: c-string rl_prompt -C-GLOBAL: c-string rl_display_prompt -C-GLOBAL: c-string rl_line_buffer -C-GLOBAL: int rl_point -C-GLOBAL: int rl_end -C-GLOBAL: int rl_mark -C-GLOBAL: int rl_done -C-GLOBAL: int rl_pending_input -C-GLOBAL: int rl_dispatching -C-GLOBAL: int rl_explicit_arg -C-GLOBAL: int rl_numeric_arg -C-GLOBAL: rl_command_func_t* rl_last_func -C-GLOBAL: c-string rl_terminal_name +C-GLOBAL: c-string rl_library_version ; +C-GLOBAL: int rl_readline_version ; +C-GLOBAL: int rl_gnu_readline_p ; +C-GLOBAL: int rl_readline_state ; +C-GLOBAL: int rl_editing_mode ; +C-GLOBAL: int rl_insert_mode ; +C-GLOBAL: c-string rl_readline_name ; +C-GLOBAL: c-string rl_prompt ; +C-GLOBAL: c-string rl_display_prompt ; +C-GLOBAL: c-string rl_line_buffer ; +C-GLOBAL: int rl_point ; +C-GLOBAL: int rl_end ; +C-GLOBAL: int rl_mark ; +C-GLOBAL: int rl_done ; +C-GLOBAL: int rl_pending_input ; +C-GLOBAL: int rl_dispatching ; +C-GLOBAL: int rl_explicit_arg ; +C-GLOBAL: int rl_numeric_arg ; +C-GLOBAL: rl_command_func_t* rl_last_func ; +C-GLOBAL: c-string rl_terminal_name ; -C-GLOBAL: FILE* rl_instream -C-GLOBAL: FILE* rl_outstream +C-GLOBAL: FILE* rl_instream ; +C-GLOBAL: FILE* rl_outstream ; -C-GLOBAL: int rl_prefer_env_winsize +C-GLOBAL: int rl_prefer_env_winsize ; -C-GLOBAL: rl_hook_func_t* rl_startup_hook -C-GLOBAL: rl_hook_func_t* rl_pre_input_hook -C-GLOBAL: rl_hook_func_t* rl_event_hook +C-GLOBAL: rl_hook_func_t* rl_startup_hook ; +C-GLOBAL: rl_hook_func_t* rl_pre_input_hook ; +C-GLOBAL: rl_hook_func_t* rl_event_hook ; -C-GLOBAL: rl_getc_func_t* rl_getc_function -C-GLOBAL: rl_voidfunc_t* rl_redisplay_function -C-GLOBAL: rl_vintfunc_t* rl_prep_term_function -C-GLOBAL: rl_voidfunc_t* rl_deprep_term_function +C-GLOBAL: rl_getc_func_t* rl_getc_function ; +C-GLOBAL: rl_voidfunc_t* rl_redisplay_function ; +C-GLOBAL: rl_vintfunc_t* rl_prep_term_function ; +C-GLOBAL: rl_voidfunc_t* rl_deprep_term_function ; -C-GLOBAL: Keymap rl_executing_keymap -C-GLOBAL: Keymap rl_binding_keymap +C-GLOBAL: Keymap rl_executing_keymap ; +C-GLOBAL: Keymap rl_binding_keymap ; -C-GLOBAL: int rl_erase_empty_line -C-GLOBAL: int rl_already_prompted -C-GLOBAL: int rl_num_chars_to_read -C-GLOBAL: c-string rl_executing_macro +C-GLOBAL: int rl_erase_empty_line ; +C-GLOBAL: int rl_already_prompted ; +C-GLOBAL: int rl_num_chars_to_read ; +C-GLOBAL: c-string rl_executing_macro ; -C-GLOBAL: int rl_catch_signals -C-GLOBAL: int rl_catch_sigwinch -C-GLOBAL: rl_compentry_func_t* rl_completion_entry_function -C-GLOBAL: rl_compentry_func_t* rl_menu_completion_entry_function -C-GLOBAL: rl_compignore_func_t* rl_ignore_some_completions_function -C-GLOBAL: rl_completion_func_t* rl_attempted_completion_function -C-GLOBAL: c-string rl_basic_word_break_characters -C-GLOBAL: c-string rl_completer_word_break_characters -C-GLOBAL: rl_cpvfunc_t* rl_completion_word_break_hook +C-GLOBAL: int rl_catch_signals ; +C-GLOBAL: int rl_catch_sigwinch ; +C-GLOBAL: rl_compentry_func_t* rl_completion_entry_function ; +C-GLOBAL: rl_compentry_func_t* rl_menu_completion_entry_function ; +C-GLOBAL: rl_compignore_func_t* rl_ignore_some_completions_function ; +C-GLOBAL: rl_completion_func_t* rl_attempted_completion_function ; +C-GLOBAL: c-string rl_basic_word_break_characters ; +C-GLOBAL: c-string rl_completer_word_break_characters ; +C-GLOBAL: rl_cpvfunc_t* rl_completion_word_break_hook ; -C-GLOBAL: c-string rl_completer_quote_characters -C-GLOBAL: c-string rl_basic_quote_characters -C-GLOBAL: c-string rl_filename_quote_characters -C-GLOBAL: c-string rl_special_prefixes -C-GLOBAL: rl_icppfunc_t* rl_directory_completion_hook +C-GLOBAL: c-string rl_completer_quote_characters ; +C-GLOBAL: c-string rl_basic_quote_characters ; +C-GLOBAL: c-string rl_filename_quote_characters ; +C-GLOBAL: c-string rl_special_prefixes ; +C-GLOBAL: rl_icppfunc_t* rl_directory_completion_hook ; -C-GLOBAL: rl_icppfunc_t* rl_directory_rewrite_hook -C-GLOBAL: rl_dequote_func_t* rl_filename_rewrite_hook -C-GLOBAL: rl_compdisp_func_t* rl_completion_display_matches_hook -C-GLOBAL: int rl_filename_completion_desired -C-GLOBAL: int rl_filename_quoting_desired -C-GLOBAL: rl_quote_func_t* rl_filename_quoting_function -C-GLOBAL: rl_dequote_func_t* rl_filename_dequoting_function -C-GLOBAL: rl_linebuf_func_t* rl_char_is_quoted_p -C-GLOBAL: int rl_attempted_completion_over -C-GLOBAL: int rl_completion_type -C-GLOBAL: int rl_completion_invoking_key -C-GLOBAL: int rl_completion_query_items -C-GLOBAL: int rl_completion_append_character -C-GLOBAL: int rl_completion_suppress_append -C-GLOBAL: int rl_completion_quote_character -C-GLOBAL: int rl_completion_found_quote -C-GLOBAL: int rl_completion_suppress_quote -C-GLOBAL: int rl_sort_completion_matches -C-GLOBAL: int rl_completion_mark_symlink_dirs +C-GLOBAL: rl_icppfunc_t* rl_directory_rewrite_hook ; +C-GLOBAL: rl_dequote_func_t* rl_filename_rewrite_hook ; +C-GLOBAL: rl_compdisp_func_t* rl_completion_display_matches_hook ; +C-GLOBAL: int rl_filename_completion_desired ; +C-GLOBAL: int rl_filename_quoting_desired ; +C-GLOBAL: rl_quote_func_t* rl_filename_quoting_function ; +C-GLOBAL: rl_dequote_func_t* rl_filename_dequoting_function ; +C-GLOBAL: rl_linebuf_func_t* rl_char_is_quoted_p ; +C-GLOBAL: int rl_attempted_completion_over ; +C-GLOBAL: int rl_completion_type ; +C-GLOBAL: int rl_completion_invoking_key ; +C-GLOBAL: int rl_completion_query_items ; +C-GLOBAL: int rl_completion_append_character ; +C-GLOBAL: int rl_completion_suppress_append ; +C-GLOBAL: int rl_completion_quote_character ; +C-GLOBAL: int rl_completion_found_quote ; +C-GLOBAL: int rl_completion_suppress_quote ; +C-GLOBAL: int rl_sort_completion_matches ; +C-GLOBAL: int rl_completion_mark_symlink_dirs ; -C-GLOBAL: int rl_ignore_completion_duplicates -C-GLOBAL: int rl_inhibit_completion +C-GLOBAL: int rl_ignore_completion_duplicates ; +C-GLOBAL: int rl_inhibit_completion ; CONSTANT: READERR -2 ; diff --git a/language/alien/syntax/syntax-docs.factor b/language/alien/syntax/syntax-docs.factor index 65b2098ed3..da5f16e45d 100644 --- a/language/alien/syntax/syntax-docs.factor +++ b/language/alien/syntax/syntax-docs.factor @@ -121,7 +121,7 @@ HELP: typedef { postpone: TYPEDEF: typedef } related-words HELP: C-GLOBAL: -{ $syntax "C-GLOBAL: type name" } +{ $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: } "." } ; diff --git a/language/alien/syntax/syntax.factor b/language/alien/syntax/syntax.factor index 2e9ab8749c..8c1358ee8f 100755 --- a/language/alien/syntax/syntax.factor +++ b/language/alien/syntax/syntax.factor @@ -36,7 +36,7 @@ SYNTAX: C-TYPE: SYNTAX: &: scan-token current-library get '[ _ _ address-of ] append! ; -SYNTAX: C-GLOBAL: scan-c-type scan-new-word define-global ; +SYNTAX: C-GLOBAL: scan-c-type scan-new-word ";" expect define-global ; SYNTAX: pointer: scan-c-type suffix! ;