aboutsummaryrefslogtreecommitdiffstats
path: root/src/coding.c
diff options
context:
space:
mode:
authorPip Cet2021-05-16 15:44:26 +0200
committerStefan Monnier2022-07-01 18:59:35 -0400
commitb6a526361b57f8d9f6d5078ccd97832d0a1fb036 (patch)
tree0c752a1c74920a2b731bb2e3c2ff6623be240a72 /src/coding.c
parent3daf833ff3f3e99b44731808cb197c0912649997 (diff)
downloademacs-scratch/no-purespace-old.tar.gz
emacs-scratch/no-purespace-old.zip
Remove purespace and ancillary codescratch/no-purespace-old
Now that purespace is not used any more, remove it, along with the functions used to allocate into it. Use equivalent functions allocating into the normal heap. Remove calls to PURE_P since they always return false. * src/puresize.h: Delete file. * src/alloc.c: Don't include `puresize.h` any more. (pure, purebeg, pure_size, pure_bytes_used_before_overflow) (pure_bytes_used_lisp, pure_bytes_used_non_lisp, symbol_block_pinned) (pinned_objects): Delete vars. (PUREBEG): Delete macro. (pointer_align): Move after definition of USE_ALIGNED_ALLOC and only define it if USE_ALIGNED_ALLOC is not used. (cons_listn): Remove `cons` arg, hardcode `Fcons` instead. (pure_listn, pure_alloc, check_pure_size, make_pure_string) (make_pure_c_string, pure_cons): Delete functions. (init_symbol): Don't set `pinned` any more. (mark_pinned_objects, mark_pinned_symbols): Delete functions. (garbage_collect): Don't call them any more. (init_alloc_once_for_pdumper): Don't initialize purebeg and pure_size. * src/print.c (print_object) <PVEC_HASH_TABLE>: Don't print `purecopy`. * src/pdumper.c (dump_symbol, dump_hash_table): Update sig hash. (dump_symbol): Don't dump `pinned`. (dump_hash_table): Don't dump `purecopy`. * src/lread.c (readevalloop, read_internal_start): Adjust call to `make_hash_table`. (read0, intern_c_string_1, define_symbol, Fintern): Don't purify symbol names. (string): Avoid `pure_cons` and `build_pure_c_string`. * src/lisp.h (struct Lisp_Symbol): Remove `pinned` field. (struct Lisp_Hash_Table): Remove `purecopy` field. (check_pure_size, pure_listn, pure_list, make_pure_string) (make_pure_c_string, pure_cons): Remove prototypes. (build_pure_c_string): Delete function. * src/keymap.c: Don't include `puresize.h` any more. (Fmake_sparse_keymap): Don't purecopy the menu name. (Fset_keymap_parent, store_in_keymap): Don't `CHECK_IMPURE` any more. (syms_of_keymap): Avoid `pure_cons` and `build_pure_c_string`. * src/intervals.c: Don't include `puresize.h` any more. (create_root_interval): Don't `CHECK_IMPURE` any more. * src/fns.c: Don't include `puresize.h` any more. (Ffillarray, Fclear_string): Don't `CHECK_IMPURE` any more. (make_hash_table): Remove `purecopy` arg. (Fmake_hash_table): Remove `:purecopy` keyword argument. * src/eval.c (Finternal__define_uninitialized_variable): Don't purecopy the doc any more. (Fdefconst_1): Don't purecopy the initvalue any more. (Fautoload): Get rid of hack needed when we used hash-consing. (syms_of_eval): Avoid `build_pure_c_string`. * src/emacs.c: Don't include `puresize.h` any more. (Fdump_emacs): Don't `check_pure_size`. * src/doc.c (Fsnarf_documentation): Don't purecopy the build files. * src/deps.mk: Remove puresize.h. * src/data.c: Don't include `puresize.h` any more. (pure_write_error): Delete function. (Fsetcar, Fsetcdr): Don't `CHECK_IMPURE` any more. (Fdefalias): Don't purecopy the definition any more. (Faset): Don't `CHECK_IMPURE` any more. (syms_of_data): Avoid `pure_cons` and `build_pure_c_string`. * src/conf_post.h (SYSTEM_PURESIZE_EXTRA): Delete macro. * src/comp.c: Don't include `puresize.h` any more. (helper_link_table): Remove `pure_write_error`. (define_CHECK_IMPURE): Delete function. (maybe_defer_native_compilation, syms_of_comp): Avoid `build_pure_c_string`. * src/category.c (hash_get_category_set): Update call to `make_hash_table`. (Fdefine_category): Don't purecopy the docstring any more. * src/bytecode.c: Don't include `puresize.h` any more. (Bsetcar, Bsetcdr): Don't `CHECK_IMPURE` any more. * doc/lispref/internals.texi (Pure Storage): Delete section. (Garbage Collection): Remove note about purespace overflow. * src/xfaces.c (syms_of_xfaces): * src/emacs-module.c (syms_of_module): * src/frame.c (make_frame, make_initial_frame): * src/fileio.c (syms_of_fileio): * src/image.c (xpm_make_color_table_h): * src/process.c (ADD_SUBFEATURE, syms_of_process): * src/profiler.c (make_log): * src/json.c (define_error): * src/xterm.c (syms_of_xterm): * src/xfns.c (syms_of_xfns): * src/xdisp.c (syms_of_xdisp): * src/w32fns.c (syms_of_w32fns): * src/syntax.c (syms_of_syntax): * src/sqlite.c (syms_of_sqlite): * src/search.c (syms_of_search): * src/keyboard.c (syms_of_keyboard): * src/fontset.c (syms_of_fontset): * src/dbusbind.c (syms_of_dbusbind): * src/coding.c (syms_of_coding): * src/callint.c (syms_of_callint): * src/buffer.c (init_buffer_once, syms_of_buffer): Avoid `build_pure_c_string`, `Fpurecopy`, `pure_cons`, and `pure_list`, and adjust calls to `make_hash_table`.
Diffstat (limited to 'src/coding.c')
-rw-r--r--src/coding.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/coding.c b/src/coding.c
index 3fb4f148b1c..a4087b68343 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -11682,7 +11682,7 @@ syms_of_coding (void)
11682 Vcode_conversion_reused_workbuf = Qnil; 11682 Vcode_conversion_reused_workbuf = Qnil;
11683 11683
11684 staticpro (&Vcode_conversion_workbuf_name); 11684 staticpro (&Vcode_conversion_workbuf_name);
11685 Vcode_conversion_workbuf_name = build_pure_c_string (" *code-conversion-work*"); 11685 Vcode_conversion_workbuf_name = build_string (" *code-conversion-work*");
11686 11686
11687 reused_workbuf_in_use = false; 11687 reused_workbuf_in_use = false;
11688 PDUMPER_REMEMBER_SCALAR (reused_workbuf_in_use); 11688 PDUMPER_REMEMBER_SCALAR (reused_workbuf_in_use);
@@ -11746,9 +11746,9 @@ syms_of_coding (void)
11746 /* Error signaled when there's a problem with detecting a coding system. */ 11746 /* Error signaled when there's a problem with detecting a coding system. */
11747 DEFSYM (Qcoding_system_error, "coding-system-error"); 11747 DEFSYM (Qcoding_system_error, "coding-system-error");
11748 Fput (Qcoding_system_error, Qerror_conditions, 11748 Fput (Qcoding_system_error, Qerror_conditions,
11749 pure_list (Qcoding_system_error, Qerror)); 11749 list (Qcoding_system_error, Qerror));
11750 Fput (Qcoding_system_error, Qerror_message, 11750 Fput (Qcoding_system_error, Qerror_message,
11751 build_pure_c_string ("Invalid coding system")); 11751 build_string ("Invalid coding system"));
11752 11752
11753 DEFSYM (Qtranslation_table, "translation-table"); 11753 DEFSYM (Qtranslation_table, "translation-table");
11754 Fput (Qtranslation_table, Qchar_table_extra_slots, make_fixnum (2)); 11754 Fput (Qtranslation_table, Qchar_table_extra_slots, make_fixnum (2));
@@ -12023,22 +12023,22 @@ encoding standard output and error streams. */);
12023 DEFVAR_LISP ("eol-mnemonic-unix", eol_mnemonic_unix, 12023 DEFVAR_LISP ("eol-mnemonic-unix", eol_mnemonic_unix,
12024 doc: /* 12024 doc: /*
12025String displayed in mode line for UNIX-like (LF) end-of-line format. */); 12025String displayed in mode line for UNIX-like (LF) end-of-line format. */);
12026 eol_mnemonic_unix = build_pure_c_string (":"); 12026 eol_mnemonic_unix = build_string (":");
12027 12027
12028 DEFVAR_LISP ("eol-mnemonic-dos", eol_mnemonic_dos, 12028 DEFVAR_LISP ("eol-mnemonic-dos", eol_mnemonic_dos,
12029 doc: /* 12029 doc: /*
12030String displayed in mode line for DOS-like (CRLF) end-of-line format. */); 12030String displayed in mode line for DOS-like (CRLF) end-of-line format. */);
12031 eol_mnemonic_dos = build_pure_c_string ("\\"); 12031 eol_mnemonic_dos = build_string ("\\");
12032 12032
12033 DEFVAR_LISP ("eol-mnemonic-mac", eol_mnemonic_mac, 12033 DEFVAR_LISP ("eol-mnemonic-mac", eol_mnemonic_mac,
12034 doc: /* 12034 doc: /*
12035String displayed in mode line for MAC-like (CR) end-of-line format. */); 12035String displayed in mode line for MAC-like (CR) end-of-line format. */);
12036 eol_mnemonic_mac = build_pure_c_string ("/"); 12036 eol_mnemonic_mac = build_string ("/");
12037 12037
12038 DEFVAR_LISP ("eol-mnemonic-undecided", eol_mnemonic_undecided, 12038 DEFVAR_LISP ("eol-mnemonic-undecided", eol_mnemonic_undecided,
12039 doc: /* 12039 doc: /*
12040String displayed in mode line when end-of-line format is not yet determined. */); 12040String displayed in mode line when end-of-line format is not yet determined. */);
12041 eol_mnemonic_undecided = build_pure_c_string (":"); 12041 eol_mnemonic_undecided = build_string (":");
12042 12042
12043 DEFVAR_LISP ("enable-character-translation", Venable_character_translation, 12043 DEFVAR_LISP ("enable-character-translation", Venable_character_translation,
12044 doc: /* 12044 doc: /*
@@ -12178,7 +12178,7 @@ internal character representation. */);
12178 intern_c_string (":for-unibyte"), 12178 intern_c_string (":for-unibyte"),
12179 args[coding_arg_for_unibyte] = Qt, 12179 args[coding_arg_for_unibyte] = Qt,
12180 intern_c_string (":docstring"), 12180 intern_c_string (":docstring"),
12181 (build_pure_c_string 12181 (build_string
12182 ("Do no conversion.\n" 12182 ("Do no conversion.\n"
12183 "\n" 12183 "\n"
12184 "When you visit a file with this coding, the file is read into a\n" 12184 "When you visit a file with this coding, the file is read into a\n"
@@ -12198,7 +12198,7 @@ internal character representation. */);
12198 plist[8] = intern_c_string (":charset-list"); 12198 plist[8] = intern_c_string (":charset-list");
12199 plist[9] = args[coding_arg_charset_list] = list1 (Qascii); 12199 plist[9] = args[coding_arg_charset_list] = list1 (Qascii);
12200 plist[11] = args[coding_arg_for_unibyte] = Qnil; 12200 plist[11] = args[coding_arg_for_unibyte] = Qnil;
12201 plist[13] = build_pure_c_string ("No conversion on encoding, " 12201 plist[13] = build_string ("No conversion on encoding, "
12202 "automatic conversion on decoding."); 12202 "automatic conversion on decoding.");
12203 plist[15] = args[coding_arg_eol_type] = Qnil; 12203 plist[15] = args[coding_arg_eol_type] = Qnil;
12204 args[coding_arg_plist] = CALLMANY (Flist, plist); 12204 args[coding_arg_plist] = CALLMANY (Flist, plist);