Mercurial > emacs
annotate src/syntax.h @ 112364:42e22c4f06b7
Move all DEFVAR'd globals into a structure -- threading infrastructure
* globals.h: New file.
* xterm.h (Vx_pixel_size_width_font_regexp): Remove declaration.
* window.h (Vinitial_window_system, Vminibuf_scroll_window)
(Vwindow_system_version): Remove declaration.
* w32term.h (Vw32_enable_palette)
(Vx_pixel_size_width_font_regexp): Remove declaration.
* w32menu.c (Voverriding_local_map)
(Voverriding_local_map_menu_flag): Remove declaration.
* w32inevt.c (Vw32_alt_is_meta, Vw32_apps_modifier)
(Vw32_capslock_is_shiftlock, Vw32_enable_caps_lock)
(Vw32_enable_num_lock, Vw32_lwindow_modifier)
(Vw32_pass_lwindow_to_system, Vw32_pass_rwindow_to_system)
(Vw32_phantom_key_code, Vw32_recognize_altgr)
(Vw32_rwindow_modifier, Vw32_scroll_lock_modifier)
(w32_use_full_screen_buffer): Remove declaration.
* w32.c (Vsystem_configuration, Vw32_downcase_file_names)
(Vw32_generate_fake_inodes, Vw32_get_true_file_attributes)
(w32_num_mouse_buttons, w32_pipe_read_delay): Remove declaration.
* termopts.h (Vtruncate_partial_width_windows, inverse_video)
(no_redraw_on_reenter, visible_bell): Remove declaration.
* sysdep.c (Vsystem_name): Remove declaration.
* syntax.h (parse_sexp_lookup_properties): Remove declaration.
* menu.h (Vmenu_updating_frame): Remove declaration.
* macros.h (Vexecuting_kbd_macro, executing_kbd_macro_index):
Remove declaration.
* lisp.h (Vafter_init_time, Vafter_load_alist)
(Vauto_save_list_file_name, Vbefore_init_time, Vcommand_history)
(Vcompletion_regexp_list, Vcurrent_load_list)
(Vcurrent_prefix_arg, Vdata_directory, Vdebug_on_error)
(Vdoc_directory, Vdoc_file_name, Vdynamic_library_alist)
(Vexec_directory, Vexec_path, Vexec_suffixes)
(Vface_font_rescale_alist, Vface_ignored_fonts, Vfeatures)
(Vhelp_form, Vhistory_length, Vinhibit_field_text_motion)
(Vinhibit_quit, Vinhibit_read_only, Vinhibit_redisplay)
(Vinstallation_directory, Vinvocation_directory)
(Vinvocation_name, Vload_file_rep_suffixes, Vload_history)
(Vload_suffixes, Vmark_even_if_inactive, Vmemory_full)
(Vmessage_log_max, Vobarray, Vprint_length, Vprint_level)
(Vpurify_flag, Vquit_flag, Vsaved_region_selection)
(Vscalable_fonts_allowed, Vselect_active_regions)
(Vshell_file_name, Vstandard_input, Vstandard_output)
(Vsystem_name, Vtemporary_file_directory, Vthrow_on_input)
(Vtop_level, Vtty_erase_char, Vundo_outer_limit)
(Vuser_login_name, Vwindow_scroll_functions)
(Vwindow_system_version, Vx_no_window_manager)
(Vx_resource_class, Vx_resource_name, baud_rate)
(completion_ignore_case, debug_on_next_call, gc_cons_threshold)
(history_delete_duplicates, inhibit_x_resources)
(last_nonmenu_event, load_in_progress, max_specpdl_size)
(minibuffer_auto_raise, print_escape_newlines, scroll_margin)
(use_dialog_box, use_file_dialog): Remove declaration. Include
globals.h.
* keymap.h (Voverriding_local_map)
(Voverriding_local_map_menu_flag, meta_prefix_char): Remove
declaration.
* keyboard.h (Vdouble_click_time, Vfunction_key_map)
(Vinput_method_function, Vkey_translation_map)
(Vlucid_menu_bar_dirty_flag, Vthis_original_command)
(do_mouse_tracking, extra_keyboard_modifiers)
(num_nonmacro_input_events): Remove declaration.
* intervals.h (Vchar_property_alias_alist)
(Vdefault_text_properties, Vinhibit_point_motion_hooks)
(Vtext_property_default_nonsticky): Remove declaration.
* gtkutil.h (x_gtk_file_dialog_help_text)
(x_gtk_show_hidden_files, x_gtk_use_old_file_dialog)
(x_gtk_whole_detached_tool_bar): Remove declaration.
* frame.h (Vdefault_frame_alist, Vframe_alpha_lower_limit)
(Vmenu_bar_mode, Vmouse_highlight, Vterminal_frame)
(Vtool_bar_mode, Vx_resource_class, Vx_resource_name)
(focus_follows_mouse): Remove declaration.
* fontset.h (Valternate_fontname_alist, Vfontset_alias_alist)
(Vignore_relative_composition, Votf_script_alist)
(Vuse_default_ascent, Vvertical_centering_font_regexp): Remove
declaration.
* font.h (Vfont_log): Remove declaration.
* dosfns.h (Vdos_display_scancodes, Vdos_version)
(Vdos_windows_version, dos_codepage, dos_country_code)
(dos_decimal_point, dos_hyper_key, dos_keyboard_layout)
(dos_keypad_mode, dos_super_key, dos_timezone_offset): Remove
declaration.
* disptab.h (Vglyph_table, Vstandard_display_table): Remove
declaration.
* dispextern.h (Vface_remapping_alist, Vglyphless_char_display)
(Vmouse_autoselect_window, Voverflow_newline_into_fringe)
(Vshow_trailing_whitespace, Vtool_bar_button_margin)
(Vtool_bar_style, cursor_in_echo_area, display_hourglass_p)
(inverse_video, mode_line_in_non_selected_windows)
(tool_bar_button_relief, tool_bar_max_label_size)
(underline_minimum_offset)
(unibyte_display_via_language_environment, x_stretch_cursor_p):
Remove declaration.
* composite.h (Vauto_composition_function)
(Vcomposition_function_table): Remove declaration.
* commands.h (Vexecuting_kbd_macro)
(Vminibuffer_local_completion_map)
(Vminibuffer_local_filename_completion_map)
(Vminibuffer_local_filename_must_match_map)
(Vminibuffer_local_map, Vminibuffer_local_must_match_map)
(Vminibuffer_local_ns_map, Vthis_command)
(Vunread_command_events, cursor_in_echo_area)
(last_command_event, last_nonmenu_event, unread_command_char):
Remove declaration.
* coding.h (Vcoding_system_for_read, Vcoding_system_for_write)
(Vdefault_file_name_coding_system)
(Vdefault_process_coding_system, Vfile_name_coding_system)
(Vlast_coding_system_used, Vlocale_coding_system)
(Vselect_safe_coding_system_function)
(Vtranslation_table_for_input, coding_system_require_warning)
(eol_mnemonic_dos, eol_mnemonic_mac, eol_mnemonic_undecided)
(eol_mnemonic_unix, inherit_process_coding_system): Remove
declaration.
* charset.h (Vcharset_list, Vcurrent_iso639_language): Remove
declaration.
* character.h (Vauto_fill_chars, Vchar_direction_table)
(Vchar_script_table, Vchar_width_table, Vprintable_chars)
(Vscript_representative_chars, Vtranslation_table_vector)
(Vunicode_category_table): Remove declaration.
* ccl.h (Vfont_ccl_encoder_alist): Remove declaration.
* buffer.h (Vafter_change_functions, Vbefore_change_functions)
(Vdeactivate_mark, Vfirst_change_hook, Vtransient_mark_mode)
(inhibit_modification_hooks): Remove declaration.
* xterm.c (syms_of_xterm): Update.
(Vx_alt_keysym, Vx_hyper_keysym, Vx_keysym_table)
(Vx_meta_keysym, Vx_super_keysym, Vx_toolkit_scroll_bars)
(x_mouse_click_focus_ignore_position)
(x_underline_at_descent_line)
(x_use_underline_position_properties): Remove.
* xsmfns.c (syms_of_xsmfns): Update.
(Vx_session_id, Vx_session_previous_id): Remove.
* xsettings.c (syms_of_xsettings): Update.
(Vxft_settings, use_system_font): Remove.
* xselect.c (syms_of_xselect): Update.
(Vselection_converter_alist, Vx_lost_selection_functions)
(Vx_sent_selection_functions, x_selection_timeout): Remove.
* xfns.c (syms_of_xfns): Update.
(Vgtk_version_string, Vmotif_version_string)
(Vx_cursor_fore_pixel, Vx_hourglass_pointer_shape)
(Vx_max_tooltip_size, Vx_mode_pointer_shape)
(Vx_no_window_manager, Vx_nontext_pointer_shape)
(Vx_pixel_size_width_font_regexp, Vx_pointer_shape)
(Vx_sensitive_text_pointer_shape)
(Vx_window_horizontal_drag_shape, x_gtk_file_dialog_help_text)
(x_gtk_show_hidden_files, x_gtk_use_old_file_dialog)
(x_gtk_use_system_tooltips, x_gtk_whole_detached_tool_bar):
Remove.
* xfaces.c (syms_of_xfaces): Update.
(Vface_default_stipple, Vface_font_rescale_alist)
(Vface_ignored_fonts, Vface_new_frame_defaults)
(Vface_remapping_alist, Vfont_list_limit)
(Vscalable_fonts_allowed, Vtty_defined_color_alist): Remove.
* xdisp.c (syms_of_xdisp): Update.
(Vauto_resize_tool_bars, Vblink_cursor_alist)
(Vdisplay_pixels_per_inch, Vfontification_functions)
(Vframe_title_format, Vglobal_mode_string)
(Vglyphless_char_display, Vhourglass_delay, Vhscroll_step)
(Vicon_title_format, Vinhibit_redisplay)
(Vline_number_display_limit, Vline_prefix)
(Vmax_mini_window_height, Vmenu_bar_update_hook)
(Vmenu_updating_frame, Vmessage_log_max)
(Vmouse_autoselect_window, Vnobreak_char_display)
(Voverlay_arrow_position, Voverlay_arrow_string)
(Voverlay_arrow_variable_list, Vredisplay_end_trigger_functions)
(Vresize_mini_windows, Vshow_trailing_whitespace)
(Vtool_bar_border, Vtool_bar_button_margin, Vtool_bar_style)
(Vtruncate_partial_width_windows, Vvoid_text_area_pointer)
(Vwindow_scroll_functions, Vwindow_size_change_functions)
(Vwindow_text_change_functions, Vwrap_prefix)
(auto_raise_tool_bar_buttons_p, automatic_hscrolling_p)
(debug_end_pos, display_hourglass_p, emacs_scroll_step)
(highlight_nonselected_windows, hscroll_margin)
(inhibit_eval_during_redisplay, inhibit_free_realized_faces)
(inhibit_menubar_update, inhibit_try_cursor_movement)
(inhibit_try_window_id, inhibit_try_window_reusing)
(line_number_display_limit_width)
(make_cursor_line_fully_visible_p, message_truncate_lines)
(mode_line_inverse_video, multiple_frames, overline_margin)
(scroll_conservatively, scroll_margin, tool_bar_button_relief)
(tool_bar_max_label_size, underline_minimum_offset)
(unibyte_display_via_language_environment, x_stretch_cursor_p):
Remove.
* window.c (syms_of_window): Update.
(Vminibuf_scroll_window, Vother_window_scroll_buffer)
(Vrecenter_redisplay, Vscroll_preserve_screen_position)
(Vtemp_buffer_show_function, Vwindow_configuration_change_hook)
(Vwindow_point_insertion_type, auto_window_vscroll_p)
(mode_line_in_non_selected_windows, next_screen_context_lines)
(window_min_height, window_min_width): Remove.
(scroll_margin): Remove declaration.
* w32term.c (syms_of_w32term): Update.
(Vw32_capslock_is_shiftlock, Vw32_grab_focus_on_raise)
(Vw32_recognize_altgr, Vw32_swap_mouse_buttons)
(Vx_toolkit_scroll_bars, w32_num_mouse_buttons)
(w32_use_visible_system_caret, x_underline_at_descent_line)
(x_use_underline_position_properties): Remove.
(Vcommand_line_args, Vsystem_name, extra_keyboard_modifiers):
Remove declaration.
* w32select.c (syms_of_w32select): Update.
(Vnext_selection_coding_system, Vselection_coding_system): Remove.
* w32proc.c (syms_of_ntproc): Update.
(Vw32_downcase_file_names, Vw32_generate_fake_inodes)
(Vw32_get_true_file_attributes, Vw32_quote_process_args)
(Vw32_start_process_inherit_error_mode)
(Vw32_start_process_share_console)
(Vw32_start_process_show_window, w32_pipe_read_delay): Remove.
(Vsystem_name): Remove declaration.
* w32font.c (syms_of_w32font): Update.
(Vw32_charset_info_alist): Remove.
* w32fns.c (globals_of_w32fns, syms_of_w32fns): Update.
(Vw32_alt_is_meta, Vw32_apps_modifier, Vw32_bdf_filename_alist)
(Vw32_color_map, Vw32_enable_caps_lock, Vw32_enable_num_lock)
(Vw32_enable_palette, Vw32_lwindow_modifier)
(Vw32_pass_alt_to_system, Vw32_pass_lwindow_to_system)
(Vw32_pass_rwindow_to_system, Vw32_phantom_key_code)
(Vw32_rwindow_modifier, Vw32_scroll_lock_modifier)
(Vx_cursor_fore_pixel, Vx_hourglass_pointer_shape)
(Vx_max_tooltip_size, Vx_mode_pointer_shape)
(Vx_no_window_manager, Vx_nontext_pointer_shape)
(Vx_pixel_size_width_font_regexp, Vx_pointer_shape)
(Vx_sensitive_text_pointer_shape)
(Vx_window_horizontal_drag_shape, w32_ansi_code_page)
(w32_enable_synthesized_fonts, w32_mouse_button_tolerance)
(w32_mouse_move_interval)
(w32_pass_extra_mouse_buttons_to_system)
(w32_pass_multimedia_buttons_to_system, w32_quit_key)
(w32_strict_fontnames, w32_strict_painting): Remove.
(Vhourglass_delay, Vmenu_bar_mode, Vtool_bar_mode)
(Vw32_recognize_altgr, Vwindow_system_version)
(w32_num_mouse_buttons, w32_use_visible_system_caret): Remove
declaration.
* w32console.c (syms_of_ntterm): Update.
(w32_use_full_screen_buffer): Remove.
(Vtty_defined_color_alist): Remove declaration.
* w16select.c (syms_of_win16select): Update.
(Vnext_selection_coding_system, Vselection_coding_system): Remove.
* undo.c (syms_of_undo): Update.
(Vundo_outer_limit, Vundo_outer_limit_function)
(undo_inhibit_record_point, undo_limit, undo_strong_limit):
Remove.
* textprop.c (syms_of_textprop): Update.
(Vchar_property_alias_alist, Vdefault_text_properties)
(Vinhibit_point_motion_hooks, Vtext_property_default_nonsticky):
Remove.
* terminal.c (syms_of_terminal): Update.
(Vdelete_terminal_functions, Vring_bell_function): Remove.
* term.c (syms_of_term): Update.
(Vresume_tty_functions, Vsuspend_tty_functions)
(no_redraw_on_reenter, system_uses_terminfo, visible_cursor):
Remove.
* syntax.c (syms_of_syntax): Update.
(Vfind_word_boundary_function_table, multibyte_syntax_as_symbol)
(open_paren_in_column_0_is_defun_start)
(parse_sexp_ignore_comments, parse_sexp_lookup_properties)
(words_include_escapes): Remove.
* search.c (syms_of_search): Update.
(Vinhibit_changing_match_data, Vsearch_spaces_regexp): Remove.
* process.c (syms_of_process): Update.
(Vprocess_adaptive_read_buffering, Vprocess_connection_type)
(delete_exited_processes): Remove.
* print.c (syms_of_print): Update.
(Vfloat_output_format, Vprint_charset_text_property)
(Vprint_circle, Vprint_continuous_numbering, Vprint_gensym)
(Vprint_length, Vprint_level, Vprint_number_table)
(Vstandard_output, print_escape_multibyte)
(print_escape_newlines, print_escape_nonascii, print_quoted):
Remove.
* msdos.c (syms_of_msdos): Update.
(Vdos_unsupported_char_glyph): Remove.
(unibyte_display_via_language_environment): Remove declaration.
* minibuf.c (syms_of_minibuf): Update.
(Vcompletion_regexp_list, Vhistory_add_new_input)
(Vhistory_length, Vminibuffer_completing_file_name)
(Vminibuffer_completion_confirm)
(Vminibuffer_completion_predicate, Vminibuffer_completion_table)
(Vminibuffer_exit_hook, Vminibuffer_help_form)
(Vminibuffer_history_position, Vminibuffer_history_variable)
(Vminibuffer_prompt_properties, Vminibuffer_setup_hook)
(Vread_buffer_function, Vread_expression_map)
(completion_ignore_case, enable_recursive_minibuffers)
(history_delete_duplicates, minibuffer_allow_text_properties)
(minibuffer_auto_raise, read_buffer_completion_ignore_case):
Remove.
* marker.c (syms_of_marker): Update.
(byte_debug_flag): Remove.
* macros.c (syms_of_macros): Update.
(Vexecuting_kbd_macro, executing_kbd_macro_index): Remove.
* lread.c (syms_of_lread): Update.
(Vafter_load_alist, Vbyte_boolean_vars)
(Vbytecomp_version_regexp, Vcurrent_load_list)
(Veval_buffer_list, Vload_file_name, Vload_file_rep_suffixes)
(Vload_history, Vload_path, Vload_read_function)
(Vload_source_file_function, Vload_suffixes, Vobarray)
(Vold_style_backquotes, Vpreloaded_file_list, Vread_circle)
(Vread_symbol_positions_list, Vread_with_symbol_positions)
(Vsource_directory, Vstandard_input, Vuser_init_file, Vvalues)
(force_load_messages, load_convert_to_unibyte)
(load_dangerous_libraries, load_force_doc_strings)
(load_in_progress): Remove.
* keymap.c (syms_of_keymap): Update.
(Vdefine_key_rebound_commands, Vemulation_mode_map_alists)
(Vminibuffer_local_completion_map)
(Vminibuffer_local_filename_completion_map)
(Vminibuffer_local_filename_must_match_map)
(Vminibuffer_local_map, Vminibuffer_local_must_match_map)
(Vminibuffer_local_ns_map, Vminor_mode_map_alist)
(Vminor_mode_overriding_map_alist, Vwhere_is_preferred_modifier):
Remove.
* keyboard.c (syms_of_keyboard): Update.
(Vauto_save_timeout, Vcommand_error_function)
(Vcommand_hook_internal, Vdeactivate_mark)
(Vdeferred_action_function, Vdeferred_action_list)
(Vdisable_point_adjustment, Vdouble_click_time)
(Vecho_keystrokes, Venable_disabled_menus_and_buttons)
(Vfunction_key_map, Vglobal_disable_point_adjustment)
(Vhelp_char, Vhelp_event_list, Vhelp_form)
(Vinput_method_function, Vinput_method_previous_message)
(Vkey_translation_map, Vlast_event_frame)
(Vlucid_menu_bar_dirty_flag, Vmenu_bar_final_items)
(Vminibuffer_message_timeout, Voverriding_local_map)
(Voverriding_local_map_menu_flag, Vpost_command_hook)
(Vpre_command_hook, Vprefix_help_command)
(Vsaved_region_selection, Vselect_active_regions)
(Vshow_help_function, Vspecial_event_map, Vsuggest_key_bindings)
(Vthis_command, Vthis_command_keys_shift_translated)
(Vthis_original_command, Vthrow_on_input, Vtimer_idle_list)
(Vtimer_list, Vtool_bar_separator_image_expression, Vtop_level)
(Vtty_erase_char, Vunread_command_events)
(Vunread_input_method_events, Vunread_post_input_method_events)
(auto_save_interval, cannot_suspend, do_mouse_tracking)
(double_click_fuzz, extra_keyboard_modifiers)
(inhibit_local_menu_bar_menus, last_command_event)
(last_input_event, last_nonmenu_event, menu_prompt_more_char)
(menu_prompting, meta_prefix_char, num_input_keys)
(num_nonmacro_input_events, polling_period, unread_command_char):
Remove.
* insdel.c (syms_of_insdel): Update.
(Vcombine_after_change_calls, check_markers_debug_flag): Remove.
* indent.c (syms_of_indent): Update.
(indent_tabs_mode): Remove.
* image.c (syms_of_image): Update.
(Vimage_cache_eviction_delay, Vimage_types)
(Vimagemagick_render_type, Vmax_image_size, Vx_bitmap_file_path)
(cross_disabled_images): Remove.
* fringe.c (syms_of_fringe): Update.
(Vfringe_bitmaps, Voverflow_newline_into_fringe): Remove.
* frame.c (syms_of_frame): Update.
(Vdefault_frame_alist, Vdefault_frame_scroll_bars)
(Vdelete_frame_functions, Vframe_alpha_lower_limit)
(Vmake_pointer_invisible, Vmenu_bar_mode, Vmouse_highlight)
(Vmouse_position_function, Vterminal_frame, Vtool_bar_mode)
(Vx_resource_class, Vx_resource_name, focus_follows_mouse):
Remove.
* fontset.c (syms_of_fontset): Update.
(Valternate_fontname_alist, Vfont_encoding_charset_alist)
(Vfontset_alias_alist, Vignore_relative_composition)
(Votf_script_alist, Vuse_default_ascent)
(Vvertical_centering_font_regexp): Remove.
* font.c (syms_of_font): Update.
(Vfont_encoding_alist, Vfont_log, Vfont_slant_table)
(Vfont_weight_table, Vfont_width_table): Remove.
* fns.c (syms_of_fns): Update.
(Vfeatures, use_dialog_box, use_file_dialog): Remove.
* filelock.c (syms_of_filelock): Update.
(Vtemporary_file_directory): Remove.
* fileio.c (syms_of_fileio): Update.
(Vafter_insert_file_functions, Vauto_save_include_big_deletions)
(Vauto_save_list_file_name, Vauto_save_visited_file_name)
(Vdefault_file_name_coding_system, Vfile_name_coding_system)
(Vfile_name_handler_alist, Vinhibit_file_name_handlers)
(Vinhibit_file_name_operation, Vset_auto_coding_function)
(Vwrite_region_annotate_functions)
(Vwrite_region_annotations_so_far)
(Vwrite_region_post_annotation_function)
(delete_by_moving_to_trash, write_region_inhibit_fsync): Remove.
(Vw32_get_true_file_attributes): Remove declaration.
* eval.c (syms_of_eval): Update.
(Vdebug_ignored_errors, Vdebug_on_error, Vdebug_on_signal)
(Vdebugger, Vinhibit_quit, Vmacro_declaration_function)
(Vquit_flag, Vsignal_hook_function, Vstack_trace_on_error)
(debug_on_next_call, debug_on_quit, debugger_may_continue)
(max_lisp_eval_depth, max_specpdl_size): Remove.
* emacs.c (syms_of_emacs): Update.
(Vafter_init_time, Vbefore_init_time, Vcommand_line_args)
(Vdynamic_library_alist, Vemacs_copyright, Vemacs_version)
(Vinstallation_directory, Vinvocation_directory)
(Vinvocation_name, Vkill_emacs_hook, Vpath_separator)
(Vprevious_system_messages_locale, Vprevious_system_time_locale)
(Vsystem_configuration, Vsystem_configuration_options)
(Vsystem_messages_locale, Vsystem_time_locale, Vsystem_type)
(inhibit_x_resources, noninteractive1): Remove.
* editfns.c (syms_of_editfns): Update.
(Vbuffer_access_fontified_property)
(Vbuffer_access_fontify_functions, Vinhibit_field_text_motion)
(Voperating_system_release, Vsystem_name, Vuser_full_name)
(Vuser_login_name, Vuser_real_login_name): Remove.
* dosfns.c (syms_of_dosfns): Update.
(Vdos_display_scancodes, Vdos_version, Vdos_windows_version)
(dos_codepage, dos_country_code, dos_decimal_point)
(dos_hyper_key, dos_keyboard_layout, dos_keypad_mode)
(dos_super_key, dos_timezone_offset): Remove.
* doc.c (syms_of_doc): Update.
(Vbuild_files, Vdoc_file_name): Remove.
* dispnew.c (syms_of_display): Update.
(Vglyph_table, Vinitial_window_system)
(Vredisplay_preemption_period, Vstandard_display_table)
(Vwindow_system_version, baud_rate, cursor_in_echo_area)
(inverse_video, redisplay_dont_pause, visible_bell): Remove.
* dired.c (syms_of_dired): Update.
(Vcompletion_ignored_extensions): Remove.
(Vw32_get_true_file_attributes): Remove declaration.
* dbusbind.c (syms_of_dbusbind): Update.
(Vdbus_debug, Vdbus_registered_buses)
(Vdbus_registered_objects_table): Remove.
* data.c (syms_of_data): Update.
(Vmost_negative_fixnum, Vmost_positive_fixnum): Remove.
* composite.c (syms_of_composite): Update.
(Vauto_composition_function, Vauto_composition_mode)
(Vcompose_chars_after_function, Vcomposition_function_table):
Remove.
* coding.c (syms_of_coding): Update.
(Vcharset_revision_table, Vcoding_category_list)
(Vcoding_system_alist, Vcoding_system_for_read)
(Vcoding_system_for_write, Vcoding_system_list)
(Vdefault_process_coding_system, Venable_character_translation)
(Vfile_coding_system_alist, Vlast_code_conversion_error)
(Vlast_coding_system_used, Vlatin_extra_code_table)
(Vlocale_coding_system, Vnetwork_coding_system_alist)
(Vprocess_coding_system_alist)
(Vselect_safe_coding_system_function)
(Vstandard_translation_table_for_decode)
(Vstandard_translation_table_for_encode)
(Vtranslation_table_for_input, coding_system_require_warning)
(eol_mnemonic_dos, eol_mnemonic_mac, eol_mnemonic_undecided)
(eol_mnemonic_unix, inherit_process_coding_system)
(inhibit_eol_conversion, inhibit_iso_escape_detection)
(inhibit_null_byte_detection): Remove.
* cmds.c (syms_of_cmds): Update.
(Vpost_self_insert_hook): Remove.
* charset.c (syms_of_charset): Update.
(Vcharset_list, Vcharset_map_path, Vcurrent_iso639_language)
(inhibit_load_charset_map): Remove.
* character.c (syms_of_character): Update.
(Vauto_fill_chars, Vchar_direction_table, Vchar_script_table)
(Vchar_width_table, Vprintable_chars)
(Vscript_representative_chars, Vtranslation_table_vector)
(Vunicode_category_table): Remove.
* ccl.c (syms_of_ccl): Update.
(Vcode_conversion_map_vector, Vfont_ccl_encoder_alist)
(Vtranslation_hash_table_vector): Remove.
* category.c (syms_of_category): Update.
(Vword_combining_categories, Vword_separating_categories): Remove.
* callproc.c (syms_of_callproc): Update.
(Vconfigure_info_directory, Vdata_directory, Vdoc_directory)
(Vexec_directory, Vexec_path, Vexec_suffixes)
(Vinitial_environment, Vprocess_environment)
(Vshared_game_score_directory, Vshell_file_name): Remove.
* callint.c (syms_of_callint): Update.
(Vcommand_debug_status, Vcommand_history, Vcurrent_prefix_arg)
(Vmark_even_if_inactive, Vmouse_leave_buffer_hook): Remove.
* bytecode.c (syms_of_bytecode): Update.
(Vbyte_code_meter, byte_metering_on): Remove.
* buffer.c (syms_of_buffer): Update.
(Vafter_change_functions, Vbefore_change_functions)
(Vchange_major_mode_hook, Vfirst_change_hook)
(Vinhibit_read_only, Vkill_buffer_query_functions)
(Vtransient_mark_mode, inhibit_modification_hooks): Remove.
* alloc.c (syms_of_alloc): Update.
(Vgc_cons_percentage, Vgc_elapsed, Vmemory_full)
(Vmemory_signal_data, Vpost_gc_hook, Vpurify_flag)
(cons_cells_consed, floats_consed, garbage_collection_messages)
(gc_cons_threshold, gcs_done, intervals_consed)
(misc_objects_consed, pure_bytes_used, string_chars_consed)
(strings_consed, symbols_consed, vector_cells_consed): Remove.
* lisp.h (DEFVAR_LISP, DEFVAR_LISP_NOPRO, DEFVAR_BOOL)
(DEFVAR_INT): Assume global is in `globals'.
* alloc.c (globals): Define.
author | Tom Tromey <tromey@redhat.com> |
---|---|
date | Tue, 18 Jan 2011 13:45:37 -0700 |
parents | ef719132ddfa |
children |
rev | line source |
---|---|
486 | 1 /* Declarations having to do with GNU Emacs syntax tables. |
75227
e90d04cd455a
Update copyright for years from Emacs 21 to present (mainly adding
Glenn Morris <rgm@gnu.org>
parents:
68651
diff
changeset
|
2 Copyright (C) 1985, 1993, 1994, 1997, 1998, 2001, 2002, 2003, 2004, |
112218
376148b31b5e
Add 2011 to FSF/AIST copyright years.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
3 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
486 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
94994
29adfc9354e7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
91618
diff
changeset
|
7 GNU Emacs is free software: you can redistribute it and/or modify |
486 | 8 it under the terms of the GNU General Public License as published by |
94994
29adfc9354e7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
91618
diff
changeset
|
9 the Free Software Foundation, either version 3 of the License, or |
29adfc9354e7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
91618
diff
changeset
|
10 (at your option) any later version. |
486 | 11 |
12 GNU Emacs is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
94994
29adfc9354e7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
91618
diff
changeset
|
18 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
486 | 19 |
20 | |
21 extern Lisp_Object Qsyntax_table_p; | |
110551
f28cc7ff91f9
Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109757
diff
changeset
|
22 extern void update_syntax_table (EMACS_INT, int, int, Lisp_Object); |
486 | 23 |
24 /* The standard syntax table is stored where it will automatically | |
25 be used in all new buffers. */ | |
26 #define Vstandard_syntax_table buffer_defaults.syntax_table | |
27 | |
13143
ba670977cceb
Use char tables as syntax tables.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
28 /* A syntax table is a chartable whose elements are cons cells |
ba670977cceb
Use char tables as syntax tables.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
29 (CODE+FLAGS . MATCHING-CHAR). MATCHING-CHAR can be nil if the char |
ba670977cceb
Use char tables as syntax tables.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
30 is not a kind of parenthesis. |
486 | 31 |
13143
ba670977cceb
Use char tables as syntax tables.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
32 The low 8 bits of CODE+FLAGS is a code, as follows: */ |
486 | 33 |
34 enum syntaxcode | |
35 { | |
36 Swhitespace, /* for a whitespace character */ | |
37 Spunct, /* for random punctuation characters */ | |
38 Sword, /* for a word constituent */ | |
39 Ssymbol, /* symbol constituent but not word constituent */ | |
40 Sopen, /* for a beginning delimiter */ | |
41 Sclose, /* for an ending delimiter */ | |
42 Squote, /* for a prefix character like Lisp ' */ | |
43 Sstring, /* for a string-grouping character like Lisp " */ | |
17465
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
44 Smath, /* for delimiters like $ in Tex. */ |
486 | 45 Sescape, /* for a character that begins a C-style escape */ |
46 Scharquote, /* for a character that quotes the following character */ | |
47 Scomment, /* for a comment-starting character */ | |
48 Sendcomment, /* for a comment-ending character */ | |
5441
0af9674da850
(enum syntaxcode): Add Sinherit.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
49 Sinherit, /* use the standard syntax table for this character */ |
17465
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
50 Scomment_fence, /* Starts/ends comment which is delimited on the |
20487 | 51 other side by any char with the same syntaxcode. */ |
17465
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
52 Sstring_fence, /* Starts/ends string which is delimited on the |
20487 | 53 other side by any char with the same syntaxcode. */ |
486 | 54 Smax /* Upper bound on codes that are meaningful */ |
55 }; | |
56 | |
17045
1dfa84b25d3b
(SET_RAW_SYNTAX_ENTRY): Handle syntax of multibyte
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
57 /* Set the syntax entry VAL for char C in table TABLE. */ |
13143
ba670977cceb
Use char tables as syntax tables.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
58 |
88390
ee2122ab4d5b
(SET_RAW_SYNTAX_ENTRY): Call CHAR_TABLE_SET.
Kenichi Handa <handa@m17n.org>
parents:
39795
diff
changeset
|
59 #define SET_RAW_SYNTAX_ENTRY(table, c, val) \ |
88432
9302a313a37b
(SET_RAW_SYNTAX_ENTRY): Don't call make_number.
Kenichi Handa <handa@m17n.org>
parents:
88390
diff
changeset
|
60 CHAR_TABLE_SET ((table), c, (val)) |
5441
0af9674da850
(enum syntaxcode): Add Sinherit.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
61 |
88390
ee2122ab4d5b
(SET_RAW_SYNTAX_ENTRY): Call CHAR_TABLE_SET.
Kenichi Handa <handa@m17n.org>
parents:
39795
diff
changeset
|
62 /* Set the syntax entry VAL for char-range RANGE in table TABLE. |
ee2122ab4d5b
(SET_RAW_SYNTAX_ENTRY): Call CHAR_TABLE_SET.
Kenichi Handa <handa@m17n.org>
parents:
39795
diff
changeset
|
63 RANGE is a cons (FROM . TO) specifying the range of characters. */ |
13143
ba670977cceb
Use char tables as syntax tables.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
64 |
88390
ee2122ab4d5b
(SET_RAW_SYNTAX_ENTRY): Call CHAR_TABLE_SET.
Kenichi Handa <handa@m17n.org>
parents:
39795
diff
changeset
|
65 #define SET_RAW_SYNTAX_ENTRY_RANGE(table, range, val) \ |
ee2122ab4d5b
(SET_RAW_SYNTAX_ENTRY): Call CHAR_TABLE_SET.
Kenichi Handa <handa@m17n.org>
parents:
39795
diff
changeset
|
66 Fset_char_table_range ((table), (range), (val)) |
17045
1dfa84b25d3b
(SET_RAW_SYNTAX_ENTRY): Handle syntax of multibyte
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
67 |
17465
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
68 /* SYNTAX_ENTRY fetches the information from the entry for character C |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46370
diff
changeset
|
69 in syntax table TABLE, or from globally kept data (gl_state). |
17465
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
70 Does inheritance. */ |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
71 /* CURRENT_SYNTAX_TABLE gives the syntax table valid for current |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
72 position, it is either the buffer's syntax table, or syntax table |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
73 found in text properties. */ |
17045
1dfa84b25d3b
(SET_RAW_SYNTAX_ENTRY): Handle syntax of multibyte
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
74 |
17465
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
75 #ifdef SYNTAX_ENTRY_VIA_PROPERTY |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
76 # define SYNTAX_ENTRY(c) \ |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
77 (gl_state.use_global ? gl_state.global_code : SYNTAX_ENTRY_INT (c)) |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
78 # define CURRENT_SYNTAX_TABLE gl_state.current_syntax_table |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
79 #else |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
80 # define SYNTAX_ENTRY SYNTAX_ENTRY_INT |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
81 # define CURRENT_SYNTAX_TABLE current_buffer->syntax_table |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
82 #endif |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
83 |
88852
9a7268b7a742
(SYNTAX_ENTRY_INT): Don't use make_number.
Dave Love <fx@gnu.org>
parents:
88471
diff
changeset
|
84 #define SYNTAX_ENTRY_INT(c) CHAR_TABLE_REF (CURRENT_SYNTAX_TABLE, (c)) |
17045
1dfa84b25d3b
(SET_RAW_SYNTAX_ENTRY): Handle syntax of multibyte
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
85 |
1dfa84b25d3b
(SET_RAW_SYNTAX_ENTRY): Handle syntax of multibyte
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
86 /* Extract the information from the entry for character C |
1dfa84b25d3b
(SET_RAW_SYNTAX_ENTRY): Handle syntax of multibyte
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
87 in the current syntax table. */ |
1dfa84b25d3b
(SET_RAW_SYNTAX_ENTRY): Handle syntax of multibyte
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
88 |
1dfa84b25d3b
(SET_RAW_SYNTAX_ENTRY): Handle syntax of multibyte
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
89 #ifdef __GNUC__ |
13143
ba670977cceb
Use char tables as syntax tables.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
90 #define SYNTAX(c) \ |
56068
f6fab60742ca
(SYNTAX_ENTRY_FOLLOW_PARENT): Rename local variable to
Andreas Schwab <schwab@suse.de>
parents:
55319
diff
changeset
|
91 ({ Lisp_Object _syntax_temp; \ |
f6fab60742ca
(SYNTAX_ENTRY_FOLLOW_PARENT): Rename local variable to
Andreas Schwab <schwab@suse.de>
parents:
55319
diff
changeset
|
92 _syntax_temp = SYNTAX_ENTRY (c); \ |
f6fab60742ca
(SYNTAX_ENTRY_FOLLOW_PARENT): Rename local variable to
Andreas Schwab <schwab@suse.de>
parents:
55319
diff
changeset
|
93 (CONSP (_syntax_temp) \ |
f6fab60742ca
(SYNTAX_ENTRY_FOLLOW_PARENT): Rename local variable to
Andreas Schwab <schwab@suse.de>
parents:
55319
diff
changeset
|
94 ? (enum syntaxcode) (XINT (XCAR (_syntax_temp)) & 0xff) \ |
17045
1dfa84b25d3b
(SET_RAW_SYNTAX_ENTRY): Handle syntax of multibyte
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
95 : Swhitespace); }) |
13143
ba670977cceb
Use char tables as syntax tables.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
96 |
ba670977cceb
Use char tables as syntax tables.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
97 #define SYNTAX_WITH_FLAGS(c) \ |
56068
f6fab60742ca
(SYNTAX_ENTRY_FOLLOW_PARENT): Rename local variable to
Andreas Schwab <schwab@suse.de>
parents:
55319
diff
changeset
|
98 ({ Lisp_Object _syntax_temp; \ |
f6fab60742ca
(SYNTAX_ENTRY_FOLLOW_PARENT): Rename local variable to
Andreas Schwab <schwab@suse.de>
parents:
55319
diff
changeset
|
99 _syntax_temp = SYNTAX_ENTRY (c); \ |
f6fab60742ca
(SYNTAX_ENTRY_FOLLOW_PARENT): Rename local variable to
Andreas Schwab <schwab@suse.de>
parents:
55319
diff
changeset
|
100 (CONSP (_syntax_temp) \ |
f6fab60742ca
(SYNTAX_ENTRY_FOLLOW_PARENT): Rename local variable to
Andreas Schwab <schwab@suse.de>
parents:
55319
diff
changeset
|
101 ? XINT (XCAR (_syntax_temp)) \ |
17045
1dfa84b25d3b
(SET_RAW_SYNTAX_ENTRY): Handle syntax of multibyte
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
102 : (int) Swhitespace); }) |
13143
ba670977cceb
Use char tables as syntax tables.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
103 |
ba670977cceb
Use char tables as syntax tables.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
104 #define SYNTAX_MATCH(c) \ |
56068
f6fab60742ca
(SYNTAX_ENTRY_FOLLOW_PARENT): Rename local variable to
Andreas Schwab <schwab@suse.de>
parents:
55319
diff
changeset
|
105 ({ Lisp_Object _syntax_temp; \ |
f6fab60742ca
(SYNTAX_ENTRY_FOLLOW_PARENT): Rename local variable to
Andreas Schwab <schwab@suse.de>
parents:
55319
diff
changeset
|
106 _syntax_temp = SYNTAX_ENTRY (c); \ |
f6fab60742ca
(SYNTAX_ENTRY_FOLLOW_PARENT): Rename local variable to
Andreas Schwab <schwab@suse.de>
parents:
55319
diff
changeset
|
107 (CONSP (_syntax_temp) \ |
f6fab60742ca
(SYNTAX_ENTRY_FOLLOW_PARENT): Rename local variable to
Andreas Schwab <schwab@suse.de>
parents:
55319
diff
changeset
|
108 ? XCDR (_syntax_temp) \ |
17045
1dfa84b25d3b
(SET_RAW_SYNTAX_ENTRY): Handle syntax of multibyte
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
109 : Qnil); }) |
5441
0af9674da850
(enum syntaxcode): Add Sinherit.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
110 #else |
88471
9729ea16acd8
(syntax_temp) [!__GNUC__]: Declare.
Dave Love <fx@gnu.org>
parents:
88432
diff
changeset
|
111 extern Lisp_Object syntax_temp; |
13143
ba670977cceb
Use char tables as syntax tables.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
112 #define SYNTAX(c) \ |
13318
94a4b6e9d310
(SYNTAX, SYNTAX_WITH_FLAGS, SYNTAX_MATCH): Fix the non-GCC definitions.
Richard M. Stallman <rms@gnu.org>
parents:
13143
diff
changeset
|
113 (syntax_temp = SYNTAX_ENTRY ((c)), \ |
13143
ba670977cceb
Use char tables as syntax tables.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
114 (CONSP (syntax_temp) \ |
25640 | 115 ? (enum syntaxcode) (XINT (XCAR (syntax_temp)) & 0xff) \ |
17045
1dfa84b25d3b
(SET_RAW_SYNTAX_ENTRY): Handle syntax of multibyte
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
116 : Swhitespace)) |
13143
ba670977cceb
Use char tables as syntax tables.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
117 |
ba670977cceb
Use char tables as syntax tables.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
118 #define SYNTAX_WITH_FLAGS(c) \ |
13318
94a4b6e9d310
(SYNTAX, SYNTAX_WITH_FLAGS, SYNTAX_MATCH): Fix the non-GCC definitions.
Richard M. Stallman <rms@gnu.org>
parents:
13143
diff
changeset
|
119 (syntax_temp = SYNTAX_ENTRY ((c)), \ |
13143
ba670977cceb
Use char tables as syntax tables.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
120 (CONSP (syntax_temp) \ |
25640 | 121 ? XINT (XCAR (syntax_temp)) \ |
17045
1dfa84b25d3b
(SET_RAW_SYNTAX_ENTRY): Handle syntax of multibyte
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
122 : (int) Swhitespace)) |
13143
ba670977cceb
Use char tables as syntax tables.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
123 |
ba670977cceb
Use char tables as syntax tables.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
124 #define SYNTAX_MATCH(c) \ |
13318
94a4b6e9d310
(SYNTAX, SYNTAX_WITH_FLAGS, SYNTAX_MATCH): Fix the non-GCC definitions.
Richard M. Stallman <rms@gnu.org>
parents:
13143
diff
changeset
|
125 (syntax_temp = SYNTAX_ENTRY ((c)), \ |
13143
ba670977cceb
Use char tables as syntax tables.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
126 (CONSP (syntax_temp) \ |
25640 | 127 ? XCDR (syntax_temp) \ |
17045
1dfa84b25d3b
(SET_RAW_SYNTAX_ENTRY): Handle syntax of multibyte
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
128 : Qnil)) |
5441
0af9674da850
(enum syntaxcode): Add Sinherit.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
129 #endif |
486 | 130 |
1073 | 131 |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109099
diff
changeset
|
132 /* Whether the syntax of the character C has the prefix flag set. */ |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109099
diff
changeset
|
133 extern int syntax_prefix_flag_p (int c); |
25446
2a2d7ebaa018
(SYNTAX_COMMENT_NESTED, SYNTAX_FLAGS_COMMENT_NESTED):
Richard M. Stallman <rms@gnu.org>
parents:
23713
diff
changeset
|
134 |
486 | 135 /* This array, indexed by a character, contains the syntax code which that |
136 character signifies (as a char). For example, | |
17465
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
137 (enum syntaxcode) syntax_spec_code['w'] is Sword. */ |
486 | 138 |
139 extern unsigned char syntax_spec_code[0400]; | |
140 | |
17465
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
141 /* Indexed by syntax code, give the letter that describes it. */ |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
142 |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
143 extern char syntax_code_spec[16]; |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
144 |
20649
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
145 /* Convert the byte offset BYTEPOS into a character position, |
21015
9f8f791762a8
(UPDATE_SYNTAX_TABLE): Do nothing unless parse_sexp_lookup_properties.
Richard M. Stallman <rms@gnu.org>
parents:
20957
diff
changeset
|
146 for the object recorded in gl_state with SETUP_SYNTAX_TABLE_FOR_OBJECT. |
9f8f791762a8
(UPDATE_SYNTAX_TABLE): Do nothing unless parse_sexp_lookup_properties.
Richard M. Stallman <rms@gnu.org>
parents:
20957
diff
changeset
|
147 |
9f8f791762a8
(UPDATE_SYNTAX_TABLE): Do nothing unless parse_sexp_lookup_properties.
Richard M. Stallman <rms@gnu.org>
parents:
20957
diff
changeset
|
148 The value is meant for use in the UPDATE_SYNTAX_TABLE... macros. |
9f8f791762a8
(UPDATE_SYNTAX_TABLE): Do nothing unless parse_sexp_lookup_properties.
Richard M. Stallman <rms@gnu.org>
parents:
20957
diff
changeset
|
149 These macros do nothing when parse_sexp_lookup_properties is 0, |
9f8f791762a8
(UPDATE_SYNTAX_TABLE): Do nothing unless parse_sexp_lookup_properties.
Richard M. Stallman <rms@gnu.org>
parents:
20957
diff
changeset
|
150 so we return 0 in that case, for speed. */ |
20649
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
151 |
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
152 #define SYNTAX_TABLE_BYTE_TO_CHAR(bytepos) \ |
21015
9f8f791762a8
(UPDATE_SYNTAX_TABLE): Do nothing unless parse_sexp_lookup_properties.
Richard M. Stallman <rms@gnu.org>
parents:
20957
diff
changeset
|
153 (! parse_sexp_lookup_properties \ |
9f8f791762a8
(UPDATE_SYNTAX_TABLE): Do nothing unless parse_sexp_lookup_properties.
Richard M. Stallman <rms@gnu.org>
parents:
20957
diff
changeset
|
154 ? 0 \ |
9f8f791762a8
(UPDATE_SYNTAX_TABLE): Do nothing unless parse_sexp_lookup_properties.
Richard M. Stallman <rms@gnu.org>
parents:
20957
diff
changeset
|
155 : STRINGP (gl_state.object) \ |
20649
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
156 ? string_byte_to_char (gl_state.object, (bytepos)) \ |
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
157 : BUFFERP (gl_state.object) \ |
21481
e53c0d01cf31
(SETUP_SYNTAX_TABLE_FOR_OBJECT): FROM counts chars.
Karl Heuer <kwzh@gnu.org>
parents:
21206
diff
changeset
|
158 ? buf_bytepos_to_charpos (XBUFFER (gl_state.object), \ |
e53c0d01cf31
(SETUP_SYNTAX_TABLE_FOR_OBJECT): FROM counts chars.
Karl Heuer <kwzh@gnu.org>
parents:
21206
diff
changeset
|
159 (bytepos) + BUF_BEGV_BYTE (XBUFFER (gl_state.object)) - 1) - BUF_BEGV (XBUFFER (gl_state.object)) + 1 \ |
20649
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
160 : NILP (gl_state.object) \ |
21481
e53c0d01cf31
(SETUP_SYNTAX_TABLE_FOR_OBJECT): FROM counts chars.
Karl Heuer <kwzh@gnu.org>
parents:
21206
diff
changeset
|
161 ? BYTE_TO_CHAR ((bytepos) + BEGV_BYTE - 1) - BEGV + 1 \ |
20649
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
162 : (bytepos)) |
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
163 |
21481
e53c0d01cf31
(SETUP_SYNTAX_TABLE_FOR_OBJECT): FROM counts chars.
Karl Heuer <kwzh@gnu.org>
parents:
21206
diff
changeset
|
164 /* Make syntax table state (gl_state) good for CHARPOS, assuming it is |
e53c0d01cf31
(SETUP_SYNTAX_TABLE_FOR_OBJECT): FROM counts chars.
Karl Heuer <kwzh@gnu.org>
parents:
21206
diff
changeset
|
165 currently good for a position before CHARPOS. */ |
17465
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
166 |
21481
e53c0d01cf31
(SETUP_SYNTAX_TABLE_FOR_OBJECT): FROM counts chars.
Karl Heuer <kwzh@gnu.org>
parents:
21206
diff
changeset
|
167 #define UPDATE_SYNTAX_TABLE_FORWARD(charpos) \ |
21015
9f8f791762a8
(UPDATE_SYNTAX_TABLE): Do nothing unless parse_sexp_lookup_properties.
Richard M. Stallman <rms@gnu.org>
parents:
20957
diff
changeset
|
168 (parse_sexp_lookup_properties \ |
21481
e53c0d01cf31
(SETUP_SYNTAX_TABLE_FOR_OBJECT): FROM counts chars.
Karl Heuer <kwzh@gnu.org>
parents:
21206
diff
changeset
|
169 && (charpos) >= gl_state.e_property \ |
e53c0d01cf31
(SETUP_SYNTAX_TABLE_FOR_OBJECT): FROM counts chars.
Karl Heuer <kwzh@gnu.org>
parents:
21206
diff
changeset
|
170 ? (update_syntax_table ((charpos) + gl_state.offset, 1, 0, \ |
20649
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
171 gl_state.object), \ |
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
172 1) \ |
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
173 : 0) |
17465
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
174 |
21481
e53c0d01cf31
(SETUP_SYNTAX_TABLE_FOR_OBJECT): FROM counts chars.
Karl Heuer <kwzh@gnu.org>
parents:
21206
diff
changeset
|
175 /* Make syntax table state (gl_state) good for CHARPOS, assuming it is |
e53c0d01cf31
(SETUP_SYNTAX_TABLE_FOR_OBJECT): FROM counts chars.
Karl Heuer <kwzh@gnu.org>
parents:
21206
diff
changeset
|
176 currently good for a position after CHARPOS. */ |
18678
d26f9720e55f
(struct gl_state_s): New field `offset'.
Richard M. Stallman <rms@gnu.org>
parents:
18625
diff
changeset
|
177 |
21481
e53c0d01cf31
(SETUP_SYNTAX_TABLE_FOR_OBJECT): FROM counts chars.
Karl Heuer <kwzh@gnu.org>
parents:
21206
diff
changeset
|
178 #define UPDATE_SYNTAX_TABLE_BACKWARD(charpos) \ |
21015
9f8f791762a8
(UPDATE_SYNTAX_TABLE): Do nothing unless parse_sexp_lookup_properties.
Richard M. Stallman <rms@gnu.org>
parents:
20957
diff
changeset
|
179 (parse_sexp_lookup_properties \ |
39795
b945bdff4f96
(struct gl_state_s): Change the meaning of b_property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26870
diff
changeset
|
180 && (charpos) < gl_state.b_property \ |
21481
e53c0d01cf31
(SETUP_SYNTAX_TABLE_FOR_OBJECT): FROM counts chars.
Karl Heuer <kwzh@gnu.org>
parents:
21206
diff
changeset
|
181 ? (update_syntax_table ((charpos) + gl_state.offset, -1, 0, \ |
20649
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
182 gl_state.object), \ |
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
183 1) \ |
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
184 : 0) |
17465
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
185 |
21481
e53c0d01cf31
(SETUP_SYNTAX_TABLE_FOR_OBJECT): FROM counts chars.
Karl Heuer <kwzh@gnu.org>
parents:
21206
diff
changeset
|
186 /* Make syntax table good for CHARPOS. */ |
18678
d26f9720e55f
(struct gl_state_s): New field `offset'.
Richard M. Stallman <rms@gnu.org>
parents:
18625
diff
changeset
|
187 |
21481
e53c0d01cf31
(SETUP_SYNTAX_TABLE_FOR_OBJECT): FROM counts chars.
Karl Heuer <kwzh@gnu.org>
parents:
21206
diff
changeset
|
188 #define UPDATE_SYNTAX_TABLE(charpos) \ |
21015
9f8f791762a8
(UPDATE_SYNTAX_TABLE): Do nothing unless parse_sexp_lookup_properties.
Richard M. Stallman <rms@gnu.org>
parents:
20957
diff
changeset
|
189 (parse_sexp_lookup_properties \ |
39795
b945bdff4f96
(struct gl_state_s): Change the meaning of b_property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26870
diff
changeset
|
190 && (charpos) < gl_state.b_property \ |
21481
e53c0d01cf31
(SETUP_SYNTAX_TABLE_FOR_OBJECT): FROM counts chars.
Karl Heuer <kwzh@gnu.org>
parents:
21206
diff
changeset
|
191 ? (update_syntax_table ((charpos) + gl_state.offset, -1, 0, \ |
20649
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
192 gl_state.object), \ |
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
193 1) \ |
21015
9f8f791762a8
(UPDATE_SYNTAX_TABLE): Do nothing unless parse_sexp_lookup_properties.
Richard M. Stallman <rms@gnu.org>
parents:
20957
diff
changeset
|
194 : (parse_sexp_lookup_properties \ |
21481
e53c0d01cf31
(SETUP_SYNTAX_TABLE_FOR_OBJECT): FROM counts chars.
Karl Heuer <kwzh@gnu.org>
parents:
21206
diff
changeset
|
195 && (charpos) >= gl_state.e_property \ |
e53c0d01cf31
(SETUP_SYNTAX_TABLE_FOR_OBJECT): FROM counts chars.
Karl Heuer <kwzh@gnu.org>
parents:
21206
diff
changeset
|
196 ? (update_syntax_table ((charpos) + gl_state.offset, 1, 0,\ |
20649
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
197 gl_state.object), \ |
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
198 1) \ |
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
199 : 0)) |
17465
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
200 |
107366
14ff9accfbd3
Cleanup setup of gl_state in various parts of the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
201 /* This macro sets up the buffer-global syntax table. */ |
14ff9accfbd3
Cleanup setup of gl_state in various parts of the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
202 #define SETUP_BUFFER_SYNTAX_TABLE() \ |
14ff9accfbd3
Cleanup setup of gl_state in various parts of the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
203 do \ |
14ff9accfbd3
Cleanup setup of gl_state in various parts of the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
204 { \ |
14ff9accfbd3
Cleanup setup of gl_state in various parts of the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
205 gl_state.use_global = 0; \ |
14ff9accfbd3
Cleanup setup of gl_state in various parts of the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
206 gl_state.current_syntax_table = current_buffer->syntax_table; \ |
14ff9accfbd3
Cleanup setup of gl_state in various parts of the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
207 } while (0) |
14ff9accfbd3
Cleanup setup of gl_state in various parts of the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
208 |
17465
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
209 /* This macro should be called with FROM at the start of forward |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
210 search, or after the last position of the backward search. It |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
211 makes sure that the first char is picked up with correct table, so |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
212 one does not need to call UPDATE_SYNTAX_TABLE immediately after the |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46370
diff
changeset
|
213 call. |
17465
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
214 Sign of COUNT gives the direction of the search. |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
215 */ |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
216 |
20649
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
217 #define SETUP_SYNTAX_TABLE(FROM, COUNT) \ |
91618
400a54e167c9
Use "do...while (0)", not "if (1)..else" in macro definitions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
91327
diff
changeset
|
218 do \ |
21015
9f8f791762a8
(UPDATE_SYNTAX_TABLE): Do nothing unless parse_sexp_lookup_properties.
Richard M. Stallman <rms@gnu.org>
parents:
20957
diff
changeset
|
219 { \ |
107366
14ff9accfbd3
Cleanup setup of gl_state in various parts of the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
220 SETUP_BUFFER_SYNTAX_TABLE (); \ |
39795
b945bdff4f96
(struct gl_state_s): Change the meaning of b_property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26870
diff
changeset
|
221 gl_state.b_property = BEGV; \ |
21015
9f8f791762a8
(UPDATE_SYNTAX_TABLE): Do nothing unless parse_sexp_lookup_properties.
Richard M. Stallman <rms@gnu.org>
parents:
20957
diff
changeset
|
222 gl_state.e_property = ZV + 1; \ |
9f8f791762a8
(UPDATE_SYNTAX_TABLE): Do nothing unless parse_sexp_lookup_properties.
Richard M. Stallman <rms@gnu.org>
parents:
20957
diff
changeset
|
223 gl_state.object = Qnil; \ |
9f8f791762a8
(UPDATE_SYNTAX_TABLE): Do nothing unless parse_sexp_lookup_properties.
Richard M. Stallman <rms@gnu.org>
parents:
20957
diff
changeset
|
224 gl_state.offset = 0; \ |
9f8f791762a8
(UPDATE_SYNTAX_TABLE): Do nothing unless parse_sexp_lookup_properties.
Richard M. Stallman <rms@gnu.org>
parents:
20957
diff
changeset
|
225 if (parse_sexp_lookup_properties) \ |
22438
917424c9c149
(SETUP_SYNTAX_TABLE): Don't call update_syntax_table
Richard M. Stallman <rms@gnu.org>
parents:
21481
diff
changeset
|
226 if ((COUNT) > 0 || (FROM) > BEGV) \ |
917424c9c149
(SETUP_SYNTAX_TABLE): Don't call update_syntax_table
Richard M. Stallman <rms@gnu.org>
parents:
21481
diff
changeset
|
227 update_syntax_table ((COUNT) > 0 ? (FROM) : (FROM) - 1, (COUNT),\ |
917424c9c149
(SETUP_SYNTAX_TABLE): Don't call update_syntax_table
Richard M. Stallman <rms@gnu.org>
parents:
21481
diff
changeset
|
228 1, Qnil); \ |
21015
9f8f791762a8
(UPDATE_SYNTAX_TABLE): Do nothing unless parse_sexp_lookup_properties.
Richard M. Stallman <rms@gnu.org>
parents:
20957
diff
changeset
|
229 } \ |
91618
400a54e167c9
Use "do...while (0)", not "if (1)..else" in macro definitions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
91327
diff
changeset
|
230 while (0) |
17465
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
231 |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
232 /* Same as above, but in OBJECT. If OBJECT is nil, use current buffer. |
18678
d26f9720e55f
(struct gl_state_s): New field `offset'.
Richard M. Stallman <rms@gnu.org>
parents:
18625
diff
changeset
|
233 If it is t, ignore properties altogether. |
d26f9720e55f
(struct gl_state_s): New field `offset'.
Richard M. Stallman <rms@gnu.org>
parents:
18625
diff
changeset
|
234 |
d26f9720e55f
(struct gl_state_s): New field `offset'.
Richard M. Stallman <rms@gnu.org>
parents:
18625
diff
changeset
|
235 This is meant for regex.c to use. For buffers, regex.c passes arguments |
d26f9720e55f
(struct gl_state_s): New field `offset'.
Richard M. Stallman <rms@gnu.org>
parents:
18625
diff
changeset
|
236 to the UPDATE_SYNTAX_TABLE macros which are relative to BEGV. |
20544
a884f0426ab9
(SETUP_SYNTAX_TABLE_FOR_OBJECT): Call bytepos_to_charpos.
Richard M. Stallman <rms@gnu.org>
parents:
20487
diff
changeset
|
237 So if it is a buffer, we set the offset field to BEGV. */ |
486 | 238 |
20649
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
239 #define SETUP_SYNTAX_TABLE_FOR_OBJECT(OBJECT, FROM, COUNT) \ |
91618
400a54e167c9
Use "do...while (0)", not "if (1)..else" in macro definitions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
91327
diff
changeset
|
240 do \ |
20544
a884f0426ab9
(SETUP_SYNTAX_TABLE_FOR_OBJECT): Call bytepos_to_charpos.
Richard M. Stallman <rms@gnu.org>
parents:
20487
diff
changeset
|
241 { \ |
107366
14ff9accfbd3
Cleanup setup of gl_state in various parts of the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
242 SETUP_BUFFER_SYNTAX_TABLE (); \ |
20649
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
243 gl_state.object = (OBJECT); \ |
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
244 if (BUFFERP (gl_state.object)) \ |
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
245 { \ |
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
246 struct buffer *buf = XBUFFER (gl_state.object); \ |
39795
b945bdff4f96
(struct gl_state_s): Change the meaning of b_property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26870
diff
changeset
|
247 gl_state.b_property = 1; \ |
20957
25bb3da85d05
(UPDATE_SYNTAX_TABLE_FORWARD): Fix condition.
Karl Heuer <kwzh@gnu.org>
parents:
20708
diff
changeset
|
248 gl_state.e_property = BUF_ZV (buf) - BUF_BEGV (buf) + 1; \ |
20649
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
249 gl_state.offset = BUF_BEGV (buf) - 1; \ |
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
250 } \ |
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
251 else if (NILP (gl_state.object)) \ |
20544
a884f0426ab9
(SETUP_SYNTAX_TABLE_FOR_OBJECT): Call bytepos_to_charpos.
Richard M. Stallman <rms@gnu.org>
parents:
20487
diff
changeset
|
252 { \ |
39795
b945bdff4f96
(struct gl_state_s): Change the meaning of b_property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26870
diff
changeset
|
253 gl_state.b_property = 1; \ |
20957
25bb3da85d05
(UPDATE_SYNTAX_TABLE_FORWARD): Fix condition.
Karl Heuer <kwzh@gnu.org>
parents:
20708
diff
changeset
|
254 gl_state.e_property = ZV - BEGV + 1; \ |
20544
a884f0426ab9
(SETUP_SYNTAX_TABLE_FOR_OBJECT): Call bytepos_to_charpos.
Richard M. Stallman <rms@gnu.org>
parents:
20487
diff
changeset
|
255 gl_state.offset = BEGV - 1; \ |
a884f0426ab9
(SETUP_SYNTAX_TABLE_FOR_OBJECT): Call bytepos_to_charpos.
Richard M. Stallman <rms@gnu.org>
parents:
20487
diff
changeset
|
256 } \ |
20649
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
257 else if (EQ (gl_state.object, Qt)) \ |
20544
a884f0426ab9
(SETUP_SYNTAX_TABLE_FOR_OBJECT): Call bytepos_to_charpos.
Richard M. Stallman <rms@gnu.org>
parents:
20487
diff
changeset
|
258 { \ |
39795
b945bdff4f96
(struct gl_state_s): Change the meaning of b_property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26870
diff
changeset
|
259 gl_state.b_property = 0; \ |
20544
a884f0426ab9
(SETUP_SYNTAX_TABLE_FOR_OBJECT): Call bytepos_to_charpos.
Richard M. Stallman <rms@gnu.org>
parents:
20487
diff
changeset
|
260 gl_state.e_property = 1500000000; \ |
a884f0426ab9
(SETUP_SYNTAX_TABLE_FOR_OBJECT): Call bytepos_to_charpos.
Richard M. Stallman <rms@gnu.org>
parents:
20487
diff
changeset
|
261 gl_state.offset = 0; \ |
a884f0426ab9
(SETUP_SYNTAX_TABLE_FOR_OBJECT): Call bytepos_to_charpos.
Richard M. Stallman <rms@gnu.org>
parents:
20487
diff
changeset
|
262 } \ |
a884f0426ab9
(SETUP_SYNTAX_TABLE_FOR_OBJECT): Call bytepos_to_charpos.
Richard M. Stallman <rms@gnu.org>
parents:
20487
diff
changeset
|
263 else \ |
a884f0426ab9
(SETUP_SYNTAX_TABLE_FOR_OBJECT): Call bytepos_to_charpos.
Richard M. Stallman <rms@gnu.org>
parents:
20487
diff
changeset
|
264 { \ |
39795
b945bdff4f96
(struct gl_state_s): Change the meaning of b_property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26870
diff
changeset
|
265 gl_state.b_property = 0; \ |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
39795
diff
changeset
|
266 gl_state.e_property = 1 + SCHARS (gl_state.object); \ |
20544
a884f0426ab9
(SETUP_SYNTAX_TABLE_FOR_OBJECT): Call bytepos_to_charpos.
Richard M. Stallman <rms@gnu.org>
parents:
20487
diff
changeset
|
267 gl_state.offset = 0; \ |
a884f0426ab9
(SETUP_SYNTAX_TABLE_FOR_OBJECT): Call bytepos_to_charpos.
Richard M. Stallman <rms@gnu.org>
parents:
20487
diff
changeset
|
268 } \ |
a884f0426ab9
(SETUP_SYNTAX_TABLE_FOR_OBJECT): Call bytepos_to_charpos.
Richard M. Stallman <rms@gnu.org>
parents:
20487
diff
changeset
|
269 if (parse_sexp_lookup_properties) \ |
21481
e53c0d01cf31
(SETUP_SYNTAX_TABLE_FOR_OBJECT): FROM counts chars.
Karl Heuer <kwzh@gnu.org>
parents:
21206
diff
changeset
|
270 update_syntax_table (((FROM) + gl_state.offset \ |
20649
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
271 + (COUNT > 0 ? 0 : -1)), \ |
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
272 COUNT, 1, gl_state.object); \ |
20544
a884f0426ab9
(SETUP_SYNTAX_TABLE_FOR_OBJECT): Call bytepos_to_charpos.
Richard M. Stallman <rms@gnu.org>
parents:
20487
diff
changeset
|
273 } \ |
91618
400a54e167c9
Use "do...while (0)", not "if (1)..else" in macro definitions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
91327
diff
changeset
|
274 while (0) |
17465
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
275 |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
276 struct gl_state_s |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
277 { |
20649
388cedeebb88
(SYNTAX_TABLE_BYTE_TO_CHAR): New macro.
Richard M. Stallman <rms@gnu.org>
parents:
20544
diff
changeset
|
278 Lisp_Object object; /* The object we are scanning. */ |
17465
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
279 int start; /* Where to stop. */ |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
280 int stop; /* Where to stop. */ |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
281 int use_global; /* Whether to use global_code |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
282 or c_s_t. */ |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
283 Lisp_Object global_code; /* Syntax code of current char. */ |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
284 Lisp_Object current_syntax_table; /* Syntax table for current pos. */ |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
285 Lisp_Object old_prop; /* Syntax-table prop at prev pos. */ |
39795
b945bdff4f96
(struct gl_state_s): Change the meaning of b_property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26870
diff
changeset
|
286 int b_property; /* First index where c_s_t is valid. */ |
17465
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
287 int e_property; /* First index where c_s_t is |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
288 not valid. */ |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
289 INTERVAL forward_i; /* Where to start lookup on forward */ |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
290 INTERVAL backward_i; /* or backward movement. The |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
291 data in c_s_t is valid |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
292 between these intervals, |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
293 and possibly at the |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
294 intervals too, depending |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
295 on: */ |
18678
d26f9720e55f
(struct gl_state_s): New field `offset'.
Richard M. Stallman <rms@gnu.org>
parents:
18625
diff
changeset
|
296 /* Offset for positions specified to UPDATE_SYNTAX_TABLE. */ |
d26f9720e55f
(struct gl_state_s): New field `offset'.
Richard M. Stallman <rms@gnu.org>
parents:
18625
diff
changeset
|
297 int offset; |
17465
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
298 }; |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
299 |
8a008f65c8d4
(enum syntaxcode): New members Scomment_fence, Sstring_fence.
Richard M. Stallman <rms@gnu.org>
parents:
17181
diff
changeset
|
300 extern struct gl_state_s gl_state; |
110551
f28cc7ff91f9
Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109757
diff
changeset
|
301 extern EMACS_INT scan_words (EMACS_INT, EMACS_INT); |
52401 | 302 |