diff options
| -rw-r--r-- | src/ChangeLog | 34 | ||||
| -rw-r--r-- | src/alloc.c | 6 | ||||
| -rw-r--r-- | src/charset.c | 4 | ||||
| -rw-r--r-- | src/chartab.c | 2 | ||||
| -rw-r--r-- | src/data.c | 18 | ||||
| -rw-r--r-- | src/doc.c | 4 | ||||
| -rw-r--r-- | src/editfns.c | 7 | ||||
| -rw-r--r-- | src/fileio.c | 20 | ||||
| -rw-r--r-- | src/fns.c | 7 | ||||
| -rw-r--r-- | src/font.c | 14 | ||||
| -rw-r--r-- | src/fontset.c | 2 | ||||
| -rw-r--r-- | src/keyboard.c | 18 | ||||
| -rw-r--r-- | src/keymap.c | 6 | ||||
| -rw-r--r-- | src/lisp.h | 23 | ||||
| -rw-r--r-- | src/lread.c | 8 | ||||
| -rw-r--r-- | src/menu.c | 10 | ||||
| -rw-r--r-- | src/minibuf.c | 18 | ||||
| -rw-r--r-- | src/process.c | 71 | ||||
| -rw-r--r-- | src/textprop.c | 21 |
19 files changed, 164 insertions, 129 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5dc1d912caf..185a6c4bd40 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,37 @@ +2014-09-15 Dmitry Antipov <dmantipov@yandex.ru> + + If USE_LOCAL_ALLOCATORS, allocate some Lisp objects on stack. + * lisp.h (local_cons, local_list1, local_list2, local_list3) + [USE_LOCAL_ALLOCATORS]: New macros. + [!USE_LOCAL_ALLOCATORS]: Fall back to regular functions. + (build_local_string): Avoid argument name expansion clash with + make_local_string. + * alloc.c (toplevel) + [USE_LOCAL_ALLOCATORS && GC_MARK_STACK != GC_MAKE_GCPROS_NOOPS]: + Preprocessor guard to avoid impossible configuration. + * charset.c (Ffind_charset_region, Ffind_charset_string): + Use make_local_vector. + * lread.c (read1, substitute_object_recurse): Use scoped_cons. + * textprop.c (Fput_text_property, Fadd_face_text_property): + Use scoped_list2. + (copy_text_properties): Use local_cons and local_list3. + * chartab.c (uniprop_table): + * data.c (wrong_choice, wrong_range): + * doc.c (get_doc_string): + * editfns.c (format2): + * fileio.c (Fexpand_file_name, auto_save_error): + * fns.c (Fyes_or_no_p): + * font.c (font_parse_xlfd, font_parse_family_registry, font_add_log): + * fontset.c (Fset_fontset_font): + * keyboard.c (echo_add_key, echo_dash, parse_menu_item) + (read_char_minibuf_menu_prompt): + * keymap.c (silly_event_symbol_error, describe_vector): + * menu.c (single_menu_item): + * minibuf.c (Fread_buffer): + * process.c (status_message, Fformat_network_address) + (server_accept_connection): Use make_local_string and + build_local_string. Prefer compound literals where appropriate. + 2014-09-15 Daniel Colascione <dancol@dancol.org> * fns.c (Fsort): Tweak sort docstring. diff --git a/src/alloc.c b/src/alloc.c index a0725efef07..aa5849fee48 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -69,6 +69,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ static bool valgrind_p; #endif +#ifdef USE_LOCAL_ALLOCATORS +# if GC_MARK_STACK != GC_MAKE_GCPROS_NOOPS +# error "Stack-allocated Lisp objects are not compatible with GCPROs" +# endif +#endif + /* GC_CHECK_MARKED_OBJECTS means do sanity checks on allocated objects. Doable only if GC_MARK_STACK. */ #if ! GC_MARK_STACK diff --git a/src/charset.c b/src/charset.c index f987ab67ce9..a7bae9d7b01 100644 --- a/src/charset.c +++ b/src/charset.c @@ -1569,7 +1569,7 @@ only `ascii', `eight-bit-control', and `eight-bit-graphic'. */) from_byte = CHAR_TO_BYTE (from); - charsets = Fmake_vector (make_number (charset_table_used), Qnil); + charsets = make_local_vector (charset_table_used, Qnil); while (1) { find_charsets_in_text (BYTE_POS_ADDR (from_byte), stop - from, @@ -1606,7 +1606,7 @@ only `ascii', `eight-bit-control', and `eight-bit-graphic'. */) CHECK_STRING (str); - charsets = Fmake_vector (make_number (charset_table_used), Qnil); + charsets = make_local_vector (charset_table_used, Qnil); find_charsets_in_text (SDATA (str), SCHARS (str), SBYTES (str), charsets, table, STRING_MULTIBYTE (str)); diff --git a/src/chartab.c b/src/chartab.c index 50be063759a..50f76fcf57b 100644 --- a/src/chartab.c +++ b/src/chartab.c @@ -1307,7 +1307,7 @@ uniprop_table (Lisp_Object prop) { struct gcpro gcpro1; GCPRO1 (val); - result = Fload (concat2 (build_string ("international/"), table), + result = Fload (concat2 (build_local_string ("international/"), table), Qt, Qt, Qt, Qt); UNGCPRO; if (NILP (result)) diff --git a/src/data.c b/src/data.c index 5b8e01e2950..2d6d4c7c22b 100644 --- a/src/data.c +++ b/src/data.c @@ -988,8 +988,9 @@ wrong_choice (Lisp_Object choice, Lisp_Object wrong) for (obj = choice; !NILP (obj); obj = XCDR (obj)) { args[i++] = SYMBOL_NAME (XCAR (obj)); - args[i++] = build_string (NILP (XCDR (obj)) ? " should be specified" - : (NILP (XCDR (XCDR (obj))) ? " or " : ", ")); + args[i++] = build_local_string + (NILP (XCDR (obj)) ? " should be specified" + : (NILP (XCDR (XCDR (obj))) ? " or " : ", ")); } obj = Fconcat (i, args); @@ -1003,14 +1004,11 @@ wrong_choice (Lisp_Object choice, Lisp_Object wrong) static void wrong_range (Lisp_Object min, Lisp_Object max, Lisp_Object wrong) { - Lisp_Object args[4]; - - args[0] = build_string ("Value should be from "); - args[1] = Fnumber_to_string (min); - args[2] = build_string (" to "); - args[3] = Fnumber_to_string (max); - - xsignal2 (Qerror, Fconcat (4, args), wrong); + xsignal2 (Qerror, Fconcat (4, ((Lisp_Object []) + { build_local_string ("Value should be from "), + Fnumber_to_string (min), + build_local_string (" to "), + Fnumber_to_string (max) })), wrong); } /* Store NEWVAL into SYMBOL, where VALCONTENTS is found in the value cell diff --git a/src/doc.c b/src/doc.c index be882d4a5c7..98f2f8563a1 100644 --- a/src/doc.c +++ b/src/doc.c @@ -146,8 +146,8 @@ get_doc_string (Lisp_Object filepos, bool unibyte, bool definition) if (fd < 0) { SAFE_FREE (); - return concat3 (build_string ("Cannot open doc string file \""), - file, build_string ("\"\n")); + return concat3 (build_local_string ("Cannot open doc string file \""), + file, build_local_string ("\"\n")); } } count = SPECPDL_INDEX (); diff --git a/src/editfns.c b/src/editfns.c index 7e9a3bf7d3c..47779914c45 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -4362,11 +4362,8 @@ usage: (format STRING &rest OBJECTS) */) Lisp_Object format2 (const char *string1, Lisp_Object arg0, Lisp_Object arg1) { - Lisp_Object args[3]; - args[0] = build_string (string1); - args[1] = arg0; - args[2] = arg1; - return Fformat (3, args); + return Fformat (3, ((Lisp_Object []) + { build_local_string (string1), arg0, arg1 })); } DEFUN ("char-equal", Fchar_equal, Schar_equal, 2, 2, 0, diff --git a/src/fileio.c b/src/fileio.c index 0626bd3653a..0b508eae197 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -1162,11 +1162,11 @@ filesystem tree, not (expand-file-name ".." dirname). */) char newdir_utf8[MAX_UTF8_PATH]; filename_from_ansi (newdir, newdir_utf8); - tem = build_string (newdir_utf8); + tem = build_local_string (newdir_utf8); } else #endif - tem = build_string (newdir); + tem = build_local_string (newdir); newdirlim = newdir + SBYTES (tem); if (multibyte && !STRING_MULTIBYTE (tem)) { @@ -1198,7 +1198,7 @@ filesystem tree, not (expand-file-name ".." dirname). */) /* `getpwnam' may return a unibyte string, which will bite us since we expect the directory to be multibyte. */ - tem = build_string (newdir); + tem = build_local_string (newdir); newdirlim = newdir + SBYTES (tem); if (multibyte && !STRING_MULTIBYTE (tem)) { @@ -1231,7 +1231,7 @@ filesystem tree, not (expand-file-name ".." dirname). */) adir = NULL; else if (multibyte) { - Lisp_Object tem = build_string (adir); + Lisp_Object tem = build_local_string (adir); tem = DECODE_FILE (tem); newdirlim = adir + SBYTES (tem); @@ -1332,7 +1332,7 @@ filesystem tree, not (expand-file-name ".." dirname). */) getcwd (adir, adir_size); if (multibyte) { - Lisp_Object tem = build_string (adir); + Lisp_Object tem = build_local_string (adir); tem = DECODE_FILE (tem); newdirlim = adir + SBYTES (tem); @@ -5408,7 +5408,7 @@ An argument specifies the modification time value to use static Lisp_Object auto_save_error (Lisp_Object error_val) { - Lisp_Object args[3], msg; + Lisp_Object msg; int i; struct gcpro gcpro1; @@ -5416,10 +5416,10 @@ auto_save_error (Lisp_Object error_val) ring_bell (XFRAME (selected_frame)); - args[0] = build_string ("Auto-saving %s: %s"); - args[1] = BVAR (current_buffer, name); - args[2] = Ferror_message_string (error_val); - msg = Fformat (3, args); + msg = Fformat (3, ((Lisp_Object []) + { build_local_string ("Auto-saving %s: %s"), + BVAR (current_buffer, name), + Ferror_message_string (error_val) })); GCPRO1 (msg); for (i = 0; i < 3; ++i) diff --git a/src/fns.c b/src/fns.c index bbff9b6d554..9f56a8f01f5 100644 --- a/src/fns.c +++ b/src/fns.c @@ -2706,7 +2706,6 @@ if `last-nonmenu-event' is nil, and `use-dialog-box' is non-nil. */) (Lisp_Object prompt) { register Lisp_Object ans; - Lisp_Object args[2]; struct gcpro gcpro1; CHECK_STRING (prompt); @@ -2725,10 +2724,8 @@ if `last-nonmenu-event' is nil, and `use-dialog-box' is non-nil. */) return obj; } - args[0] = prompt; - args[1] = build_string ("(yes or no) "); - prompt = Fconcat (2, args); - + prompt = Fconcat (2, ((Lisp_Object []) + { prompt, build_local_string ("(yes or no) ") })); GCPRO1 (prompt); while (1) diff --git a/src/font.c b/src/font.c index 412cd3f938d..57cc4aa0b2b 100644 --- a/src/font.c +++ b/src/font.c @@ -1190,12 +1190,12 @@ font_parse_xlfd (char *name, ptrdiff_t len, Lisp_Object font) { val = prop[XLFD_ENCODING_INDEX]; if (! NILP (val)) - val = concat2 (build_string ("*-"), SYMBOL_NAME (val)); + val = concat2 (build_local_string ("*-"), SYMBOL_NAME (val)); } else if (NILP (prop[XLFD_ENCODING_INDEX])) - val = concat2 (SYMBOL_NAME (val), build_string ("-*")); + val = concat2 (SYMBOL_NAME (val), build_local_string ("-*")); else - val = concat3 (SYMBOL_NAME (val), build_string ("-"), + val = concat3 (SYMBOL_NAME (val), build_local_string ("-"), SYMBOL_NAME (prop[XLFD_ENCODING_INDEX])); if (! NILP (val)) ASET (font, FONT_REGISTRY_INDEX, Fintern (val, Qnil)); @@ -1793,9 +1793,9 @@ font_parse_family_registry (Lisp_Object family, Lisp_Object registry, Lisp_Objec if (! p1) { if (SDATA (registry)[len - 1] == '*') - registry = concat2 (registry, build_string ("-*")); + registry = concat2 (registry, build_local_string ("-*")); else - registry = concat2 (registry, build_string ("*-*")); + registry = concat2 (registry, build_local_string ("*-*")); } registry = Fdowncase (registry); ASET (font_spec, FONT_REGISTRY_INDEX, Fintern (registry, Qnil)); @@ -5022,7 +5022,7 @@ font_add_log (const char *action, Lisp_Object arg, Lisp_Object result) if (FONTP (arg)) { Lisp_Object tail, elt; - Lisp_Object equalstr = build_string ("="); + Lisp_Object equalstr = build_local_string ("="); val = Ffont_xlfd_name (arg, Qt); for (tail = AREF (arg, FONT_EXTRA_INDEX); CONSP (tail); @@ -5056,7 +5056,7 @@ font_add_log (const char *action, Lisp_Object arg, Lisp_Object result) val = Ffont_xlfd_name (result, Qt); if (! FONT_SPEC_P (result)) val = concat3 (SYMBOL_NAME (AREF (result, FONT_TYPE_INDEX)), - build_string (":"), val); + build_local_string (":"), val); result = val; } else if (CONSP (result)) diff --git a/src/fontset.c b/src/fontset.c index 8ff53a1d3a4..a36ae4aa5e3 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -1462,7 +1462,7 @@ appended. By default, FONT-SPEC overrides the previous settings. */) registry = AREF (font_spec, FONT_REGISTRY_INDEX); if (! NILP (registry)) registry = Fdowncase (SYMBOL_NAME (registry)); - encoding = find_font_encoding (concat3 (family, build_string ("-"), + encoding = find_font_encoding (concat3 (family, build_local_string ("-"), registry)); if (NILP (encoding)) encoding = Qascii; diff --git a/src/keyboard.c b/src/keyboard.c index c435ba74faa..a114aa27626 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -566,14 +566,14 @@ echo_add_key (Lisp_Object c) if (XINT (last_char) == '-' && XINT (prev_char) != ' ') Faset (echo_string, idx, make_number (' ')); else - echo_string = concat2 (echo_string, build_string (" ")); + echo_string = concat2 (echo_string, build_local_string (" ")); } else if (STRINGP (echo_string) && SCHARS (echo_string) > 0) - echo_string = concat2 (echo_string, build_string (" ")); + echo_string = concat2 (echo_string, build_local_string (" ")); kset_echo_string (current_kboard, - concat2 (echo_string, make_string (buffer, ptr - buffer))); + concat2 (echo_string, make_local_string (buffer, ptr - buffer))); SAFE_FREE (); } @@ -632,7 +632,7 @@ echo_dash (void) but make it go away when the next character is added. */ kset_echo_string (current_kboard, - concat2 (KVAR (current_kboard, echo_string), build_string ("-"))); + concat2 (KVAR (current_kboard, echo_string), build_local_string ("-"))); echo_now (); } @@ -7883,7 +7883,8 @@ parse_menu_item (Lisp_Object item, int inmenubar) /* The previous code preferred :key-sequence to :keys, so we preserve this behavior. */ if (STRINGP (keyeq) && !CONSP (keyhint)) - keyeq = concat2 (build_string (" "), Fsubstitute_command_keys (keyeq)); + keyeq = concat2 (build_local_string (" "), + Fsubstitute_command_keys (keyeq)); else { Lisp_Object prefix = keyeq; @@ -7926,8 +7927,7 @@ parse_menu_item (Lisp_Object item, int inmenubar) if (STRINGP (XCDR (prefix))) tem = concat2 (tem, XCDR (prefix)); } - keyeq = concat2 (build_string (" "), tem); - /* keyeq = concat3(build_string(" ("),tem,build_string(")")); */ + keyeq = concat2 (build_local_string (" "), tem); } else keyeq = Qnil; @@ -8632,9 +8632,9 @@ read_char_minibuf_menu_prompt (int commandflag, Lisp_Object selected = AREF (item_properties, ITEM_PROPERTY_SELECTED); if (EQ (tem, QCradio)) - tem = build_string (NILP (selected) ? "(*) " : "( ) "); + tem = build_local_string (NILP (selected) ? "(*) " : "( ) "); else - tem = build_string (NILP (selected) ? "[X] " : "[ ] "); + tem = build_local_string (NILP (selected) ? "[X] " : "[ ] "); s = concat2 (tem, s); } diff --git a/src/keymap.c b/src/keymap.c index f7256bfde2a..a1299ec8554 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -1342,7 +1342,7 @@ silly_event_symbol_error (Lisp_Object c) *p = 0; c = reorder_modifiers (c); - keystring = concat2 (build_string (new_mods), XCDR (assoc)); + keystring = concat2 (build_local_string (new_mods), XCDR (assoc)); error ("To bind the key %s, use [?%s], not [%s]", SDATA (SYMBOL_NAME (c)), SDATA (keystring), @@ -2245,7 +2245,7 @@ around function keys and event symbols. */) if (CONSP (key) && INTEGERP (XCAR (key)) && INTEGERP (XCDR (key))) /* An interval from a map-char-table. */ return concat3 (Fsingle_key_description (XCAR (key), no_angles), - build_string (".."), + build_local_string (".."), Fsingle_key_description (XCDR (key), no_angles)); key = EVENT_HEAD (key); @@ -3444,7 +3444,7 @@ describe_vector (Lisp_Object vector, Lisp_Object prefix, Lisp_Object args, { Lisp_Object tem; tem = Fkey_description (prefix, Qnil); - elt_prefix = concat2 (tem, build_string (" ")); + elt_prefix = concat2 (tem, build_local_string (" ")); } prefix = Qnil; } diff --git a/src/lisp.h b/src/lisp.h index ba3c812f5d8..1a6c69559ce 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -4605,6 +4605,20 @@ verify (sizeof (struct Lisp_Cons) == sizeof (union Aligned_Cons)); # define USE_LOCAL_ALLOCATORS +/* Return a function-scoped cons whose car is X and cdr is Y. */ + +# define local_cons(x, y) \ + ({ \ + struct Lisp_Cons *c = alloca (sizeof (struct Lisp_Cons)); \ + c->car = (x); \ + c->u.cdr = (y); \ + make_lisp_ptr (c, Lisp_Cons); \ + }) + +# define local_list1(x) local_cons (x, Qnil) +# define local_list2(x, y) local_cons (x, local_list1 (y)) +# define local_list3(x, y, z) local_cons (x, local_list2 (y, z)) + /* Return a function-scoped vector of length SIZE, with each element being INIT. */ @@ -4643,12 +4657,17 @@ verify (sizeof (struct Lisp_Cons) == sizeof (union Aligned_Cons)); /* Return a function-scoped string with contents DATA. */ -# define build_local_string(data) \ - ({ char const *data_ = data; make_local_string (data_, strlen (data_)); }) +# define build_local_string(data) \ + ({ char const *data1_ = (data); \ + make_local_string (data1_, strlen (data1_)); }) #else /* Safer but slower implementations. */ +# define local_cons(car, cdr) Fcons (car, cdr) +# define local_list1(x) list1 (x) +# define local_list2(x, y) list2 (x, y) +# define local_list3(x, y, z) list3 (x, y, z) # define make_local_vector(size, init) Fmake_vector (make_number (size), init) # define make_local_string(data, nbytes) make_string (data, nbytes) # define build_local_string(data) build_string (data) diff --git a/src/lread.c b/src/lread.c index f32b60ad588..fabd2010035 100644 --- a/src/lread.c +++ b/src/lread.c @@ -2894,7 +2894,7 @@ read1 (Lisp_Object readcharfun, int *pch, bool first_in_list) Lisp_Object placeholder; Lisp_Object cell; - placeholder = Fcons (Qnil, Qnil); + placeholder = scoped_cons (Qnil, Qnil); cell = Fcons (make_number (n), placeholder); read_objects = Fcons (cell, read_objects); @@ -3374,7 +3374,7 @@ substitute_object_recurse (Lisp_Object object, Lisp_Object placeholder, Lisp_Obj substitute_in_interval contains part of the logic. */ INTERVAL root_interval = string_intervals (subtree); - Lisp_Object arg = Fcons (object, placeholder); + Lisp_Object arg = scoped_cons (object, placeholder); traverse_intervals_noorder (root_interval, &substitute_in_interval, arg); @@ -3681,8 +3681,8 @@ read_list (bool flag, Lisp_Object readcharfun) in the installed Lisp directory. We don't use Fexpand_file_name because that would make the directory absolute now. */ - elt = concat2 (build_string ("../lisp/"), - Ffile_name_nondirectory (elt)); + elt = concat2 (build_local_string ("../lisp/"), + Ffile_name_nondirectory (elt)); } else if (EQ (elt, Vload_file_name) && ! NILP (elt) diff --git a/src/menu.c b/src/menu.c index 8c624f758a9..ea8da7a9d62 100644 --- a/src/menu.c +++ b/src/menu.c @@ -390,7 +390,7 @@ single_menu_item (Lisp_Object key, Lisp_Object item, Lisp_Object dummy, void *sk if (!submenu && SREF (tem, 0) != '\0' && SREF (tem, 0) != '-') ASET (menu_items, idx + MENU_ITEMS_ITEM_NAME, - concat2 (build_string (" "), tem)); + concat2 (build_local_string (" "), tem)); idx += MENU_ITEMS_ITEM_LENGTH; } } @@ -399,14 +399,14 @@ single_menu_item (Lisp_Object key, Lisp_Object item, Lisp_Object dummy, void *sk /* Calculate prefix, if any, for this item. */ if (EQ (type, QCtoggle)) - prefix = build_string (NILP (selected) ? "[ ] " : "[X] "); + prefix = build_local_string (NILP (selected) ? "[ ] " : "[X] "); else if (EQ (type, QCradio)) - prefix = build_string (NILP (selected) ? "( ) " : "(*) "); + prefix = build_local_string (NILP (selected) ? "( ) " : "(*) "); } /* Not a button. If we have earlier buttons, then we need a prefix. */ else if (!skp->notbuttons && SREF (item_string, 0) != '\0' && SREF (item_string, 0) != '-') - prefix = build_string (" "); + prefix = build_local_string (" "); if (!NILP (prefix)) item_string = concat2 (prefix, item_string); @@ -416,7 +416,7 @@ single_menu_item (Lisp_Object key, Lisp_Object item, Lisp_Object dummy, void *sk || FRAME_MSDOS_P (XFRAME (Vmenu_updating_frame))) && !NILP (map)) /* Indicate visually that this is a submenu. */ - item_string = concat2 (item_string, build_string (" >")); + item_string = concat2 (item_string, build_local_string (" >")); push_menu_item (item_string, enabled, key, AREF (item_properties, ITEM_PROPERTY_DEF), diff --git a/src/minibuf.c b/src/minibuf.c index 93e19d5c120..b5e7e4cd76e 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -1123,7 +1123,7 @@ If `read-buffer-function' is non-nil, this works by calling it as a function, instead of the usual behavior. */) (Lisp_Object prompt, Lisp_Object def, Lisp_Object require_match) { - Lisp_Object args[4], result; + Lisp_Object result; char *s; ptrdiff_t len; ptrdiff_t count = SPECPDL_INDEX (); @@ -1157,10 +1157,9 @@ function, instead of the usual behavior. */) STRING_MULTIBYTE (prompt)); } - args[0] = build_string ("%s (default %s): "); - args[1] = prompt; - args[2] = CONSP (def) ? XCAR (def) : def; - prompt = Fformat (3, args); + prompt = Fformat (3, ((Lisp_Object []) + { build_local_string ("%s (default %s): "), + prompt, CONSP (def) ? XCAR (def) : def })); } result = Fcompleting_read (prompt, intern ("internal-complete-buffer"), @@ -1168,13 +1167,8 @@ function, instead of the usual behavior. */) Qbuffer_name_history, def, Qnil); } else - { - args[0] = Vread_buffer_function; - args[1] = prompt; - args[2] = def; - args[3] = require_match; - result = Ffuncall (4, args); - } + result = Ffuncall (4, ((Lisp_Object []) + { Vread_buffer_function, prompt, def, require_match })); return unbind_to (count, result); } diff --git a/src/process.c b/src/process.c index ef9f295fd89..41ca66671a9 100644 --- a/src/process.c +++ b/src/process.c @@ -620,7 +620,7 @@ status_message (struct Lisp_Process *p) if (c1 != c2) Faset (string, make_number (0), make_number (c2)); } - string2 = build_string (coredump ? " (core dumped)\n" : "\n"); + string2 = build_local_string (coredump ? " (core dumped)\n" : "\n"); return concat2 (string, string2); } else if (EQ (symbol, Qexit)) @@ -630,14 +630,14 @@ status_message (struct Lisp_Process *p) if (code == 0) return build_string ("finished\n"); string = Fnumber_to_string (make_number (code)); - string2 = build_string (coredump ? " (core dumped)\n" : "\n"); - return concat3 (build_string ("exited abnormally with code "), + string2 = build_local_string (coredump ? " (core dumped)\n" : "\n"); + return concat3 (build_local_string ("exited abnormally with code "), string, string2); } else if (EQ (symbol, Qfailed)) { string = Fnumber_to_string (make_number (code)); - string2 = build_string ("\n"); + string2 = build_local_string ("\n"); return concat3 (build_string ("failed with code "), string, string2); } @@ -1305,22 +1305,22 @@ Returns nil if format of ADDRESS is invalid. */) if (size == 4 || (size == 5 && !NILP (omit_port))) { - args[0] = build_string ("%d.%d.%d.%d"); + args[0] = build_local_string ("%d.%d.%d.%d"); nargs = 4; } else if (size == 5) { - args[0] = build_string ("%d.%d.%d.%d:%d"); + args[0] = build_local_string ("%d.%d.%d.%d:%d"); nargs = 5; } else if (size == 8 || (size == 9 && !NILP (omit_port))) { - args[0] = build_string ("%x:%x:%x:%x:%x:%x:%x:%x"); + args[0] = build_local_string ("%x:%x:%x:%x:%x:%x:%x:%x"); nargs = 8; } else if (size == 9) { - args[0] = build_string ("[%x:%x:%x:%x:%x:%x:%x:%x]:%d"); + args[0] = build_local_string ("[%x:%x:%x:%x:%x:%x:%x:%x]:%d"); nargs = 9; } else @@ -1339,16 +1339,12 @@ Returns nil if format of ADDRESS is invalid. */) args[i+1] = p->contents[i]; } - return Fformat (nargs+1, args); + return Fformat (nargs + 1, args); } if (CONSP (address)) - { - Lisp_Object args[2]; - args[0] = build_string ("<Family %d>"); - args[1] = Fcar (address); - return Fformat (2, args); - } + return Fformat (2, ((Lisp_Object []) + { build_local_string ("<Family %d>"), Fcar (address) })); return Qnil; } @@ -4061,20 +4057,14 @@ server_accept_connection (Lisp_Object server, int channel) { case AF_INET: { - Lisp_Object args[5]; unsigned char *ip = (unsigned char *)&saddr.in.sin_addr.s_addr; - args[0] = build_string ("%d.%d.%d.%d"); - args[1] = make_number (*ip++); - args[2] = make_number (*ip++); - args[3] = make_number (*ip++); - args[4] = make_number (*ip++); - host = Fformat (5, args); - service = make_number (ntohs (saddr.in.sin_port)); - args[0] = build_string (" <%s:%d>"); - args[1] = host; - args[2] = service; - caller = Fformat (3, args); + host = Fformat (5, ((Lisp_Object []) + { build_local_string ("%d.%d.%d.%d"), make_number (*ip++), + make_number (*ip++), make_number (*ip++), make_number (*ip++) })); + service = make_number (ntohs (saddr.in.sin_port)); + caller = Fformat (3, ((Lisp_Object []) + { build_local_string (" <%s:%d>"), host, service })); } break; @@ -4084,16 +4074,14 @@ server_accept_connection (Lisp_Object server, int channel) Lisp_Object args[9]; uint16_t *ip6 = (uint16_t *)&saddr.in6.sin6_addr; int i; - args[0] = build_string ("%x:%x:%x:%x:%x:%x:%x:%x"); + + args[0] = build_local_string ("%x:%x:%x:%x:%x:%x:%x:%x"); for (i = 0; i < 8; i++) - args[i+1] = make_number (ntohs (ip6[i])); + args[i + 1] = make_number (ntohs (ip6[i])); host = Fformat (9, args); service = make_number (ntohs (saddr.in.sin_port)); - - args[0] = build_string (" <[%s]:%d>"); - args[1] = host; - args[2] = service; - caller = Fformat (3, args); + caller = Fformat (3, ((Lisp_Object []) + { build_local_string (" <[%s]:%d>"), host, service })); } break; #endif @@ -4103,7 +4091,8 @@ server_accept_connection (Lisp_Object server, int channel) #endif default: caller = Fnumber_to_string (make_number (connect_counter)); - caller = concat3 (build_string (" <"), caller, build_string (">")); + caller = concat3 + (build_local_string (" <"), caller, build_local_string (">")); break; } @@ -4202,14 +4191,14 @@ server_accept_connection (Lisp_Object server, int channel) if (!NILP (ps->log)) call3 (ps->log, server, proc, - concat3 (build_string ("accept from "), - (STRINGP (host) ? host : build_string ("-")), - build_string ("\n"))); + concat3 (build_local_string ("accept from "), + (STRINGP (host) ? host : build_local_string ("-")), + build_local_string ("\n"))); exec_sentinel (proc, - concat3 (build_string ("open from "), - (STRINGP (host) ? host : build_string ("-")), - build_string ("\n"))); + concat3 (build_local_string ("open from "), + (STRINGP (host) ? host : build_local_string ("-")), + build_local_string ("\n"))); } /* This variable is different from waiting_for_input in keyboard.c. diff --git a/src/textprop.c b/src/textprop.c index 2eea2d20839..b75b19b25cc 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -1317,9 +1317,10 @@ specify the property to add. If the optional fifth argument OBJECT is a buffer (or nil, which means the current buffer), START and END are buffer positions (integers or markers). If OBJECT is a string, START and END are 0-based indices into it. */) - (Lisp_Object start, Lisp_Object end, Lisp_Object property, Lisp_Object value, Lisp_Object object) + (Lisp_Object start, Lisp_Object end, Lisp_Object property, + Lisp_Object value, Lisp_Object object) { - Fadd_text_properties (start, end, list2 (property, value), object); + Fadd_text_properties (start, end, scoped_list2 (property, value), object); return Qnil; } @@ -1360,7 +1361,7 @@ into it. */) (Lisp_Object start, Lisp_Object end, Lisp_Object face, Lisp_Object append, Lisp_Object object) { - add_text_properties_1 (start, end, list2 (Qface, face), object, + add_text_properties_1 (start, end, scoped_list2 (Qface, face), object, (NILP (append) ? TEXT_PROPERTY_PREPEND : TEXT_PROPERTY_APPEND)); @@ -1909,7 +1910,8 @@ text_property_stickiness (Lisp_Object prop, Lisp_Object pos, Lisp_Object buffer) /* Note this can GC when DEST is a buffer. */ Lisp_Object -copy_text_properties (Lisp_Object start, Lisp_Object end, Lisp_Object src, Lisp_Object pos, Lisp_Object dest, Lisp_Object prop) +copy_text_properties (Lisp_Object start, Lisp_Object end, Lisp_Object src, + Lisp_Object pos, Lisp_Object dest, Lisp_Object prop) { INTERVAL i; Lisp_Object res; @@ -1962,12 +1964,11 @@ copy_text_properties (Lisp_Object start, Lisp_Object end, Lisp_Object src, Lisp_ plist = Fcdr (Fcdr (plist)); } if (! NILP (plist)) - { - /* Must defer modifications to the interval tree in case src - and dest refer to the same string or buffer. */ - stuff = Fcons (list3 (make_number (p), make_number (p + len), plist), - stuff); - } + /* Must defer modifications to the interval tree in case + src and dest refer to the same string or buffer. */ + stuff = local_cons + (local_list3 (make_number (p), make_number (p + len), plist), + stuff); i = next_interval (i); if (!i) |