From 3b59b8fa9706f8e6b0d3cf194bcf9b310bf11ac0 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 6 Mar 2025 15:36:12 +0200 Subject: [PATCH] Fix etags tests due to Copyright years update * test/manual/etags/CTAGS.good * test/manual/etags/CTAGS.good_crlf * test/manual/etags/CTAGS.good_update * test/manual/etags/ETAGS.good_1 * test/manual/etags/ETAGS.good_2 * test/manual/etags/ETAGS.good_3 * test/manual/etags/ETAGS.good_4 * test/manual/etags/ETAGS.good_5 * test/manual/etags/ETAGS.good_6 * test/manual/etags/ETAGS.good_7: Update. (Bug#76744) --- test/manual/etags/CTAGS.good | 156 +++++++------- test/manual/etags/CTAGS.good_crlf | 114 ++++------ test/manual/etags/CTAGS.good_update | 104 ++++----- test/manual/etags/ETAGS.good_1 | 266 +++++++++++------------ test/manual/etags/ETAGS.good_2 | 312 +++++++++++++-------------- test/manual/etags/ETAGS.good_3 | 276 ++++++++++++------------ test/manual/etags/ETAGS.good_4 | 266 +++++++++++------------ test/manual/etags/ETAGS.good_5 | 322 ++++++++++++++-------------- test/manual/etags/ETAGS.good_6 | 322 ++++++++++++++-------------- test/manual/etags/ETAGS.good_7 | 266 +++++++++++------------ 10 files changed, 1165 insertions(+), 1239 deletions(-) diff --git a/test/manual/etags/CTAGS.good b/test/manual/etags/CTAGS.good index 66c33616f98..c7ce42fbd8c 100644 --- a/test/manual/etags/CTAGS.good +++ b/test/manual/etags/CTAGS.good @@ -613,7 +613,7 @@ FOR_EACH_ALIST_VALUE c-src/emacs/src/lisp.h /^#define FOR_EACH_ALIST_VALUE(head_ FOR_EACH_TAIL c-src/emacs/src/lisp.h /^#define FOR_EACH_TAIL(hare, list, tortoise, n) \\$/ FRAMEP c-src/emacs/src/lisp.h /^FRAMEP (Lisp_Object a)$/ FRC make-src/Makefile /^FRC:;$/ -FREEFLOOD c-src/emacs/src/gmalloc.c 1858 +FREEFLOOD c-src/emacs/src/gmalloc.c 1863 FSRC make-src/Makefile /^FSRC=entry.for entry.strange_suffix entry.strange$/ FUN0 y-src/parse.y /^yylex FUN0()$/ FUN1 y-src/parse.y /^yyerror FUN1(char *, s)$/ @@ -965,12 +965,12 @@ Lua_functions c-src/etags.c /^Lua_functions (FILE *inf)$/ Lua_help c-src/etags.c 600 Lua_suffixes c-src/etags.c 598 MAGENTA cp-src/screen.hpp 17 -MAGICBYTE c-src/emacs/src/gmalloc.c 1856 -MAGICFREE c-src/emacs/src/gmalloc.c 1855 -MAGICWORD c-src/emacs/src/gmalloc.c 1854 +MAGICBYTE c-src/emacs/src/gmalloc.c 1861 +MAGICFREE c-src/emacs/src/gmalloc.c 1860 +MAGICWORD c-src/emacs/src/gmalloc.c 1859 MAKE make-src/Makefile /^MAKE:=$(MAKE) --no-print-directory$/ MAKESRC make-src/Makefile /^MAKESRC=Makefile$/ -MALLOCFLOOD c-src/emacs/src/gmalloc.c 1857 +MALLOCFLOOD c-src/emacs/src/gmalloc.c 1862 MANY c-src/emacs/src/lisp.h 2833 MARKERP c-src/emacs/src/lisp.h /^# define MARKERP(x) lisp_h_MARKERP (x)$/ MAXPATHLEN c-src/etags.c 115 @@ -1648,9 +1648,9 @@ Y c-src/h.h 100 YACC c-src/etags.c 2199 YELLOW cp-src/screen.hpp 26 YSRC make-src/Makefile /^YSRC=parse.y parse.c atest.y cccp.c cccp.y$/ -YYABORT /usr/share/bison/bison.simple 153 YYABORT /usr/share/bison/bison.simple 154 -YYACCEPT /usr/share/bison/bison.simple 152 +YYABORT /usr/share/bison/bison.simple 154 +YYACCEPT /usr/share/bison/bison.simple 153 YYACCEPT /usr/share/bison/bison.simple 153 YYBACKUP /usr/share/bison/bison.simple /^#define YYBACKUP(Token, Value) \\$/ YYBACKUP /usr/share/bison/bison.simple /^#define YYBACKUP(Token, Value) \\$/ @@ -1660,25 +1660,25 @@ YYDPRINTF /usr/share/bison/bison.simple /^# define YYDPRINTF(Args) \\$/ YYDPRINTF /usr/share/bison/bison.simple /^# define YYDPRINTF(Args)$/ YYDPRINTF /usr/share/bison/bison.simple /^# define YYDPRINTF(Args) \\$/ YYDPRINTF /usr/share/bison/bison.simple /^# define YYDPRINTF(Args)$/ -YYEMPTY /usr/share/bison/bison.simple 150 YYEMPTY /usr/share/bison/bison.simple 151 -YYEOF /usr/share/bison/bison.simple 151 +YYEMPTY /usr/share/bison/bison.simple 151 +YYEOF /usr/share/bison/bison.simple 152 YYEOF /usr/share/bison/bison.simple 152 -YYERRCODE /usr/share/bison/bison.simple 178 YYERRCODE /usr/share/bison/bison.simple 179 -YYERROR /usr/share/bison/bison.simple 154 +YYERRCODE /usr/share/bison/bison.simple 179 +YYERROR /usr/share/bison/bison.simple 155 YYERROR /usr/share/bison/bison.simple 155 -YYFAIL /usr/share/bison/bison.simple 158 YYFAIL /usr/share/bison/bison.simple 159 -YYFPRINTF /usr/share/bison/bison.simple 225 +YYFAIL /usr/share/bison/bison.simple 159 +YYFPRINTF /usr/share/bison/bison.simple 226 YYFPRINTF /usr/share/bison/bison.simple 226 -YYINITDEPTH /usr/share/bison/bison.simple 244 YYINITDEPTH /usr/share/bison/bison.simple 245 -YYLEX /usr/share/bison/bison.simple 200 -YYLEX /usr/share/bison/bison.simple 202 -YYLEX /usr/share/bison/bison.simple 206 -YYLEX /usr/share/bison/bison.simple 208 -YYLEX /usr/share/bison/bison.simple 212 +YYINITDEPTH /usr/share/bison/bison.simple 245 +YYLEX /usr/share/bison/bison.simple 201 +YYLEX /usr/share/bison/bison.simple 203 +YYLEX /usr/share/bison/bison.simple 207 +YYLEX /usr/share/bison/bison.simple 209 +YYLEX /usr/share/bison/bison.simple 213 YYLEX /usr/share/bison/bison.simple 201 YYLEX /usr/share/bison/bison.simple 203 YYLEX /usr/share/bison/bison.simple 207 @@ -1686,8 +1686,8 @@ YYLEX /usr/share/bison/bison.simple 209 YYLEX /usr/share/bison/bison.simple 213 YYLLOC_DEFAULT /usr/share/bison/bison.simple /^# define YYLLOC_DEFAULT(Current, Rhs, N) \\$/ YYLLOC_DEFAULT /usr/share/bison/bison.simple /^# define YYLLOC_DEFAULT(Current, Rhs, N) \\$/ -YYMAXDEPTH /usr/share/bison/bison.simple 255 -YYMAXDEPTH /usr/share/bison/bison.simple 259 +YYMAXDEPTH /usr/share/bison/bison.simple 256 +YYMAXDEPTH /usr/share/bison/bison.simple 260 YYMAXDEPTH /usr/share/bison/bison.simple 256 YYMAXDEPTH /usr/share/bison/bison.simple 260 YYPARSE_PARAM_ARG /usr/share/bison/bison.simple 351 @@ -1708,15 +1708,6 @@ YYPOPSTACK /usr/share/bison/bison.simple 445 YYPOPSTACK /usr/share/bison/bison.simple 447 YYRECOVERING /usr/share/bison/bison.simple /^#define YYRECOVERING() (!!yyerrstatus)$/ YYRECOVERING /usr/share/bison/bison.simple /^#define YYRECOVERING() (!!yyerrstatus)$/ -YYSIZE_T /usr/share/bison/bison.simple 51 -YYSIZE_T /usr/share/bison/bison.simple 56 -YYSIZE_T /usr/share/bison/bison.simple 71 -YYSIZE_T /usr/share/bison/bison.simple 75 -YYSIZE_T /usr/share/bison/bison.simple 128 -YYSIZE_T /usr/share/bison/bison.simple 131 -YYSIZE_T /usr/share/bison/bison.simple 136 -YYSIZE_T /usr/share/bison/bison.simple 140 -YYSIZE_T /usr/share/bison/bison.simple 145 YYSIZE_T /usr/share/bison/bison.simple 52 YYSIZE_T /usr/share/bison/bison.simple 57 YYSIZE_T /usr/share/bison/bison.simple 72 @@ -1726,10 +1717,19 @@ YYSIZE_T /usr/share/bison/bison.simple 132 YYSIZE_T /usr/share/bison/bison.simple 137 YYSIZE_T /usr/share/bison/bison.simple 141 YYSIZE_T /usr/share/bison/bison.simple 146 -YYSTACK_ALLOC /usr/share/bison/bison.simple 50 -YYSTACK_ALLOC /usr/share/bison/bison.simple 55 -YYSTACK_ALLOC /usr/share/bison/bison.simple 59 -YYSTACK_ALLOC /usr/share/bison/bison.simple 78 +YYSIZE_T /usr/share/bison/bison.simple 52 +YYSIZE_T /usr/share/bison/bison.simple 57 +YYSIZE_T /usr/share/bison/bison.simple 72 +YYSIZE_T /usr/share/bison/bison.simple 76 +YYSIZE_T /usr/share/bison/bison.simple 129 +YYSIZE_T /usr/share/bison/bison.simple 132 +YYSIZE_T /usr/share/bison/bison.simple 137 +YYSIZE_T /usr/share/bison/bison.simple 141 +YYSIZE_T /usr/share/bison/bison.simple 146 +YYSTACK_ALLOC /usr/share/bison/bison.simple 51 +YYSTACK_ALLOC /usr/share/bison/bison.simple 56 +YYSTACK_ALLOC /usr/share/bison/bison.simple 60 +YYSTACK_ALLOC /usr/share/bison/bison.simple 79 YYSTACK_ALLOC /usr/share/bison/bison.simple 51 YYSTACK_ALLOC /usr/share/bison/bison.simple 56 YYSTACK_ALLOC /usr/share/bison/bison.simple 60 @@ -1739,10 +1739,10 @@ YYSTACK_BYTES /usr/share/bison/bison.simple /^# define YYSTACK_BYTES(N) \\$/ YYSTACK_BYTES /usr/share/bison/bison.simple /^# define YYSTACK_BYTES(N) \\$/ YYSTACK_BYTES /usr/share/bison/bison.simple /^# define YYSTACK_BYTES(N) \\$/ YYSTACK_FREE /usr/share/bison/bison.simple /^# define YYSTACK_FREE(Ptr) do { \/* empty *\/; } wh/ -YYSTACK_FREE /usr/share/bison/bison.simple 79 +YYSTACK_FREE /usr/share/bison/bison.simple 80 YYSTACK_FREE /usr/share/bison/bison.simple /^# define YYSTACK_FREE(Ptr) do { \/* empty *\/; } wh/ YYSTACK_FREE /usr/share/bison/bison.simple 80 -YYSTACK_GAP_MAX /usr/share/bison/bison.simple 93 +YYSTACK_GAP_MAX /usr/share/bison/bison.simple 94 YYSTACK_GAP_MAX /usr/share/bison/bison.simple 94 YYSTACK_RELOCATE /usr/share/bison/bison.simple /^# define YYSTACK_RELOCATE(Type, Stack) \\$/ YYSTACK_RELOCATE /usr/share/bison/bison.simple 548 @@ -1754,7 +1754,7 @@ YYSTD /usr/share/bison/bison.simple /^# define YYSTD(x) std::x$/ YYSTD /usr/share/bison/bison.simple /^# define YYSTD(x) x$/ YYSTYPE y-src/parse.y 72 YYSTYPE y-src/parse.y 73 -YYTERROR /usr/share/bison/bison.simple 177 +YYTERROR /usr/share/bison/bison.simple 178 YYTERROR /usr/share/bison/bison.simple 178 YY_DECL_NON_LSP_VARIABLES /usr/share/bison/bison.simple 374 YY_DECL_NON_LSP_VARIABLES /usr/share/bison/bison.simple 374 @@ -1906,37 +1906,37 @@ __init__ pyt-src/server.py /^ def __init__(self, master=None):$/ __ip c.c 159 __libc_atexit c-src/exit.c 30 __libc_atexit c-src/exit.strange_suffix 30 -__malloc_extra_blocks c-src/emacs/src/gmalloc.c 381 +__malloc_extra_blocks c-src/emacs/src/gmalloc.c 382 __malloc_initialize c-src/emacs/src/gmalloc.c /^__malloc_initialize (void)$/ -__malloc_initialized c-src/emacs/src/gmalloc.c 379 +__malloc_initialized c-src/emacs/src/gmalloc.c 380 __repr__ pyt-src/server.py /^ def __repr__(self):$/ __repr__ pyt-src/server.py /^ def __repr__(self):$/ __repr__ pyt-src/server.py /^ def __repr__(self):$/ -__sbrk c-src/emacs/src/gmalloc.c 1513 +__sbrk c-src/emacs/src/gmalloc.c 1516 __str__ pyt-src/server.py /^ def __str__(self):$/ __str__ pyt-src/server.py /^ def __str__(self):$/ __str__ pyt-src/server.py /^ def __str__(self):$/ __up c.c 160 -_aligned_blocks c-src/emacs/src/gmalloc.c 1004 -_aligned_blocks_mutex c-src/emacs/src/gmalloc.c 518 +_aligned_blocks c-src/emacs/src/gmalloc.c 1006 +_aligned_blocks_mutex c-src/emacs/src/gmalloc.c 519 _bar? ruby-src/test1.ru /^ def self._bar?(abc)$/ -_bytes_free c-src/emacs/src/gmalloc.c 376 -_bytes_used c-src/emacs/src/gmalloc.c 374 -_chunks_free c-src/emacs/src/gmalloc.c 375 -_chunks_used c-src/emacs/src/gmalloc.c 373 -_fraghead c-src/emacs/src/gmalloc.c 370 +_bytes_free c-src/emacs/src/gmalloc.c 377 +_bytes_used c-src/emacs/src/gmalloc.c 375 +_chunks_free c-src/emacs/src/gmalloc.c 376 +_chunks_used c-src/emacs/src/gmalloc.c 374 +_fraghead c-src/emacs/src/gmalloc.c 371 _free c-src/emacs/src/gmalloc.c /^_free (void *ptr)$/ _free_internal c-src/emacs/src/gmalloc.c /^_free_internal (void *ptr)$/ _free_internal_nolock c-src/emacs/src/gmalloc.c /^_free_internal_nolock (void *ptr)$/ -_heapbase c-src/emacs/src/gmalloc.c 355 -_heapindex c-src/emacs/src/gmalloc.c 364 -_heapinfo c-src/emacs/src/gmalloc.c 358 -_heaplimit c-src/emacs/src/gmalloc.c 367 +_heapbase c-src/emacs/src/gmalloc.c 356 +_heapindex c-src/emacs/src/gmalloc.c 365 +_heapinfo c-src/emacs/src/gmalloc.c 359 +_heaplimit c-src/emacs/src/gmalloc.c 368 _malloc c-src/emacs/src/gmalloc.c /^_malloc (size_t size)$/ _malloc_internal c-src/emacs/src/gmalloc.c /^_malloc_internal (size_t size)$/ _malloc_internal_nolock c-src/emacs/src/gmalloc.c /^_malloc_internal_nolock (size_t size)$/ -_malloc_mutex c-src/emacs/src/gmalloc.c 517 -_malloc_thread_enabled_p c-src/emacs/src/gmalloc.c 519 +_malloc_mutex c-src/emacs/src/gmalloc.c 518 +_malloc_thread_enabled_p c-src/emacs/src/gmalloc.c 520 _realloc c-src/emacs/src/gmalloc.c /^_realloc (void *ptr, size_t size)$/ _realloc_internal c-src/emacs/src/gmalloc.c /^_realloc_internal (void *ptr, size_t size)$/ _realloc_internal_nolock c-src/emacs/src/gmalloc.c /^_realloc_internal_nolock (void *ptr, size_t size)$/ @@ -2050,7 +2050,7 @@ alignas c-src/emacs/src/lisp.h /^# define alignas(alignment) \/* empty *\/$/ aligned c-src/emacs/src/gmalloc.c 199 aligned_alloc c-src/emacs/src/gmalloc.c 71 aligned_alloc c-src/emacs/src/gmalloc.c /^aligned_alloc (size_t alignment, size_t size)$/ -aligned_alloc c-src/emacs/src/gmalloc.c 1718 +aligned_alloc c-src/emacs/src/gmalloc.c 1722 alignlist c-src/emacs/src/gmalloc.c 196 alive cp-src/conway.hpp 7 all_kboards c-src/emacs/src/keyboard.c 86 @@ -2275,7 +2275,7 @@ calculate_goal_info merc-src/accumulator.m /^:- pred calculate_goal_info(hlds_go calloc c-src/emacs/src/gmalloc.c 66 calloc c-src/emacs/src/gmalloc.c 70 calloc c-src/emacs/src/gmalloc.c /^calloc (size_t nmemb, size_t size)$/ -calloc c-src/emacs/src/gmalloc.c 1717 +calloc c-src/emacs/src/gmalloc.c 1721 can_be_null c-src/emacs/src/regex.h 370 cancel_echoing c-src/emacs/src/keyboard.c /^cancel_echoing (void)$/ canonicalize_filename c-src/etags.c /^canonicalize_filename (register char *fn)$/ @@ -2915,7 +2915,7 @@ free c-src/emacs/src/gmalloc.c 67 free c-src/emacs/src/gmalloc.c 72 free c-src/emacs/src/gmalloc.c 166 free c-src/emacs/src/gmalloc.c /^free (void *ptr)$/ -free c-src/emacs/src/gmalloc.c 1719 +free c-src/emacs/src/gmalloc.c 1723 free_fdesc c-src/etags.c /^free_fdesc (register fdesc *fdp)$/ free_for prol-src/natded.prolog /^free_for(var(_),_,_).$/ free_regexps c-src/etags.c /^free_regexps (void)$/ @@ -3025,7 +3025,7 @@ hash_table_test c-src/emacs/src/lisp.h 1805 hashfn c-src/emacs/src/lisp.h /^ EMACS_UINT (*hashfn) (struct hash_table_test *t,/ hat tex-src/texinfo.tex /^\\def\\hat{\\realbackslash hat}%$/ hat tex-src/texinfo.tex /^\\def\\hat{\\realbackslash hat}$/ -hdr c-src/emacs/src/gmalloc.c 1860 +hdr c-src/emacs/src/gmalloc.c 1865 head_table c-src/emacs/src/keyboard.c 11027 header c-src/emacs/src/lisp.h 1371 header c-src/emacs/src/lisp.h 1388 @@ -3036,7 +3036,7 @@ header c-src/emacs/src/lisp.h 1826 header_size c-src/emacs/src/lisp.h 1471 heading tex-src/texinfo.tex /^\\def\\heading{\\parsearg\\secheadingi}$/ headings tex-src/texinfo.tex /^\\def\\headings #1 {\\csname HEADINGS#1\\endcsname}$/ -heapsize c-src/emacs/src/gmalloc.c 361 +heapsize c-src/emacs/src/gmalloc.c 362 hello scm-src/test.scm /^(define hello "Hello, Emacs!")$/ hello scm-src/test.scm /^(set! hello "Hello, world!")$/ hello-world scm-src/test.scm /^(define (hello-world)$/ @@ -3311,13 +3311,13 @@ language c-src/etags.c 199 last-tag el-src/emacs/lisp/progmodes/etags.el /^(defvar last-tag nil$/ last_abbrev_point c-src/abbrev.c 79 last_auto_save c-src/emacs/src/keyboard.c 214 -last_heapinfo c-src/emacs/src/gmalloc.c 402 +last_heapinfo c-src/emacs/src/gmalloc.c 403 last_mouse_button c-src/emacs/src/keyboard.c 5215 last_mouse_x c-src/emacs/src/keyboard.c 5216 last_mouse_y c-src/emacs/src/keyboard.c 5217 last_non_minibuf_size c-src/emacs/src/keyboard.c 207 last_point_position c-src/emacs/src/keyboard.c 217 -last_state_size c-src/emacs/src/gmalloc.c 401 +last_state_size c-src/emacs/src/gmalloc.c 402 last_undo_boundary c-src/emacs/src/keyboard.c 1287 lasta c.c 272 lastargmargin tex-src/texinfo.tex /^\\newskip\\deflastargmargin \\deflastargmargin=18pt$/ @@ -3462,7 +3462,7 @@ mach_task_self c-src/machsyscalls.h /^SYSCALL (mach_task_self, -28,$/ mach_thread_self c-src/machsyscalls.h /^SYSCALL (mach_thread_self, -27,$/ macheader tex-src/texinfo.tex /^\\def\\defmac{\\defparsebody\\Edefmac\\defmacx\\defmache/ macx\defmacheader tex-src/texinfo.tex /^\\def\\defmac{\\defparsebody\\Edefmac\\defmacx\\defmache/ -magic c-src/emacs/src/gmalloc.c 1863 +magic c-src/emacs/src/gmalloc.c 1868 mainmagstep tex-src/texinfo.tex /^\\let\\mainmagstep=\\magstephalf$/ mainmagstep tex-src/texinfo.tex /^\\let\\mainmagstep=\\magstep1$/ maintaining.info make-src/Makefile /^maintaining.info: maintaining.texi$/ @@ -3492,7 +3492,7 @@ malloc c-src/emacs/src/gmalloc.c 64 malloc c-src/emacs/src/gmalloc.c 68 malloc c-src/emacs/src/gmalloc.c /^extern void *malloc (size_t size) ATTRIBUTE_MALLOC/ malloc c-src/emacs/src/gmalloc.c /^malloc (size_t size)$/ -malloc c-src/emacs/src/gmalloc.c 1715 +malloc c-src/emacs/src/gmalloc.c 1719 malloc_atfork_handler_child c-src/emacs/src/gmalloc.c /^malloc_atfork_handler_child (void)$/ malloc_atfork_handler_parent c-src/emacs/src/gmalloc.c /^malloc_atfork_handler_parent (void)$/ malloc_atfork_handler_prepare c-src/emacs/src/gmalloc.c /^malloc_atfork_handler_prepare (void)$/ @@ -3523,7 +3523,7 @@ maybe_gc c-src/emacs/src/lisp.h /^maybe_gc (void)$/ mcCSC cp-src/c.C 6 mcheck c-src/emacs/src/gmalloc.c /^mcheck (void (*func) (enum mcheck_status))$/ mcheck_status c-src/emacs/src/gmalloc.c 283 -mcheck_used c-src/emacs/src/gmalloc.c 2012 +mcheck_used c-src/emacs/src/gmalloc.c 2017 mdbcomp merc-src/accumulator.m /^:- import_module mdbcomp.$/ me22b lua-src/test.lua /^ local function test.me22b (one)$/ me_22a lua-src/test.lua /^ function test.me_22a(one, two)$/ @@ -3563,7 +3563,7 @@ module_instance_method ruby-src/test.rb /^ def module_instance_method$/ more= ruby-src/test1.ru /^ :more$/ more_aligned_int c.c 165 morecore_nolock c-src/emacs/src/gmalloc.c /^morecore_nolock (size_t size)$/ -morecore_recursing c-src/emacs/src/gmalloc.c 604 +morecore_recursing c-src/emacs/src/gmalloc.c 605 mouse_syms c-src/emacs/src/keyboard.c 4627 move cp-src/clheir.cpp /^void agent::move(int direction)$/ mprobe c-src/emacs/src/gmalloc.c /^mprobe (void *ptr)$/ @@ -3887,7 +3887,7 @@ pagealignmacro tex-src/texinfo.tex /^\\global\\let\\pagealignmacro=\\chappager$/ pagealignmacro tex-src/texinfo.tex /^\\global\\let\\pagealignmacro=\\chapoddpage$/ pagebody tex-src/texinfo.tex /^\\def\\pagebody#1{\\vbox to\\pageheight{\\boxmaxdepth=\\/ pagecontents tex-src/texinfo.tex /^\\gdef\\pagecontents#1{\\ifvoid\\topins\\else\\unvbox\\to/ -pagesize c-src/emacs/src/gmalloc.c 1703 +pagesize c-src/emacs/src/gmalloc.c 1707 pagesofar tex-src/texinfo.tex /^\\def\\pagesofar{\\unvbox\\partialpage %$/ pair merc-src/accumulator.m /^:- import_module pair.$/ par tex-src/texinfo.tex /^{\\let\\par=\\endgraf \\smallbreak}%$/ @@ -4110,7 +4110,7 @@ readline_internal c-src/etags.c /^readline_internal (linebuffer *lbp, register F realloc c-src/emacs/src/gmalloc.c 65 realloc c-src/emacs/src/gmalloc.c 69 realloc c-src/emacs/src/gmalloc.c /^realloc (void *ptr, size_t size)$/ -realloc c-src/emacs/src/gmalloc.c 1716 +realloc c-src/emacs/src/gmalloc.c 1720 reallochook c-src/emacs/src/gmalloc.c /^reallochook (void *ptr, size_t size)$/ recent-keys c-src/emacs/src/keyboard.c /^DEFUN ("recent-keys", Frecent_keys, Srecent_keys, / recent_keys c-src/emacs/src/keyboard.c 100 @@ -4338,7 +4338,7 @@ size c-src/etags.c 236 size c-src/etags.c 2522 size c-src/emacs/src/gmalloc.c 156 size c-src/emacs/src/gmalloc.c 163 -size c-src/emacs/src/gmalloc.c 1862 +size c-src/emacs/src/gmalloc.c 1867 size c-src/emacs/src/lisp.h 1364 size c-src/emacs/src/lisp.h 1390 skeyseen c-src/etags.c 2445 @@ -4417,7 +4417,7 @@ start_polling c-src/emacs/src/keyboard.c /^start_polling (void)$/ start_up prol-src/natded.prolog /^start_up:-$/ startcontents tex-src/texinfo.tex /^\\def\\startcontents#1{%$/ startenumeration tex-src/texinfo.tex /^\\def\\startenumeration#1{%$/ -state_protected_p c-src/emacs/src/gmalloc.c 400 +state_protected_p c-src/emacs/src/gmalloc.c 401 statetable html-src/algrthms.html /^Next$/ staticetags make-src/Makefile /^staticetags:$/ step cp-src/conway.hpp /^ void step(void) { alive = next_alive; }$/ @@ -5047,24 +5047,24 @@ y cp-src/conway.hpp 7 y cp-src/clheir.hpp 49 y cp-src/clheir.hpp 58 y-get-selection-internal c.c /^ Fy_get_selection_internal, Sy_get_selection_/ -yyalloc /usr/share/bison/bison.simple 83 yyalloc /usr/share/bison/bison.simple 84 -yyclearin /usr/share/bison/bison.simple 149 +yyalloc /usr/share/bison/bison.simple 84 yyclearin /usr/share/bison/bison.simple 150 -yydebug /usr/share/bison/bison.simple 237 +yyclearin /usr/share/bison/bison.simple 150 +yydebug /usr/share/bison/bison.simple 238 yydebug /usr/share/bison/bison.simple 238 yyerrhandle /usr/share/bison/bison.simple 848 yyerrlab1 /usr/share/bison/bison.simple 823 -yyerrok /usr/share/bison/bison.simple 148 +yyerrok /usr/share/bison/bison.simple 149 yyerrok /usr/share/bison/bison.simple 149 yyerror y-src/cccp.y /^yyerror (s)$/ yyerrstatus /usr/share/bison/bison.simple 846 yylex y-src/cccp.y /^yylex ()$/ -yyls /usr/share/bison/bison.simple 88 +yyls /usr/share/bison/bison.simple 89 yyls /usr/share/bison/bison.simple 89 yylsp /usr/share/bison/bison.simple 748 yylsp /usr/share/bison/bison.simple 921 -yymemcpy /usr/share/bison/bison.simple 264 +yymemcpy /usr/share/bison/bison.simple 265 yymemcpy /usr/share/bison/bison.simple /^yymemcpy (char *yyto, const char *yyfrom, YYSIZE_T/ yymemcpy /usr/share/bison/bison.simple 265 yymemcpy /usr/share/bison/bison.simple /^yymemcpy (char *yyto, const char *yyfrom, YYSIZE_T/ @@ -5081,21 +5081,21 @@ yyresult /usr/share/bison/bison.simple 939 yyresult /usr/share/bison/bison.simple 947 yyreturn /usr/share/bison/bison.simple 933 yyreturn /usr/share/bison/bison.simple 940 -yyss /usr/share/bison/bison.simple 85 +yyss /usr/share/bison/bison.simple 86 yyss /usr/share/bison/bison.simple 86 yystate /usr/share/bison/bison.simple 757 yystate /usr/share/bison/bison.simple 761 yystate /usr/share/bison/bison.simple 875 yystate /usr/share/bison/bison.simple 924 -yystpcpy /usr/share/bison/bison.simple 316 +yystpcpy /usr/share/bison/bison.simple 317 yystpcpy /usr/share/bison/bison.simple /^yystpcpy (char *yydest, const char *yysrc)$/ yystpcpy /usr/share/bison/bison.simple 317 yystpcpy /usr/share/bison/bison.simple /^yystpcpy (char *yydest, const char *yysrc)$/ -yystrlen /usr/share/bison/bison.simple 293 +yystrlen /usr/share/bison/bison.simple 294 yystrlen /usr/share/bison/bison.simple /^yystrlen (const char *yystr)$/ yystrlen /usr/share/bison/bison.simple 294 yystrlen /usr/share/bison/bison.simple /^yystrlen (const char *yystr)$/ -yyvs /usr/share/bison/bison.simple 86 +yyvs /usr/share/bison/bison.simple 87 yyvs /usr/share/bison/bison.simple 87 yyvsp /usr/share/bison/bison.simple 746 yyvsp /usr/share/bison/bison.simple 919 diff --git a/test/manual/etags/CTAGS.good_crlf b/test/manual/etags/CTAGS.good_crlf index 29ac01d605d..a9efb408cd8 100644 --- a/test/manual/etags/CTAGS.good_crlf +++ b/test/manual/etags/CTAGS.good_crlf @@ -604,7 +604,7 @@ FOR_EACH_ALIST_VALUE c-src/emacs/src/lisp.h /^#define FOR_EACH_ALIST_VALUE(head_ FOR_EACH_TAIL c-src/emacs/src/lisp.h /^#define FOR_EACH_TAIL(hare, list, tortoise, n) \\$/ FRAMEP c-src/emacs/src/lisp.h /^FRAMEP (Lisp_Object a)$/ FRC make-src/Makefile /^FRC:;$/ -FREEFLOOD c-src/emacs/src/gmalloc.c 1858 +FREEFLOOD c-src/emacs/src/gmalloc.c 1863 FSRC make-src/Makefile /^FSRC=entry.for entry.strange_suffix entry.strange$/ FUN0 y-src/parse.y /^yylex FUN0()$/ FUN1 y-src/parse.y /^str_to_col FUN1(char **,str)$/ @@ -949,12 +949,12 @@ Lua_functions c-src/etags.c /^Lua_functions (FILE *inf)$/ Lua_help c-src/etags.c 600 Lua_suffixes c-src/etags.c 598 MAGENTA cp-src/screen.hpp 17 -MAGICBYTE c-src/emacs/src/gmalloc.c 1856 -MAGICFREE c-src/emacs/src/gmalloc.c 1855 -MAGICWORD c-src/emacs/src/gmalloc.c 1854 +MAGICBYTE c-src/emacs/src/gmalloc.c 1861 +MAGICFREE c-src/emacs/src/gmalloc.c 1860 +MAGICWORD c-src/emacs/src/gmalloc.c 1859 MAKE make-src/Makefile /^MAKE:=$(MAKE) --no-print-directory$/ MAKESRC make-src/Makefile /^MAKESRC=Makefile$/ -MALLOCFLOOD c-src/emacs/src/gmalloc.c 1857 +MALLOCFLOOD c-src/emacs/src/gmalloc.c 1862 MANY c-src/emacs/src/lisp.h 2833 MARKERP c-src/emacs/src/lisp.h /^# define MARKERP(x) lisp_h_MARKERP (x)$/ MAXPATHLEN c-src/etags.c 115 @@ -1628,43 +1628,27 @@ Y c-src/h.h 100 YACC c-src/etags.c 2199 YELLOW cp-src/screen.hpp 26 YSRC make-src/Makefile /^YSRC=parse.y parse.c atest.y cccp.c cccp.y$/ -YYABORT /usr/share/bison/bison.simple 153 YYABORT /usr/share/bison/bison.simple 154 -YYACCEPT /usr/share/bison/bison.simple 152 YYACCEPT /usr/share/bison/bison.simple 153 YYBACKUP /usr/share/bison/bison.simple /^#define YYBACKUP(Token, Value) \\$/ YYBISON y-src/cccp.c 4 YYBISON y-src/parse.c 4 YYDPRINTF /usr/share/bison/bison.simple /^# define YYDPRINTF(Args) \\$/ YYDPRINTF /usr/share/bison/bison.simple /^# define YYDPRINTF(Args)$/ -YYEMPTY /usr/share/bison/bison.simple 150 YYEMPTY /usr/share/bison/bison.simple 151 -YYEOF /usr/share/bison/bison.simple 151 YYEOF /usr/share/bison/bison.simple 152 -YYERRCODE /usr/share/bison/bison.simple 178 YYERRCODE /usr/share/bison/bison.simple 179 -YYERROR /usr/share/bison/bison.simple 154 YYERROR /usr/share/bison/bison.simple 155 -YYFAIL /usr/share/bison/bison.simple 158 YYFAIL /usr/share/bison/bison.simple 159 -YYFPRINTF /usr/share/bison/bison.simple 225 YYFPRINTF /usr/share/bison/bison.simple 226 -YYINITDEPTH /usr/share/bison/bison.simple 244 YYINITDEPTH /usr/share/bison/bison.simple 245 -YYLEX /usr/share/bison/bison.simple 200 YYLEX /usr/share/bison/bison.simple 201 -YYLEX /usr/share/bison/bison.simple 202 YYLEX /usr/share/bison/bison.simple 203 -YYLEX /usr/share/bison/bison.simple 206 YYLEX /usr/share/bison/bison.simple 207 -YYLEX /usr/share/bison/bison.simple 208 YYLEX /usr/share/bison/bison.simple 209 -YYLEX /usr/share/bison/bison.simple 212 YYLEX /usr/share/bison/bison.simple 213 YYLLOC_DEFAULT /usr/share/bison/bison.simple /^# define YYLLOC_DEFAULT(Current, Rhs, N) \\$/ -YYMAXDEPTH /usr/share/bison/bison.simple 255 YYMAXDEPTH /usr/share/bison/bison.simple 256 -YYMAXDEPTH /usr/share/bison/bison.simple 259 YYMAXDEPTH /usr/share/bison/bison.simple 260 YYPARSE_PARAM_ARG /usr/share/bison/bison.simple 351 YYPARSE_PARAM_ARG /usr/share/bison/bison.simple 354 @@ -1675,37 +1659,22 @@ YYPARSE_PARAM_DECL /usr/share/bison/bison.simple 359 YYPOPSTACK /usr/share/bison/bison.simple 445 YYPOPSTACK /usr/share/bison/bison.simple 447 YYRECOVERING /usr/share/bison/bison.simple /^#define YYRECOVERING() (!!yyerrstatus)$/ -YYSIZE_T /usr/share/bison/bison.simple 128 YYSIZE_T /usr/share/bison/bison.simple 129 -YYSIZE_T /usr/share/bison/bison.simple 131 YYSIZE_T /usr/share/bison/bison.simple 132 -YYSIZE_T /usr/share/bison/bison.simple 136 YYSIZE_T /usr/share/bison/bison.simple 137 -YYSIZE_T /usr/share/bison/bison.simple 140 YYSIZE_T /usr/share/bison/bison.simple 141 -YYSIZE_T /usr/share/bison/bison.simple 145 YYSIZE_T /usr/share/bison/bison.simple 146 -YYSIZE_T /usr/share/bison/bison.simple 51 YYSIZE_T /usr/share/bison/bison.simple 52 -YYSIZE_T /usr/share/bison/bison.simple 56 YYSIZE_T /usr/share/bison/bison.simple 57 -YYSIZE_T /usr/share/bison/bison.simple 71 YYSIZE_T /usr/share/bison/bison.simple 72 -YYSIZE_T /usr/share/bison/bison.simple 75 YYSIZE_T /usr/share/bison/bison.simple 76 -YYSTACK_ALLOC /usr/share/bison/bison.simple 50 YYSTACK_ALLOC /usr/share/bison/bison.simple 51 -YYSTACK_ALLOC /usr/share/bison/bison.simple 55 YYSTACK_ALLOC /usr/share/bison/bison.simple 56 -YYSTACK_ALLOC /usr/share/bison/bison.simple 59 YYSTACK_ALLOC /usr/share/bison/bison.simple 60 -YYSTACK_ALLOC /usr/share/bison/bison.simple 78 YYSTACK_ALLOC /usr/share/bison/bison.simple 79 YYSTACK_BYTES /usr/share/bison/bison.simple /^# define YYSTACK_BYTES(N) \\$/ YYSTACK_FREE /usr/share/bison/bison.simple /^# define YYSTACK_FREE(Ptr) do { \/* empty *\/; } wh/ -YYSTACK_FREE /usr/share/bison/bison.simple 79 YYSTACK_FREE /usr/share/bison/bison.simple 80 -YYSTACK_GAP_MAX /usr/share/bison/bison.simple 93 YYSTACK_GAP_MAX /usr/share/bison/bison.simple 94 YYSTACK_RELOCATE /usr/share/bison/bison.simple /^# define YYSTACK_RELOCATE(Type, Stack) \\$/ YYSTACK_RELOCATE /usr/share/bison/bison.simple 548 @@ -1713,7 +1682,6 @@ YYSTD /usr/share/bison/bison.simple /^# define YYSTD(x) std::x$/ YYSTD /usr/share/bison/bison.simple /^# define YYSTD(x) x$/ YYSTYPE y-src/parse.y 72 YYSTYPE y-src/parse.y 73 -YYTERROR /usr/share/bison/bison.simple 177 YYTERROR /usr/share/bison/bison.simple 178 YY_DECL_NON_LSP_VARIABLES /usr/share/bison/bison.simple 374 YY_DECL_VARIABLES /usr/share/bison/bison.simple 385 @@ -1758,33 +1726,33 @@ __init__ pyt-src/server.py /^ def __init__(self, user, userlist, master=None/ __ip c.c 159 __libc_atexit c-src/exit.c 30 __libc_atexit c-src/exit.strange_suffix 30 -__malloc_extra_blocks c-src/emacs/src/gmalloc.c 381 +__malloc_extra_blocks c-src/emacs/src/gmalloc.c 382 __malloc_initialize c-src/emacs/src/gmalloc.c /^__malloc_initialize (void)$/ -__malloc_initialized c-src/emacs/src/gmalloc.c 379 +__malloc_initialized c-src/emacs/src/gmalloc.c 380 __repr__ pyt-src/server.py /^ def __repr__(self):$/ -__sbrk c-src/emacs/src/gmalloc.c 1513 +__sbrk c-src/emacs/src/gmalloc.c 1516 __str__ pyt-src/server.py /^ def __str__(self):$/ __up c.c 160 -_aligned_blocks c-src/emacs/src/gmalloc.c 1004 -_aligned_blocks_mutex c-src/emacs/src/gmalloc.c 518 +_aligned_blocks c-src/emacs/src/gmalloc.c 1006 +_aligned_blocks_mutex c-src/emacs/src/gmalloc.c 519 _bar? ruby-src/test1.ru /^ def self._bar?(abc)$/ -_bytes_free c-src/emacs/src/gmalloc.c 376 -_bytes_used c-src/emacs/src/gmalloc.c 374 -_chunks_free c-src/emacs/src/gmalloc.c 375 -_chunks_used c-src/emacs/src/gmalloc.c 373 -_fraghead c-src/emacs/src/gmalloc.c 370 +_bytes_free c-src/emacs/src/gmalloc.c 377 +_bytes_used c-src/emacs/src/gmalloc.c 375 +_chunks_free c-src/emacs/src/gmalloc.c 376 +_chunks_used c-src/emacs/src/gmalloc.c 374 +_fraghead c-src/emacs/src/gmalloc.c 371 _free c-src/emacs/src/gmalloc.c /^_free (void *ptr)$/ _free_internal c-src/emacs/src/gmalloc.c /^_free_internal (void *ptr)$/ _free_internal_nolock c-src/emacs/src/gmalloc.c /^_free_internal_nolock (void *ptr)$/ -_heapbase c-src/emacs/src/gmalloc.c 355 -_heapindex c-src/emacs/src/gmalloc.c 364 -_heapinfo c-src/emacs/src/gmalloc.c 358 -_heaplimit c-src/emacs/src/gmalloc.c 367 +_heapbase c-src/emacs/src/gmalloc.c 356 +_heapindex c-src/emacs/src/gmalloc.c 365 +_heapinfo c-src/emacs/src/gmalloc.c 359 +_heaplimit c-src/emacs/src/gmalloc.c 368 _malloc c-src/emacs/src/gmalloc.c /^_malloc (size_t size)$/ _malloc_internal c-src/emacs/src/gmalloc.c /^_malloc_internal (size_t size)$/ _malloc_internal_nolock c-src/emacs/src/gmalloc.c /^_malloc_internal_nolock (size_t size)$/ -_malloc_mutex c-src/emacs/src/gmalloc.c 517 -_malloc_thread_enabled_p c-src/emacs/src/gmalloc.c 519 +_malloc_mutex c-src/emacs/src/gmalloc.c 518 +_malloc_thread_enabled_p c-src/emacs/src/gmalloc.c 520 _realloc c-src/emacs/src/gmalloc.c /^_realloc (void *ptr, size_t size)$/ _realloc_internal c-src/emacs/src/gmalloc.c /^_realloc_internal (void *ptr, size_t size)$/ _realloc_internal_nolock c-src/emacs/src/gmalloc.c /^_realloc_internal_nolock (void *ptr, size_t size)$/ @@ -1897,7 +1865,7 @@ align c-src/emacs/src/gmalloc.c /^align (size_t size)$/ alignas c-src/emacs/src/lisp.h /^# define alignas(alignment) \/* empty *\/$/ aligned c-src/emacs/src/gmalloc.c 199 aligned_alloc c-src/emacs/src/gmalloc.c /^aligned_alloc (size_t alignment, size_t size)$/ -aligned_alloc c-src/emacs/src/gmalloc.c 1718 +aligned_alloc c-src/emacs/src/gmalloc.c 1722 aligned_alloc c-src/emacs/src/gmalloc.c 71 alignlist c-src/emacs/src/gmalloc.c 196 alive cp-src/conway.hpp 7 @@ -2101,7 +2069,7 @@ cacheLRUEntry_s c.c 172 cacheLRUEntry_t c.c 177 calculate_goal_info merc-src/accumulator.m /^:- pred calculate_goal_info(hlds_goal_expr::in, hl/ calloc c-src/emacs/src/gmalloc.c /^calloc (size_t nmemb, size_t size)$/ -calloc c-src/emacs/src/gmalloc.c 1717 +calloc c-src/emacs/src/gmalloc.c 1721 calloc c-src/emacs/src/gmalloc.c 66 calloc c-src/emacs/src/gmalloc.c 70 can_be_null c-src/emacs/src/regex.h 370 @@ -2731,7 +2699,7 @@ frag c-src/emacs/src/gmalloc.c 152 frame_local c-src/emacs/src/lisp.h 2341 free c-src/emacs/src/gmalloc.c /^free (void *ptr)$/ free c-src/emacs/src/gmalloc.c 166 -free c-src/emacs/src/gmalloc.c 1719 +free c-src/emacs/src/gmalloc.c 1723 free c-src/emacs/src/gmalloc.c 67 free c-src/emacs/src/gmalloc.c 72 free_fdesc c-src/etags.c /^free_fdesc (register fdesc *fdp)$/ @@ -2842,7 +2810,7 @@ hash_table_test c-src/emacs/src/lisp.h 1805 hashfn c-src/emacs/src/lisp.h /^ EMACS_UINT (*hashfn) (struct hash_table_test *t,/ hat tex-src/texinfo.tex /^\\def\\hat{\\realbackslash hat}$/ hat tex-src/texinfo.tex /^\\def\\hat{\\realbackslash hat}%$/ -hdr c-src/emacs/src/gmalloc.c 1860 +hdr c-src/emacs/src/gmalloc.c 1865 head_table c-src/emacs/src/keyboard.c 11027 header c-src/emacs/src/lisp.h 1371 header c-src/emacs/src/lisp.h 1388 @@ -2853,7 +2821,7 @@ header c-src/emacs/src/lisp.h 1826 header_size c-src/emacs/src/lisp.h 1471 heading tex-src/texinfo.tex /^\\def\\heading{\\parsearg\\secheadingi}$/ headings tex-src/texinfo.tex /^\\def\\headings #1 {\\csname HEADINGS#1\\endcsname}$/ -heapsize c-src/emacs/src/gmalloc.c 361 +heapsize c-src/emacs/src/gmalloc.c 362 hello scm-src/test.scm /^(define hello "Hello, Emacs!")$/ hello scm-src/test.scm /^(set! hello "Hello, world!")$/ hello-world scm-src/test.scm /^(define (hello-world)$/ @@ -3128,13 +3096,13 @@ language c-src/etags.c 199 last-tag el-src/emacs/lisp/progmodes/etags.el /^(defvar last-tag nil$/ last_abbrev_point c-src/abbrev.c 79 last_auto_save c-src/emacs/src/keyboard.c 214 -last_heapinfo c-src/emacs/src/gmalloc.c 402 +last_heapinfo c-src/emacs/src/gmalloc.c 403 last_mouse_button c-src/emacs/src/keyboard.c 5215 last_mouse_x c-src/emacs/src/keyboard.c 5216 last_mouse_y c-src/emacs/src/keyboard.c 5217 last_non_minibuf_size c-src/emacs/src/keyboard.c 207 last_point_position c-src/emacs/src/keyboard.c 217 -last_state_size c-src/emacs/src/gmalloc.c 401 +last_state_size c-src/emacs/src/gmalloc.c 402 last_undo_boundary c-src/emacs/src/keyboard.c 1287 lasta c.c 272 lastargmargin tex-src/texinfo.tex /^\\newskip\\deflastargmargin \\deflastargmargin=18pt$/ @@ -3272,7 +3240,7 @@ mach_task_self c-src/machsyscalls.h /^SYSCALL (mach_task_self, -28,$/ mach_thread_self c-src/machsyscalls.h /^SYSCALL (mach_thread_self, -27,$/ macheader tex-src/texinfo.tex /^\\def\\defmac{\\defparsebody\\Edefmac\\defmacx\\defmache/ macx\defmacheader tex-src/texinfo.tex /^\\def\\defmac{\\defparsebody\\Edefmac\\defmacx\\defmache/ -magic c-src/emacs/src/gmalloc.c 1863 +magic c-src/emacs/src/gmalloc.c 1868 mainmagstep tex-src/texinfo.tex /^\\let\\mainmagstep=\\magstep1$/ mainmagstep tex-src/texinfo.tex /^\\let\\mainmagstep=\\magstephalf$/ maintaining.info make-src/Makefile /^maintaining.info: maintaining.texi$/ @@ -3300,7 +3268,7 @@ make_uninit_sub_char_table c-src/emacs/src/lisp.h /^make_uninit_sub_char_table ( make_uninit_vector c-src/emacs/src/lisp.h /^make_uninit_vector (ptrdiff_t size)$/ malloc c-src/emacs/src/gmalloc.c /^extern void *malloc (size_t size) ATTRIBUTE_MALLOC/ malloc c-src/emacs/src/gmalloc.c /^malloc (size_t size)$/ -malloc c-src/emacs/src/gmalloc.c 1715 +malloc c-src/emacs/src/gmalloc.c 1719 malloc c-src/emacs/src/gmalloc.c 64 malloc c-src/emacs/src/gmalloc.c 68 malloc_atfork_handler_child c-src/emacs/src/gmalloc.c /^malloc_atfork_handler_child (void)$/ @@ -3333,7 +3301,7 @@ maybe_gc c-src/emacs/src/lisp.h /^maybe_gc (void)$/ mcCSC cp-src/c.C 6 mcheck c-src/emacs/src/gmalloc.c /^mcheck (void (*func) (enum mcheck_status))$/ mcheck_status c-src/emacs/src/gmalloc.c 283 -mcheck_used c-src/emacs/src/gmalloc.c 2012 +mcheck_used c-src/emacs/src/gmalloc.c 2017 mdbcomp merc-src/accumulator.m /^:- import_module mdbcomp.$/ me22b lua-src/test.lua /^ local function test.me22b (one)$/ me_22a lua-src/test.lua /^ function test.me_22a(one, two)$/ @@ -3373,7 +3341,7 @@ module_instance_method ruby-src/test.rb /^ def module_instance_method$/ more= ruby-src/test1.ru /^ :more$/ more_aligned_int c.c 165 morecore_nolock c-src/emacs/src/gmalloc.c /^morecore_nolock (size_t size)$/ -morecore_recursing c-src/emacs/src/gmalloc.c 604 +morecore_recursing c-src/emacs/src/gmalloc.c 605 mouse_syms c-src/emacs/src/keyboard.c 4627 move cp-src/clheir.cpp /^void agent::move(int direction)$/ mprobe c-src/emacs/src/gmalloc.c /^mprobe (void *ptr)$/ @@ -3667,7 +3635,7 @@ pagealignmacro tex-src/texinfo.tex /^\\global\\let\\pagealignmacro=\\chappager$/ pagealignmacro tex-src/texinfo.tex /^\\global\\let\\pagealignmacro=\\chappager}$/ pagebody tex-src/texinfo.tex /^\\def\\pagebody#1{\\vbox to\\pageheight{\\boxmaxdepth=\\/ pagecontents tex-src/texinfo.tex /^\\gdef\\pagecontents#1{\\ifvoid\\topins\\else\\unvbox\\to/ -pagesize c-src/emacs/src/gmalloc.c 1703 +pagesize c-src/emacs/src/gmalloc.c 1707 pagesofar tex-src/texinfo.tex /^\\def\\pagesofar{\\unvbox\\partialpage %$/ pair merc-src/accumulator.m /^:- import_module pair.$/ par tex-src/texinfo.tex /^\\let\\par=\\lisppar$/ @@ -3882,7 +3850,7 @@ readauxfile tex-src/texinfo.tex /^\\def\\readauxfile{%$/ readline c-src/etags.c /^readline (linebuffer *lbp, FILE *stream)$/ readline_internal c-src/etags.c /^readline_internal (linebuffer *lbp, register FILE / realloc c-src/emacs/src/gmalloc.c /^realloc (void *ptr, size_t size)$/ -realloc c-src/emacs/src/gmalloc.c 1716 +realloc c-src/emacs/src/gmalloc.c 1720 realloc c-src/emacs/src/gmalloc.c 65 realloc c-src/emacs/src/gmalloc.c 69 reallochook c-src/emacs/src/gmalloc.c /^reallochook (void *ptr, size_t size)$/ @@ -4106,7 +4074,7 @@ site cp-src/conway.hpp /^ site(int xi, int yi): x(xi), y(yi), alive(0) {/ site cp-src/conway.hpp 5 size c-src/emacs/src/gmalloc.c 156 size c-src/emacs/src/gmalloc.c 163 -size c-src/emacs/src/gmalloc.c 1862 +size c-src/emacs/src/gmalloc.c 1867 size c-src/emacs/src/lisp.h 1364 size c-src/emacs/src/lisp.h 1390 size c-src/etags.c 236 @@ -4187,7 +4155,7 @@ start_polling c-src/emacs/src/keyboard.c /^start_polling (void)$/ start_up prol-src/natded.prolog /^start_up:-$/ startcontents tex-src/texinfo.tex /^\\def\\startcontents#1{%$/ startenumeration tex-src/texinfo.tex /^\\def\\startenumeration#1{%$/ -state_protected_p c-src/emacs/src/gmalloc.c 400 +state_protected_p c-src/emacs/src/gmalloc.c 401 statetable html-src/algrthms.html /^Next$/ staticetags make-src/Makefile /^staticetags:$/ step cp-src/clheir.hpp /^ virtual void step(void) { }$/ @@ -4799,25 +4767,19 @@ y cp-src/clheir.hpp 49 y cp-src/clheir.hpp 58 y cp-src/conway.hpp 7 y-get-selection-internal c.c /^ Fy_get_selection_internal, Sy_get_selection_/ -yyalloc /usr/share/bison/bison.simple 83 yyalloc /usr/share/bison/bison.simple 84 -yyclearin /usr/share/bison/bison.simple 149 yyclearin /usr/share/bison/bison.simple 150 -yydebug /usr/share/bison/bison.simple 237 yydebug /usr/share/bison/bison.simple 238 yyerrhandle /usr/share/bison/bison.simple 848 yyerrlab1 /usr/share/bison/bison.simple 823 -yyerrok /usr/share/bison/bison.simple 148 yyerrok /usr/share/bison/bison.simple 149 yyerror y-src/cccp.y /^yyerror (s)$/ yyerrstatus /usr/share/bison/bison.simple 846 yylex y-src/cccp.y /^yylex ()$/ -yyls /usr/share/bison/bison.simple 88 yyls /usr/share/bison/bison.simple 89 yylsp /usr/share/bison/bison.simple 748 yylsp /usr/share/bison/bison.simple 921 yymemcpy /usr/share/bison/bison.simple /^yymemcpy (char *yyto, const char *yyfrom, YYSIZE_T/ -yymemcpy /usr/share/bison/bison.simple 264 yymemcpy /usr/share/bison/bison.simple 265 yyn /usr/share/bison/bison.simple 755 yyn /usr/share/bison/bison.simple 861 @@ -4831,19 +4793,15 @@ yyresult /usr/share/bison/bison.simple 939 yyresult /usr/share/bison/bison.simple 947 yyreturn /usr/share/bison/bison.simple 933 yyreturn /usr/share/bison/bison.simple 940 -yyss /usr/share/bison/bison.simple 85 yyss /usr/share/bison/bison.simple 86 yystate /usr/share/bison/bison.simple 757 yystate /usr/share/bison/bison.simple 761 yystate /usr/share/bison/bison.simple 875 yystate /usr/share/bison/bison.simple 924 yystpcpy /usr/share/bison/bison.simple /^yystpcpy (char *yydest, const char *yysrc)$/ -yystpcpy /usr/share/bison/bison.simple 316 yystpcpy /usr/share/bison/bison.simple 317 yystrlen /usr/share/bison/bison.simple /^yystrlen (const char *yystr)$/ -yystrlen /usr/share/bison/bison.simple 293 yystrlen /usr/share/bison/bison.simple 294 -yyvs /usr/share/bison/bison.simple 86 yyvs /usr/share/bison/bison.simple 87 yyvsp /usr/share/bison/bison.simple 746 yyvsp /usr/share/bison/bison.simple 919 diff --git a/test/manual/etags/CTAGS.good_update b/test/manual/etags/CTAGS.good_update index 64f01f2c9e4..f9fd1f3d14b 100644 --- a/test/manual/etags/CTAGS.good_update +++ b/test/manual/etags/CTAGS.good_update @@ -605,7 +605,7 @@ FOR_EACH_ALIST_VALUE c-src/emacs/src/lisp.h /^#define FOR_EACH_ALIST_VALUE(head_ FOR_EACH_TAIL c-src/emacs/src/lisp.h /^#define FOR_EACH_TAIL(hare, list, tortoise, n) \\$/ FRAMEP c-src/emacs/src/lisp.h /^FRAMEP (Lisp_Object a)$/ FRC make-src/Makefile /^FRC:;$/ -FREEFLOOD c-src/emacs/src/gmalloc.c 1858 +FREEFLOOD c-src/emacs/src/gmalloc.c 1863 FSRC make-src/Makefile /^FSRC=entry.for entry.strange_suffix entry.strange$/ FUN0 y-src/parse.y /^yylex FUN0()$/ FUN1 y-src/parse.y /^str_to_col FUN1(char **,str)$/ @@ -950,12 +950,12 @@ Lua_functions c-src/etags.c /^Lua_functions (FILE *inf)$/ Lua_help c-src/etags.c 600 Lua_suffixes c-src/etags.c 598 MAGENTA cp-src/screen.hpp 17 -MAGICBYTE c-src/emacs/src/gmalloc.c 1856 -MAGICFREE c-src/emacs/src/gmalloc.c 1855 -MAGICWORD c-src/emacs/src/gmalloc.c 1854 +MAGICBYTE c-src/emacs/src/gmalloc.c 1861 +MAGICFREE c-src/emacs/src/gmalloc.c 1860 +MAGICWORD c-src/emacs/src/gmalloc.c 1859 MAKE make-src/Makefile /^MAKE:=$(MAKE) --no-print-directory$/ MAKESRC make-src/Makefile /^MAKESRC=Makefile$/ -MALLOCFLOOD c-src/emacs/src/gmalloc.c 1857 +MALLOCFLOOD c-src/emacs/src/gmalloc.c 1862 MANY c-src/emacs/src/lisp.h 2833 MARKERP c-src/emacs/src/lisp.h /^# define MARKERP(x) lisp_h_MARKERP (x)$/ MAXPATHLEN c-src/etags.c 115 @@ -1629,43 +1629,27 @@ Y c-src/h.h 100 YACC c-src/etags.c 2199 YELLOW cp-src/screen.hpp 26 YSRC make-src/Makefile /^YSRC=parse.y parse.c atest.y cccp.c cccp.y$/ -YYABORT /usr/share/bison/bison.simple 153 YYABORT /usr/share/bison/bison.simple 154 -YYACCEPT /usr/share/bison/bison.simple 152 YYACCEPT /usr/share/bison/bison.simple 153 YYBACKUP /usr/share/bison/bison.simple /^#define YYBACKUP(Token, Value) \\$/ YYBISON y-src/cccp.c 4 YYBISON y-src/parse.c 4 YYDPRINTF /usr/share/bison/bison.simple /^# define YYDPRINTF(Args) \\$/ YYDPRINTF /usr/share/bison/bison.simple /^# define YYDPRINTF(Args)$/ -YYEMPTY /usr/share/bison/bison.simple 150 YYEMPTY /usr/share/bison/bison.simple 151 -YYEOF /usr/share/bison/bison.simple 151 YYEOF /usr/share/bison/bison.simple 152 -YYERRCODE /usr/share/bison/bison.simple 178 YYERRCODE /usr/share/bison/bison.simple 179 -YYERROR /usr/share/bison/bison.simple 154 YYERROR /usr/share/bison/bison.simple 155 -YYFAIL /usr/share/bison/bison.simple 158 YYFAIL /usr/share/bison/bison.simple 159 -YYFPRINTF /usr/share/bison/bison.simple 225 YYFPRINTF /usr/share/bison/bison.simple 226 -YYINITDEPTH /usr/share/bison/bison.simple 244 YYINITDEPTH /usr/share/bison/bison.simple 245 -YYLEX /usr/share/bison/bison.simple 200 YYLEX /usr/share/bison/bison.simple 201 -YYLEX /usr/share/bison/bison.simple 202 YYLEX /usr/share/bison/bison.simple 203 -YYLEX /usr/share/bison/bison.simple 206 YYLEX /usr/share/bison/bison.simple 207 -YYLEX /usr/share/bison/bison.simple 208 YYLEX /usr/share/bison/bison.simple 209 -YYLEX /usr/share/bison/bison.simple 212 YYLEX /usr/share/bison/bison.simple 213 YYLLOC_DEFAULT /usr/share/bison/bison.simple /^# define YYLLOC_DEFAULT(Current, Rhs, N) \\$/ -YYMAXDEPTH /usr/share/bison/bison.simple 255 YYMAXDEPTH /usr/share/bison/bison.simple 256 -YYMAXDEPTH /usr/share/bison/bison.simple 259 YYMAXDEPTH /usr/share/bison/bison.simple 260 YYPARSE_PARAM_ARG /usr/share/bison/bison.simple 351 YYPARSE_PARAM_ARG /usr/share/bison/bison.simple 354 @@ -1676,37 +1660,22 @@ YYPARSE_PARAM_DECL /usr/share/bison/bison.simple 359 YYPOPSTACK /usr/share/bison/bison.simple 445 YYPOPSTACK /usr/share/bison/bison.simple 447 YYRECOVERING /usr/share/bison/bison.simple /^#define YYRECOVERING() (!!yyerrstatus)$/ -YYSIZE_T /usr/share/bison/bison.simple 128 YYSIZE_T /usr/share/bison/bison.simple 129 -YYSIZE_T /usr/share/bison/bison.simple 131 YYSIZE_T /usr/share/bison/bison.simple 132 -YYSIZE_T /usr/share/bison/bison.simple 136 YYSIZE_T /usr/share/bison/bison.simple 137 -YYSIZE_T /usr/share/bison/bison.simple 140 YYSIZE_T /usr/share/bison/bison.simple 141 -YYSIZE_T /usr/share/bison/bison.simple 145 YYSIZE_T /usr/share/bison/bison.simple 146 -YYSIZE_T /usr/share/bison/bison.simple 51 YYSIZE_T /usr/share/bison/bison.simple 52 -YYSIZE_T /usr/share/bison/bison.simple 56 YYSIZE_T /usr/share/bison/bison.simple 57 -YYSIZE_T /usr/share/bison/bison.simple 71 YYSIZE_T /usr/share/bison/bison.simple 72 -YYSIZE_T /usr/share/bison/bison.simple 75 YYSIZE_T /usr/share/bison/bison.simple 76 -YYSTACK_ALLOC /usr/share/bison/bison.simple 50 YYSTACK_ALLOC /usr/share/bison/bison.simple 51 -YYSTACK_ALLOC /usr/share/bison/bison.simple 55 YYSTACK_ALLOC /usr/share/bison/bison.simple 56 -YYSTACK_ALLOC /usr/share/bison/bison.simple 59 YYSTACK_ALLOC /usr/share/bison/bison.simple 60 -YYSTACK_ALLOC /usr/share/bison/bison.simple 78 YYSTACK_ALLOC /usr/share/bison/bison.simple 79 YYSTACK_BYTES /usr/share/bison/bison.simple /^# define YYSTACK_BYTES(N) \\$/ YYSTACK_FREE /usr/share/bison/bison.simple /^# define YYSTACK_FREE(Ptr) do { \/* empty *\/; } wh/ -YYSTACK_FREE /usr/share/bison/bison.simple 79 YYSTACK_FREE /usr/share/bison/bison.simple 80 -YYSTACK_GAP_MAX /usr/share/bison/bison.simple 93 YYSTACK_GAP_MAX /usr/share/bison/bison.simple 94 YYSTACK_RELOCATE /usr/share/bison/bison.simple /^# define YYSTACK_RELOCATE(Type, Stack) \\$/ YYSTACK_RELOCATE /usr/share/bison/bison.simple 548 @@ -1714,7 +1683,6 @@ YYSTD /usr/share/bison/bison.simple /^# define YYSTD(x) std::x$/ YYSTD /usr/share/bison/bison.simple /^# define YYSTD(x) x$/ YYSTYPE y-src/parse.y 72 YYSTYPE y-src/parse.y 73 -YYTERROR /usr/share/bison/bison.simple 177 YYTERROR /usr/share/bison/bison.simple 178 YY_DECL_NON_LSP_VARIABLES /usr/share/bison/bison.simple 374 YY_DECL_VARIABLES /usr/share/bison/bison.simple 385 @@ -1759,33 +1727,33 @@ __init__ pyt-src/server.py /^ def __init__(self, user, userlist, master=None/ __ip c.c 159 __libc_atexit c-src/exit.c 30 __libc_atexit c-src/exit.strange_suffix 30 -__malloc_extra_blocks c-src/emacs/src/gmalloc.c 381 +__malloc_extra_blocks c-src/emacs/src/gmalloc.c 382 __malloc_initialize c-src/emacs/src/gmalloc.c /^__malloc_initialize (void)$/ -__malloc_initialized c-src/emacs/src/gmalloc.c 379 +__malloc_initialized c-src/emacs/src/gmalloc.c 380 __repr__ pyt-src/server.py /^ def __repr__(self):$/ -__sbrk c-src/emacs/src/gmalloc.c 1513 +__sbrk c-src/emacs/src/gmalloc.c 1516 __str__ pyt-src/server.py /^ def __str__(self):$/ __up c.c 160 -_aligned_blocks c-src/emacs/src/gmalloc.c 1004 -_aligned_blocks_mutex c-src/emacs/src/gmalloc.c 518 +_aligned_blocks c-src/emacs/src/gmalloc.c 1006 +_aligned_blocks_mutex c-src/emacs/src/gmalloc.c 519 _bar? ruby-src/test1.ru /^ def self._bar?(abc)$/ -_bytes_free c-src/emacs/src/gmalloc.c 376 -_bytes_used c-src/emacs/src/gmalloc.c 374 -_chunks_free c-src/emacs/src/gmalloc.c 375 -_chunks_used c-src/emacs/src/gmalloc.c 373 -_fraghead c-src/emacs/src/gmalloc.c 370 +_bytes_free c-src/emacs/src/gmalloc.c 377 +_bytes_used c-src/emacs/src/gmalloc.c 375 +_chunks_free c-src/emacs/src/gmalloc.c 376 +_chunks_used c-src/emacs/src/gmalloc.c 374 +_fraghead c-src/emacs/src/gmalloc.c 371 _free c-src/emacs/src/gmalloc.c /^_free (void *ptr)$/ _free_internal c-src/emacs/src/gmalloc.c /^_free_internal (void *ptr)$/ _free_internal_nolock c-src/emacs/src/gmalloc.c /^_free_internal_nolock (void *ptr)$/ -_heapbase c-src/emacs/src/gmalloc.c 355 -_heapindex c-src/emacs/src/gmalloc.c 364 -_heapinfo c-src/emacs/src/gmalloc.c 358 -_heaplimit c-src/emacs/src/gmalloc.c 367 +_heapbase c-src/emacs/src/gmalloc.c 356 +_heapindex c-src/emacs/src/gmalloc.c 365 +_heapinfo c-src/emacs/src/gmalloc.c 359 +_heaplimit c-src/emacs/src/gmalloc.c 368 _malloc c-src/emacs/src/gmalloc.c /^_malloc (size_t size)$/ _malloc_internal c-src/emacs/src/gmalloc.c /^_malloc_internal (size_t size)$/ _malloc_internal_nolock c-src/emacs/src/gmalloc.c /^_malloc_internal_nolock (size_t size)$/ -_malloc_mutex c-src/emacs/src/gmalloc.c 517 -_malloc_thread_enabled_p c-src/emacs/src/gmalloc.c 519 +_malloc_mutex c-src/emacs/src/gmalloc.c 518 +_malloc_thread_enabled_p c-src/emacs/src/gmalloc.c 520 _realloc c-src/emacs/src/gmalloc.c /^_realloc (void *ptr, size_t size)$/ _realloc_internal c-src/emacs/src/gmalloc.c /^_realloc_internal (void *ptr, size_t size)$/ _realloc_internal_nolock c-src/emacs/src/gmalloc.c /^_realloc_internal_nolock (void *ptr, size_t size)$/ @@ -1898,7 +1866,7 @@ align c-src/emacs/src/gmalloc.c /^align (size_t size)$/ alignas c-src/emacs/src/lisp.h /^# define alignas(alignment) \/* empty *\/$/ aligned c-src/emacs/src/gmalloc.c 199 aligned_alloc c-src/emacs/src/gmalloc.c /^aligned_alloc (size_t alignment, size_t size)$/ -aligned_alloc c-src/emacs/src/gmalloc.c 1718 +aligned_alloc c-src/emacs/src/gmalloc.c 1722 aligned_alloc c-src/emacs/src/gmalloc.c 71 alignlist c-src/emacs/src/gmalloc.c 196 alive cp-src/conway.hpp 7 @@ -2102,7 +2070,7 @@ cacheLRUEntry_s c.c 172 cacheLRUEntry_t c.c 177 calculate_goal_info merc-src/accumulator.m /^:- pred calculate_goal_info(hlds_goal_expr::in, hl/ calloc c-src/emacs/src/gmalloc.c /^calloc (size_t nmemb, size_t size)$/ -calloc c-src/emacs/src/gmalloc.c 1717 +calloc c-src/emacs/src/gmalloc.c 1721 calloc c-src/emacs/src/gmalloc.c 66 calloc c-src/emacs/src/gmalloc.c 70 can_be_null c-src/emacs/src/regex.h 370 @@ -2732,7 +2700,7 @@ frag c-src/emacs/src/gmalloc.c 152 frame_local c-src/emacs/src/lisp.h 2341 free c-src/emacs/src/gmalloc.c /^free (void *ptr)$/ free c-src/emacs/src/gmalloc.c 166 -free c-src/emacs/src/gmalloc.c 1719 +free c-src/emacs/src/gmalloc.c 1723 free c-src/emacs/src/gmalloc.c 67 free c-src/emacs/src/gmalloc.c 72 free_fdesc c-src/etags.c /^free_fdesc (register fdesc *fdp)$/ @@ -2843,7 +2811,7 @@ hash_table_test c-src/emacs/src/lisp.h 1805 hashfn c-src/emacs/src/lisp.h /^ EMACS_UINT (*hashfn) (struct hash_table_test *t,/ hat tex-src/texinfo.tex /^\\def\\hat{\\realbackslash hat}$/ hat tex-src/texinfo.tex /^\\def\\hat{\\realbackslash hat}%$/ -hdr c-src/emacs/src/gmalloc.c 1860 +hdr c-src/emacs/src/gmalloc.c 1865 head_table c-src/emacs/src/keyboard.c 11027 header c-src/emacs/src/lisp.h 1371 header c-src/emacs/src/lisp.h 1388 @@ -2854,7 +2822,7 @@ header c-src/emacs/src/lisp.h 1826 header_size c-src/emacs/src/lisp.h 1471 heading tex-src/texinfo.tex /^\\def\\heading{\\parsearg\\secheadingi}$/ headings tex-src/texinfo.tex /^\\def\\headings #1 {\\csname HEADINGS#1\\endcsname}$/ -heapsize c-src/emacs/src/gmalloc.c 361 +heapsize c-src/emacs/src/gmalloc.c 362 hello scm-src/test.scm /^(define hello "Hello, Emacs!")$/ hello scm-src/test.scm /^(set! hello "Hello, world!")$/ hello-world scm-src/test.scm /^(define (hello-world)$/ @@ -3129,13 +3097,13 @@ language c-src/etags.c 199 last-tag el-src/emacs/lisp/progmodes/etags.el /^(defvar last-tag nil$/ last_abbrev_point c-src/abbrev.c 79 last_auto_save c-src/emacs/src/keyboard.c 214 -last_heapinfo c-src/emacs/src/gmalloc.c 402 +last_heapinfo c-src/emacs/src/gmalloc.c 403 last_mouse_button c-src/emacs/src/keyboard.c 5215 last_mouse_x c-src/emacs/src/keyboard.c 5216 last_mouse_y c-src/emacs/src/keyboard.c 5217 last_non_minibuf_size c-src/emacs/src/keyboard.c 207 last_point_position c-src/emacs/src/keyboard.c 217 -last_state_size c-src/emacs/src/gmalloc.c 401 +last_state_size c-src/emacs/src/gmalloc.c 402 last_undo_boundary c-src/emacs/src/keyboard.c 1287 lasta c.c 272 lastargmargin tex-src/texinfo.tex /^\\newskip\\deflastargmargin \\deflastargmargin=18pt$/ @@ -3273,7 +3241,7 @@ mach_task_self c-src/machsyscalls.h /^SYSCALL (mach_task_self, -28,$/ mach_thread_self c-src/machsyscalls.h /^SYSCALL (mach_thread_self, -27,$/ macheader tex-src/texinfo.tex /^\\def\\defmac{\\defparsebody\\Edefmac\\defmacx\\defmache/ macx\defmacheader tex-src/texinfo.tex /^\\def\\defmac{\\defparsebody\\Edefmac\\defmacx\\defmache/ -magic c-src/emacs/src/gmalloc.c 1863 +magic c-src/emacs/src/gmalloc.c 1868 mainmagstep tex-src/texinfo.tex /^\\let\\mainmagstep=\\magstep1$/ mainmagstep tex-src/texinfo.tex /^\\let\\mainmagstep=\\magstephalf$/ maintaining.info make-src/Makefile /^maintaining.info: maintaining.texi$/ @@ -3301,7 +3269,7 @@ make_uninit_sub_char_table c-src/emacs/src/lisp.h /^make_uninit_sub_char_table ( make_uninit_vector c-src/emacs/src/lisp.h /^make_uninit_vector (ptrdiff_t size)$/ malloc c-src/emacs/src/gmalloc.c /^extern void *malloc (size_t size) ATTRIBUTE_MALLOC/ malloc c-src/emacs/src/gmalloc.c /^malloc (size_t size)$/ -malloc c-src/emacs/src/gmalloc.c 1715 +malloc c-src/emacs/src/gmalloc.c 1719 malloc c-src/emacs/src/gmalloc.c 64 malloc c-src/emacs/src/gmalloc.c 68 malloc_atfork_handler_child c-src/emacs/src/gmalloc.c /^malloc_atfork_handler_child (void)$/ @@ -3334,7 +3302,7 @@ maybe_gc c-src/emacs/src/lisp.h /^maybe_gc (void)$/ mcCSC cp-src/c.C 6 mcheck c-src/emacs/src/gmalloc.c /^mcheck (void (*func) (enum mcheck_status))$/ mcheck_status c-src/emacs/src/gmalloc.c 283 -mcheck_used c-src/emacs/src/gmalloc.c 2012 +mcheck_used c-src/emacs/src/gmalloc.c 2017 mdbcomp merc-src/accumulator.m /^:- import_module mdbcomp.$/ me22b lua-src/test.lua /^ local function test.me22b (one)$/ me_22a lua-src/test.lua /^ function test.me_22a(one, two)$/ @@ -3374,7 +3342,7 @@ module_instance_method ruby-src/test.rb /^ def module_instance_method$/ more= ruby-src/test1.ru /^ :more$/ more_aligned_int c.c 165 morecore_nolock c-src/emacs/src/gmalloc.c /^morecore_nolock (size_t size)$/ -morecore_recursing c-src/emacs/src/gmalloc.c 604 +morecore_recursing c-src/emacs/src/gmalloc.c 605 mouse_syms c-src/emacs/src/keyboard.c 4627 move cp-src/clheir.cpp /^void agent::move(int direction)$/ mprobe c-src/emacs/src/gmalloc.c /^mprobe (void *ptr)$/ @@ -3668,7 +3636,7 @@ pagealignmacro tex-src/texinfo.tex /^\\global\\let\\pagealignmacro=\\chappager$/ pagealignmacro tex-src/texinfo.tex /^\\global\\let\\pagealignmacro=\\chappager}$/ pagebody tex-src/texinfo.tex /^\\def\\pagebody#1{\\vbox to\\pageheight{\\boxmaxdepth=\\/ pagecontents tex-src/texinfo.tex /^\\gdef\\pagecontents#1{\\ifvoid\\topins\\else\\unvbox\\to/ -pagesize c-src/emacs/src/gmalloc.c 1703 +pagesize c-src/emacs/src/gmalloc.c 1707 pagesofar tex-src/texinfo.tex /^\\def\\pagesofar{\\unvbox\\partialpage %$/ pair merc-src/accumulator.m /^:- import_module pair.$/ par tex-src/texinfo.tex /^\\let\\par=\\lisppar$/ @@ -3883,7 +3851,7 @@ readauxfile tex-src/texinfo.tex /^\\def\\readauxfile{%$/ readline c-src/etags.c /^readline (linebuffer *lbp, FILE *stream)$/ readline_internal c-src/etags.c /^readline_internal (linebuffer *lbp, register FILE / realloc c-src/emacs/src/gmalloc.c /^realloc (void *ptr, size_t size)$/ -realloc c-src/emacs/src/gmalloc.c 1716 +realloc c-src/emacs/src/gmalloc.c 1720 realloc c-src/emacs/src/gmalloc.c 65 realloc c-src/emacs/src/gmalloc.c 69 reallochook c-src/emacs/src/gmalloc.c /^reallochook (void *ptr, size_t size)$/ @@ -4107,7 +4075,7 @@ site cp-src/conway.hpp /^ site(int xi, int yi): x(xi), y(yi), alive(0) {/ site cp-src/conway.hpp 5 size c-src/emacs/src/gmalloc.c 156 size c-src/emacs/src/gmalloc.c 163 -size c-src/emacs/src/gmalloc.c 1862 +size c-src/emacs/src/gmalloc.c 1867 size c-src/emacs/src/lisp.h 1364 size c-src/emacs/src/lisp.h 1390 size c-src/etags.c 236 @@ -4188,7 +4156,7 @@ start_polling c-src/emacs/src/keyboard.c /^start_polling (void)$/ start_up prol-src/natded.prolog /^start_up:-$/ startcontents tex-src/texinfo.tex /^\\def\\startcontents#1{%$/ startenumeration tex-src/texinfo.tex /^\\def\\startenumeration#1{%$/ -state_protected_p c-src/emacs/src/gmalloc.c 400 +state_protected_p c-src/emacs/src/gmalloc.c 401 statetable html-src/algrthms.html /^Next$/ staticetags make-src/Makefile /^staticetags:$/ step cp-src/clheir.hpp /^ virtual void step(void) { }$/ diff --git a/test/manual/etags/ETAGS.good_1 b/test/manual/etags/ETAGS.good_1 index 02641980455..1e6550149c4 100644 --- a/test/manual/etags/ETAGS.good_1 +++ b/test/manual/etags/ETAGS.good_1 @@ -642,86 +642,86 @@ enum mcheck_status283,9093 MCHECK_HEAD,288,9271 MCHECK_TAIL 289,9335 struct mstats308,10154 -char *_heapbase;_heapbase355,11831 -malloc_info *_heapinfo;_heapinfo358,11929 -static size_t heapsize;361,11985 -size_t _heapindex;364,12049 -size_t _heaplimit;367,12111 -struct list _fraghead[_fraghead370,12173 -size_t _chunks_used;373,12231 -size_t _bytes_used;374,12252 -size_t _chunks_free;375,12272 -size_t _bytes_free;376,12293 -int __malloc_initialized;379,12342 -size_t __malloc_extra_blocks;381,12369 -static int state_protected_p;400,12914 -static size_t last_state_size;401,12944 -static malloc_info *last_heapinfo;last_heapinfo402,12975 -protect_malloc_state 405,13016 -#define PROTECT_MALLOC_STATE(426,13629 -#define PROTECT_MALLOC_STATE(429,13699 -align 435,13796 -get_contiguous_space 466,14618 -register_heapinfo 497,15327 -pthread_mutex_t _malloc_mutex 517,15881 -pthread_mutex_t _aligned_blocks_mutex 518,15940 -int _malloc_thread_enabled_p;519,16007 -malloc_atfork_handler_prepare 522,16050 -malloc_atfork_handler_parent 529,16141 -malloc_atfork_handler_child 536,16235 -malloc_enable_thread 544,16377 -malloc_initialize_1 563,16963 -__malloc_initialize 594,17795 -static int morecore_recursing;604,17928 -morecore_nolock 609,18068 -_malloc_internal_nolock 722,21586 -_malloc_internal 920,28104 -malloc 932,28249 -_malloc 961,29142 -_free 967,29198 -_realloc 973,29242 -struct alignlist *_aligned_blocks _aligned_blocks1004,30348 -_free_internal_nolock 1009,30477 -_free_internal 1255,38479 -free 1265,38606 -weak_alias 1277,38802 -#define min(1306,39817 -_realloc_internal_nolock 1319,40313 -_realloc_internal 1435,43567 -realloc 1447,43730 -calloc 1478,44899 -#define __sbrk 1513,46048 -__default_morecore 1525,46517 -aligned_alloc 1557,47529 -memalign 1647,49711 -posix_memalign 1656,49916 -static size_t pagesize;1703,51325 -valloc 1706,51357 -#undef malloc1715,51498 -#undef realloc1716,51512 -#undef calloc1717,51527 -#undef aligned_alloc1718,51541 -#undef free1719,51562 -hybrid_malloc 1736,52091 -hybrid_calloc 1744,52196 -hybrid_free 1752,52327 -hybrid_aligned_alloc 1765,52634 -hybrid_realloc 1780,52990 -hybrid_get_current_dir_name 1811,53803 -#define MAGICWORD 1854,55213 -#define MAGICFREE 1855,55268 -#define MAGICBYTE 1856,55323 -#define MALLOCFLOOD 1857,55355 -#define FREEFLOOD 1858,55389 -struct hdr1860,55422 -checkhdr 1867,55588 -freehook 1891,56029 -mallochook 1927,56811 -reallochook 1944,57150 -mabort 1978,57908 -static int mcheck_used 2012,58593 -mcheck 2015,58626 -mprobe 2035,59145 +char *_heapbase;_heapbase356,11852 +malloc_info *_heapinfo;_heapinfo359,11950 +static size_t heapsize;362,12006 +size_t _heapindex;365,12070 +size_t _heaplimit;368,12132 +struct list _fraghead[_fraghead371,12194 +size_t _chunks_used;374,12252 +size_t _bytes_used;375,12273 +size_t _chunks_free;376,12293 +size_t _bytes_free;377,12314 +int __malloc_initialized;380,12363 +size_t __malloc_extra_blocks;382,12390 +static int state_protected_p;401,12935 +static size_t last_state_size;402,12965 +static malloc_info *last_heapinfo;last_heapinfo403,12996 +protect_malloc_state 406,13037 +#define PROTECT_MALLOC_STATE(427,13650 +#define PROTECT_MALLOC_STATE(430,13720 +align 436,13817 +get_contiguous_space 467,14639 +register_heapinfo 498,15348 +pthread_mutex_t _malloc_mutex 518,15902 +pthread_mutex_t _aligned_blocks_mutex 519,15961 +int _malloc_thread_enabled_p;520,16028 +malloc_atfork_handler_prepare 523,16071 +malloc_atfork_handler_parent 530,16162 +malloc_atfork_handler_child 537,16256 +malloc_enable_thread 545,16398 +malloc_initialize_1 564,16984 +__malloc_initialize 595,17816 +static int morecore_recursing;605,17949 +morecore_nolock 610,18089 +_malloc_internal_nolock 723,21607 +_malloc_internal 921,28125 +malloc 933,28270 +_malloc 962,29163 +_free 968,29219 +_realloc 974,29263 +struct alignlist *_aligned_blocks _aligned_blocks1006,30396 +_free_internal_nolock 1011,30525 +_free_internal 1257,38527 +free 1267,38654 +weak_alias 1279,38850 +#define min(1309,39886 +_realloc_internal_nolock 1322,40382 +_realloc_internal 1438,43636 +realloc 1450,43799 +calloc 1481,44973 +#define __sbrk 1516,46115 +__default_morecore 1528,46584 +aligned_alloc 1560,47593 +memalign 1650,49775 +posix_memalign 1659,49980 +static size_t pagesize;1707,51420 +valloc 1710,51452 +#undef malloc1719,51593 +#undef realloc1720,51607 +#undef calloc1721,51622 +#undef aligned_alloc1722,51636 +#undef free1723,51657 +hybrid_malloc 1740,52186 +hybrid_calloc 1748,52291 +hybrid_free 1756,52422 +hybrid_aligned_alloc 1769,52729 +hybrid_realloc 1784,53085 +hybrid_get_current_dir_name 1815,53898 +#define MAGICWORD 1859,55335 +#define MAGICFREE 1860,55390 +#define MAGICBYTE 1861,55445 +#define MALLOCFLOOD 1862,55477 +#define FREEFLOOD 1863,55511 +struct hdr1865,55544 +checkhdr 1872,55710 +freehook 1896,56151 +mallochook 1932,56933 +reallochook 1949,57272 +mabort 1983,58030 +static int mcheck_used 2017,58715 +mcheck 2020,58748 +mprobe 2040,59267 c-src/emacs/src/regex.h,3761 #define _REGEX_H 21,837 @@ -4536,59 +4536,59 @@ y-src/parse.c,520 # define L_GE 27,510 /usr/share/bison/bison.simple,1693 -# define YYSTD(40, -# define YYSTD(42, -# define YYSTACK_ALLOC 50, -# define YYSIZE_T 51, -# define YYSTACK_ALLOC 55, -# define YYSIZE_T 56, -# define YYSTACK_ALLOC 59, -# define YYSTACK_FREE(67, -# define YYSIZE_T 71, -# define YYSIZE_T 75, -# define YYSTACK_ALLOC 78, -# define YYSTACK_FREE 79, -union yyalloc83, -# define YYSTACK_GAP_MAX 93, -# define YYSTACK_BYTES(98, -# define YYSTACK_BYTES(102, -# define YYSTACK_RELOCATE(112, -# define YYSIZE_T 128, -# define YYSIZE_T 131, -# define YYSIZE_T 136, -# define YYSIZE_T 140, -# define YYSIZE_T 145, -#define yyerrok 148, -#define yyclearin 149, -#define YYEMPTY 150, -#define YYEOF 151, -#define YYACCEPT 152, -#define YYABORT 153, -#define YYERROR 154, -#define YYFAIL 158, -#define YYRECOVERING(159, -#define YYBACKUP(160, -#define YYTERROR 177, -#define YYERRCODE 178, -# define YYLLOC_DEFAULT(189, -# define YYLEX 200, -# define YYLEX 202, -# define YYLEX 206, -# define YYLEX 208, -# define YYLEX 212, -# define YYFPRINTF 225, -# define YYDPRINTF(228, -int yydebug;237, -# define YYDPRINTF(239, -# define YYINITDEPTH 244, -# undef YYMAXDEPTH255, -# define YYMAXDEPTH 259, -# define yymemcpy 264, -yymemcpy 271, -# define yystrlen 293, -yystrlen 298, -# define yystpcpy 316, -yystpcpy 322, +# define YYSTD(41, +# define YYSTD(43, +# define YYSTACK_ALLOC 51, +# define YYSIZE_T 52, +# define YYSTACK_ALLOC 56, +# define YYSIZE_T 57, +# define YYSTACK_ALLOC 60, +# define YYSTACK_FREE(68, +# define YYSIZE_T 72, +# define YYSIZE_T 76, +# define YYSTACK_ALLOC 79, +# define YYSTACK_FREE 80, +union yyalloc84, +# define YYSTACK_GAP_MAX 94, +# define YYSTACK_BYTES(99, +# define YYSTACK_BYTES(103, +# define YYSTACK_RELOCATE(113, +# define YYSIZE_T 129, +# define YYSIZE_T 132, +# define YYSIZE_T 137, +# define YYSIZE_T 141, +# define YYSIZE_T 146, +#define yyerrok 149, +#define yyclearin 150, +#define YYEMPTY 151, +#define YYEOF 152, +#define YYACCEPT 153, +#define YYABORT 154, +#define YYERROR 155, +#define YYFAIL 159, +#define YYRECOVERING(160, +#define YYBACKUP(161, +#define YYTERROR 178, +#define YYERRCODE 179, +# define YYLLOC_DEFAULT(190, +# define YYLEX 201, +# define YYLEX 203, +# define YYLEX 207, +# define YYLEX 209, +# define YYLEX 213, +# define YYFPRINTF 226, +# define YYDPRINTF(229, +int yydebug;238, +# define YYDPRINTF(240, +# define YYINITDEPTH 245, +# undef YYMAXDEPTH256, +# define YYMAXDEPTH 260, +# define yymemcpy 265, +yymemcpy 272, +# define yystrlen 294, +yystrlen 299, +# define yystpcpy 317, +yystpcpy 323, # define YYPARSE_PARAM_ARG 351, # define YYPARSE_PARAM_DECL352, # define YYPARSE_PARAM_ARG 354, diff --git a/test/manual/etags/ETAGS.good_2 b/test/manual/etags/ETAGS.good_2 index 3b4d04f9a3f..f1613437826 100644 --- a/test/manual/etags/ETAGS.good_2 +++ b/test/manual/etags/ETAGS.good_2 @@ -751,109 +751,109 @@ extern void muntrace 305,10083 struct mstats308,10154 extern struct mstats mstats 318,10519 extern void memory_warnings 321,10626 -void *(*__malloc_hook)__malloc_hook352,11745 -char *_heapbase;_heapbase355,11831 -malloc_info *_heapinfo;_heapinfo358,11929 -static size_t heapsize;361,11985 -size_t _heapindex;364,12049 -size_t _heaplimit;367,12111 -struct list _fraghead[_fraghead370,12173 -size_t _chunks_used;373,12231 -size_t _bytes_used;374,12252 -size_t _chunks_free;375,12272 -size_t _bytes_free;376,12293 -int __malloc_initialized;379,12342 -size_t __malloc_extra_blocks;381,12369 -void (*__malloc_initialize_hook)__malloc_initialize_hook383,12400 -void (*__after_morecore_hook)__after_morecore_hook384,12441 -static int state_protected_p;400,12914 -static size_t last_state_size;401,12944 -static malloc_info *last_heapinfo;last_heapinfo402,12975 -protect_malloc_state 405,13016 -#define PROTECT_MALLOC_STATE(426,13629 -#define PROTECT_MALLOC_STATE(429,13699 -align 435,13796 -get_contiguous_space 466,14618 -register_heapinfo 497,15327 -pthread_mutex_t _malloc_mutex 517,15881 -pthread_mutex_t _aligned_blocks_mutex 518,15940 -int _malloc_thread_enabled_p;519,16007 -malloc_atfork_handler_prepare 522,16050 -malloc_atfork_handler_parent 529,16141 -malloc_atfork_handler_child 536,16235 -malloc_enable_thread 544,16377 -malloc_initialize_1 563,16963 -__malloc_initialize 594,17795 -static int morecore_recursing;604,17928 -morecore_nolock 609,18068 -_malloc_internal_nolock 722,21586 -_malloc_internal 920,28104 -malloc 932,28249 -extern void *_malloc _malloc956,29035 -extern void _free 957,29066 -extern void *_realloc _realloc958,29094 -_malloc 961,29142 -_free 967,29198 -_realloc 973,29242 -void (*__free_hook)__free_hook1001,30262 -struct alignlist *_aligned_blocks _aligned_blocks1004,30348 -_free_internal_nolock 1009,30477 -_free_internal 1255,38479 -free 1265,38606 -weak_alias 1277,38802 -#define min(1306,39817 -void *(*__realloc_hook)__realloc_hook1310,39902 -_realloc_internal_nolock 1319,40313 -_realloc_internal 1435,43567 -realloc 1447,43730 -calloc 1478,44899 -#define __sbrk 1513,46048 -extern void *__sbrk __sbrk1518,46253 -__default_morecore 1525,46517 -void *(*__memalign_hook)__memalign_hook1554,47463 -aligned_alloc 1557,47529 -memalign 1647,49711 -posix_memalign 1656,49916 -extern void *valloc valloc1695,51148 -extern int getpagesize 1700,51286 -static size_t pagesize;1703,51325 -valloc 1706,51357 -#undef malloc1715,51498 -#undef realloc1716,51512 -#undef calloc1717,51527 -#undef aligned_alloc1718,51541 -#undef free1719,51562 -extern void *malloc malloc1722,51617 -extern void *realloc realloc1723,51652 -extern void *calloc calloc1724,51699 -extern void free 1725,51748 -extern void *aligned_alloc aligned_alloc1727,51804 -extern int posix_memalign 1729,51898 -hybrid_malloc 1736,52091 -hybrid_calloc 1744,52196 -hybrid_free 1752,52327 -hybrid_aligned_alloc 1765,52634 -hybrid_realloc 1780,52990 -char *gget_current_dir_name gget_current_dir_name1808,53759 -hybrid_get_current_dir_name 1811,53803 -static void (*old_free_hook)old_free_hook1846,54928 -static void *(*old_malloc_hook)old_malloc_hook1847,54970 -static void *(*old_realloc_hook)old_realloc_hook1848,55017 -static void (*abortfunc)abortfunc1851,55131 -#define MAGICWORD 1854,55213 -#define MAGICFREE 1855,55268 -#define MAGICBYTE 1856,55323 -#define MALLOCFLOOD 1857,55355 -#define FREEFLOOD 1858,55389 -struct hdr1860,55422 -checkhdr 1867,55588 -freehook 1891,56029 -mallochook 1927,56811 -reallochook 1944,57150 -mabort 1978,57908 -static int mcheck_used 2012,58593 -mcheck 2015,58626 -mprobe 2035,59145 +void *(*__malloc_hook)__malloc_hook353,11766 +char *_heapbase;_heapbase356,11852 +malloc_info *_heapinfo;_heapinfo359,11950 +static size_t heapsize;362,12006 +size_t _heapindex;365,12070 +size_t _heaplimit;368,12132 +struct list _fraghead[_fraghead371,12194 +size_t _chunks_used;374,12252 +size_t _bytes_used;375,12273 +size_t _chunks_free;376,12293 +size_t _bytes_free;377,12314 +int __malloc_initialized;380,12363 +size_t __malloc_extra_blocks;382,12390 +void (*__malloc_initialize_hook)__malloc_initialize_hook384,12421 +void (*__after_morecore_hook)__after_morecore_hook385,12462 +static int state_protected_p;401,12935 +static size_t last_state_size;402,12965 +static malloc_info *last_heapinfo;last_heapinfo403,12996 +protect_malloc_state 406,13037 +#define PROTECT_MALLOC_STATE(427,13650 +#define PROTECT_MALLOC_STATE(430,13720 +align 436,13817 +get_contiguous_space 467,14639 +register_heapinfo 498,15348 +pthread_mutex_t _malloc_mutex 518,15902 +pthread_mutex_t _aligned_blocks_mutex 519,15961 +int _malloc_thread_enabled_p;520,16028 +malloc_atfork_handler_prepare 523,16071 +malloc_atfork_handler_parent 530,16162 +malloc_atfork_handler_child 537,16256 +malloc_enable_thread 545,16398 +malloc_initialize_1 564,16984 +__malloc_initialize 595,17816 +static int morecore_recursing;605,17949 +morecore_nolock 610,18089 +_malloc_internal_nolock 723,21607 +_malloc_internal 921,28125 +malloc 933,28270 +extern void *_malloc _malloc957,29056 +extern void _free 958,29087 +extern void *_realloc _realloc959,29115 +_malloc 962,29163 +_free 968,29219 +_realloc 974,29263 +void (*__free_hook)__free_hook1003,30310 +struct alignlist *_aligned_blocks _aligned_blocks1006,30396 +_free_internal_nolock 1011,30525 +_free_internal 1257,38527 +free 1267,38654 +weak_alias 1279,38850 +#define min(1309,39886 +void *(*__realloc_hook)__realloc_hook1313,39971 +_realloc_internal_nolock 1322,40382 +_realloc_internal 1438,43636 +realloc 1450,43799 +calloc 1481,44973 +#define __sbrk 1516,46115 +extern void *__sbrk __sbrk1521,46320 +__default_morecore 1528,46584 +void *(*__memalign_hook)__memalign_hook1557,47527 +aligned_alloc 1560,47593 +memalign 1650,49775 +posix_memalign 1659,49980 +extern void *valloc valloc1699,51243 +extern int getpagesize 1704,51381 +static size_t pagesize;1707,51420 +valloc 1710,51452 +#undef malloc1719,51593 +#undef realloc1720,51607 +#undef calloc1721,51622 +#undef aligned_alloc1722,51636 +#undef free1723,51657 +extern void *malloc malloc1726,51712 +extern void *realloc realloc1727,51747 +extern void *calloc calloc1728,51794 +extern void free 1729,51843 +extern void *aligned_alloc aligned_alloc1731,51899 +extern int posix_memalign 1733,51993 +hybrid_malloc 1740,52186 +hybrid_calloc 1748,52291 +hybrid_free 1756,52422 +hybrid_aligned_alloc 1769,52729 +hybrid_realloc 1784,53085 +char *gget_current_dir_name gget_current_dir_name1812,53854 +hybrid_get_current_dir_name 1815,53898 +static void (*old_free_hook)old_free_hook1851,55050 +static void *(*old_malloc_hook)old_malloc_hook1852,55092 +static void *(*old_realloc_hook)old_realloc_hook1853,55139 +static void (*abortfunc)abortfunc1856,55253 +#define MAGICWORD 1859,55335 +#define MAGICFREE 1860,55390 +#define MAGICBYTE 1861,55445 +#define MALLOCFLOOD 1862,55477 +#define FREEFLOOD 1863,55511 +struct hdr1865,55544 +checkhdr 1872,55710 +freehook 1896,56151 +mallochook 1932,56933 +reallochook 1949,57272 +mabort 1983,58030 +static int mcheck_used 2017,58715 +mcheck 2020,58748 +mprobe 2040,59267 c-src/emacs/src/regex.h,4576 #define _REGEX_H 21,837 @@ -5185,59 +5185,59 @@ y-src/parse.c,520 # define L_GE 27,510 /usr/share/bison/bison.simple,1729 -# define YYSTD(40, -# define YYSTD(42, -# define YYSTACK_ALLOC 50, -# define YYSIZE_T 51, -# define YYSTACK_ALLOC 55, -# define YYSIZE_T 56, -# define YYSTACK_ALLOC 59, -# define YYSTACK_FREE(67, -# define YYSIZE_T 71, -# define YYSIZE_T 75, -# define YYSTACK_ALLOC 78, -# define YYSTACK_FREE 79, -union yyalloc83, -# define YYSTACK_GAP_MAX 93, -# define YYSTACK_BYTES(98, -# define YYSTACK_BYTES(102, -# define YYSTACK_RELOCATE(112, -# define YYSIZE_T 128, -# define YYSIZE_T 131, -# define YYSIZE_T 136, -# define YYSIZE_T 140, -# define YYSIZE_T 145, -#define yyerrok 148, -#define yyclearin 149, -#define YYEMPTY 150, -#define YYEOF 151, -#define YYACCEPT 152, -#define YYABORT 153, -#define YYERROR 154, -#define YYFAIL 158, -#define YYRECOVERING(159, -#define YYBACKUP(160, -#define YYTERROR 177, -#define YYERRCODE 178, -# define YYLLOC_DEFAULT(189, -# define YYLEX 200, -# define YYLEX 202, -# define YYLEX 206, -# define YYLEX 208, -# define YYLEX 212, -# define YYFPRINTF 225, -# define YYDPRINTF(228, -int yydebug;237, -# define YYDPRINTF(239, -# define YYINITDEPTH 244, -# undef YYMAXDEPTH255, -# define YYMAXDEPTH 259, -# define yymemcpy 264, -yymemcpy 271, -# define yystrlen 293, -yystrlen 298, -# define yystpcpy 316, -yystpcpy 322, +# define YYSTD(41, +# define YYSTD(43, +# define YYSTACK_ALLOC 51, +# define YYSIZE_T 52, +# define YYSTACK_ALLOC 56, +# define YYSIZE_T 57, +# define YYSTACK_ALLOC 60, +# define YYSTACK_FREE(68, +# define YYSIZE_T 72, +# define YYSIZE_T 76, +# define YYSTACK_ALLOC 79, +# define YYSTACK_FREE 80, +union yyalloc84, +# define YYSTACK_GAP_MAX 94, +# define YYSTACK_BYTES(99, +# define YYSTACK_BYTES(103, +# define YYSTACK_RELOCATE(113, +# define YYSIZE_T 129, +# define YYSIZE_T 132, +# define YYSIZE_T 137, +# define YYSIZE_T 141, +# define YYSIZE_T 146, +#define yyerrok 149, +#define yyclearin 150, +#define YYEMPTY 151, +#define YYEOF 152, +#define YYACCEPT 153, +#define YYABORT 154, +#define YYERROR 155, +#define YYFAIL 159, +#define YYRECOVERING(160, +#define YYBACKUP(161, +#define YYTERROR 178, +#define YYERRCODE 179, +# define YYLLOC_DEFAULT(190, +# define YYLEX 201, +# define YYLEX 203, +# define YYLEX 207, +# define YYLEX 209, +# define YYLEX 213, +# define YYFPRINTF 226, +# define YYDPRINTF(229, +int yydebug;238, +# define YYDPRINTF(240, +# define YYINITDEPTH 245, +# undef YYMAXDEPTH256, +# define YYMAXDEPTH 260, +# define yymemcpy 265, +yymemcpy 272, +# define yystrlen 294, +yystrlen 299, +# define yystpcpy 317, +yystpcpy 323, # define YYPARSE_PARAM_ARG 351, # define YYPARSE_PARAM_DECL352, # define YYPARSE_PARAM_ARG 354, diff --git a/test/manual/etags/ETAGS.good_3 b/test/manual/etags/ETAGS.good_3 index 79ee70fd1d0..71abe582b7e 100644 --- a/test/manual/etags/ETAGS.good_3 +++ b/test/manual/etags/ETAGS.good_3 @@ -732,88 +732,88 @@ struct mstats308,10154 size_t bytes_used;312,10286 size_t chunks_free;313,10352 size_t bytes_free;314,10407 -char *_heapbase;_heapbase355,11831 -malloc_info *_heapinfo;_heapinfo358,11929 -static size_t heapsize;361,11985 -size_t _heapindex;364,12049 -size_t _heaplimit;367,12111 -struct list _fraghead[_fraghead370,12173 -size_t _chunks_used;373,12231 -size_t _bytes_used;374,12252 -size_t _chunks_free;375,12272 -size_t _bytes_free;376,12293 -int __malloc_initialized;379,12342 -size_t __malloc_extra_blocks;381,12369 -static int state_protected_p;400,12914 -static size_t last_state_size;401,12944 -static malloc_info *last_heapinfo;last_heapinfo402,12975 -protect_malloc_state 405,13016 -#define PROTECT_MALLOC_STATE(426,13629 -#define PROTECT_MALLOC_STATE(429,13699 -align 435,13796 -get_contiguous_space 466,14618 -register_heapinfo 497,15327 -pthread_mutex_t _malloc_mutex 517,15881 -pthread_mutex_t _aligned_blocks_mutex 518,15940 -int _malloc_thread_enabled_p;519,16007 -malloc_atfork_handler_prepare 522,16050 -malloc_atfork_handler_parent 529,16141 -malloc_atfork_handler_child 536,16235 -malloc_enable_thread 544,16377 -malloc_initialize_1 563,16963 -__malloc_initialize 594,17795 -static int morecore_recursing;604,17928 -morecore_nolock 609,18068 -_malloc_internal_nolock 722,21586 -_malloc_internal 920,28104 -malloc 932,28249 -_malloc 961,29142 -_free 967,29198 -_realloc 973,29242 -struct alignlist *_aligned_blocks _aligned_blocks1004,30348 -_free_internal_nolock 1009,30477 -_free_internal 1255,38479 -free 1265,38606 -weak_alias 1277,38802 -#define min(1306,39817 -_realloc_internal_nolock 1319,40313 -_realloc_internal 1435,43567 -realloc 1447,43730 -calloc 1478,44899 -#define __sbrk 1513,46048 -__default_morecore 1525,46517 -aligned_alloc 1557,47529 -memalign 1647,49711 -posix_memalign 1656,49916 -static size_t pagesize;1703,51325 -valloc 1706,51357 -#undef malloc1715,51498 -#undef realloc1716,51512 -#undef calloc1717,51527 -#undef aligned_alloc1718,51541 -#undef free1719,51562 -hybrid_malloc 1736,52091 -hybrid_calloc 1744,52196 -hybrid_free 1752,52327 -hybrid_aligned_alloc 1765,52634 -hybrid_realloc 1780,52990 -hybrid_get_current_dir_name 1811,53803 -#define MAGICWORD 1854,55213 -#define MAGICFREE 1855,55268 -#define MAGICBYTE 1856,55323 -#define MALLOCFLOOD 1857,55355 -#define FREEFLOOD 1858,55389 -struct hdr1860,55422 - size_t size;1862,55437 - size_t magic;1863,55491 -checkhdr 1867,55588 -freehook 1891,56029 -mallochook 1927,56811 -reallochook 1944,57150 -mabort 1978,57908 -static int mcheck_used 2012,58593 -mcheck 2015,58626 -mprobe 2035,59145 +char *_heapbase;_heapbase356,11852 +malloc_info *_heapinfo;_heapinfo359,11950 +static size_t heapsize;362,12006 +size_t _heapindex;365,12070 +size_t _heaplimit;368,12132 +struct list _fraghead[_fraghead371,12194 +size_t _chunks_used;374,12252 +size_t _bytes_used;375,12273 +size_t _chunks_free;376,12293 +size_t _bytes_free;377,12314 +int __malloc_initialized;380,12363 +size_t __malloc_extra_blocks;382,12390 +static int state_protected_p;401,12935 +static size_t last_state_size;402,12965 +static malloc_info *last_heapinfo;last_heapinfo403,12996 +protect_malloc_state 406,13037 +#define PROTECT_MALLOC_STATE(427,13650 +#define PROTECT_MALLOC_STATE(430,13720 +align 436,13817 +get_contiguous_space 467,14639 +register_heapinfo 498,15348 +pthread_mutex_t _malloc_mutex 518,15902 +pthread_mutex_t _aligned_blocks_mutex 519,15961 +int _malloc_thread_enabled_p;520,16028 +malloc_atfork_handler_prepare 523,16071 +malloc_atfork_handler_parent 530,16162 +malloc_atfork_handler_child 537,16256 +malloc_enable_thread 545,16398 +malloc_initialize_1 564,16984 +__malloc_initialize 595,17816 +static int morecore_recursing;605,17949 +morecore_nolock 610,18089 +_malloc_internal_nolock 723,21607 +_malloc_internal 921,28125 +malloc 933,28270 +_malloc 962,29163 +_free 968,29219 +_realloc 974,29263 +struct alignlist *_aligned_blocks _aligned_blocks1006,30396 +_free_internal_nolock 1011,30525 +_free_internal 1257,38527 +free 1267,38654 +weak_alias 1279,38850 +#define min(1309,39886 +_realloc_internal_nolock 1322,40382 +_realloc_internal 1438,43636 +realloc 1450,43799 +calloc 1481,44973 +#define __sbrk 1516,46115 +__default_morecore 1528,46584 +aligned_alloc 1560,47593 +memalign 1650,49775 +posix_memalign 1659,49980 +static size_t pagesize;1707,51420 +valloc 1710,51452 +#undef malloc1719,51593 +#undef realloc1720,51607 +#undef calloc1721,51622 +#undef aligned_alloc1722,51636 +#undef free1723,51657 +hybrid_malloc 1740,52186 +hybrid_calloc 1748,52291 +hybrid_free 1756,52422 +hybrid_aligned_alloc 1769,52729 +hybrid_realloc 1784,53085 +hybrid_get_current_dir_name 1815,53898 +#define MAGICWORD 1859,55335 +#define MAGICFREE 1860,55390 +#define MAGICBYTE 1861,55445 +#define MALLOCFLOOD 1862,55477 +#define FREEFLOOD 1863,55511 +struct hdr1865,55544 + size_t size;1867,55559 + size_t magic;1868,55613 +checkhdr 1872,55710 +freehook 1896,56151 +mallochook 1932,56933 +reallochook 1949,57272 +mabort 1983,58030 +static int mcheck_used 2017,58715 +mcheck 2020,58748 +mprobe 2040,59267 c-src/emacs/src/regex.h,4485 #define _REGEX_H 21,837 @@ -4958,62 +4958,62 @@ y-src/parse.c,520 # define L_GE 27,510 /usr/share/bison/bison.simple,1751 -# define YYSTD(40, -# define YYSTD(42, -# define YYSTACK_ALLOC 50, -# define YYSIZE_T 51, -# define YYSTACK_ALLOC 55, -# define YYSIZE_T 56, -# define YYSTACK_ALLOC 59, -# define YYSTACK_FREE(67, -# define YYSIZE_T 71, -# define YYSIZE_T 75, -# define YYSTACK_ALLOC 78, -# define YYSTACK_FREE 79, -union yyalloc83, - short yyss;85, - YYSTYPE yyvs;86, - YYLTYPE yyls;88, -# define YYSTACK_GAP_MAX 93, -# define YYSTACK_BYTES(98, -# define YYSTACK_BYTES(102, -# define YYSTACK_RELOCATE(112, -# define YYSIZE_T 128, -# define YYSIZE_T 131, -# define YYSIZE_T 136, -# define YYSIZE_T 140, -# define YYSIZE_T 145, -#define yyerrok 148, -#define yyclearin 149, -#define YYEMPTY 150, -#define YYEOF 151, -#define YYACCEPT 152, -#define YYABORT 153, -#define YYERROR 154, -#define YYFAIL 158, -#define YYRECOVERING(159, -#define YYBACKUP(160, -#define YYTERROR 177, -#define YYERRCODE 178, -# define YYLLOC_DEFAULT(189, -# define YYLEX 200, -# define YYLEX 202, -# define YYLEX 206, -# define YYLEX 208, -# define YYLEX 212, -# define YYFPRINTF 225, -# define YYDPRINTF(228, -int yydebug;237, -# define YYDPRINTF(239, -# define YYINITDEPTH 244, -# undef YYMAXDEPTH255, -# define YYMAXDEPTH 259, -# define yymemcpy 264, -yymemcpy 271, -# define yystrlen 293, -yystrlen 298, -# define yystpcpy 316, -yystpcpy 322, +# define YYSTD(41, +# define YYSTD(43, +# define YYSTACK_ALLOC 51, +# define YYSIZE_T 52, +# define YYSTACK_ALLOC 56, +# define YYSIZE_T 57, +# define YYSTACK_ALLOC 60, +# define YYSTACK_FREE(68, +# define YYSIZE_T 72, +# define YYSIZE_T 76, +# define YYSTACK_ALLOC 79, +# define YYSTACK_FREE 80, +union yyalloc84, + short yyss;86, + YYSTYPE yyvs;87, + YYLTYPE yyls;89, +# define YYSTACK_GAP_MAX 94, +# define YYSTACK_BYTES(99, +# define YYSTACK_BYTES(103, +# define YYSTACK_RELOCATE(113, +# define YYSIZE_T 129, +# define YYSIZE_T 132, +# define YYSIZE_T 137, +# define YYSIZE_T 141, +# define YYSIZE_T 146, +#define yyerrok 149, +#define yyclearin 150, +#define YYEMPTY 151, +#define YYEOF 152, +#define YYACCEPT 153, +#define YYABORT 154, +#define YYERROR 155, +#define YYFAIL 159, +#define YYRECOVERING(160, +#define YYBACKUP(161, +#define YYTERROR 178, +#define YYERRCODE 179, +# define YYLLOC_DEFAULT(190, +# define YYLEX 201, +# define YYLEX 203, +# define YYLEX 207, +# define YYLEX 209, +# define YYLEX 213, +# define YYFPRINTF 226, +# define YYDPRINTF(229, +int yydebug;238, +# define YYDPRINTF(240, +# define YYINITDEPTH 245, +# undef YYMAXDEPTH256, +# define YYMAXDEPTH 260, +# define yymemcpy 265, +yymemcpy 272, +# define yystrlen 294, +yystrlen 299, +# define yystpcpy 317, +yystpcpy 323, # define YYPARSE_PARAM_ARG 351, # define YYPARSE_PARAM_DECL352, # define YYPARSE_PARAM_ARG 354, diff --git a/test/manual/etags/ETAGS.good_4 b/test/manual/etags/ETAGS.good_4 index 0cb17fbbdb2..56df447fd4b 100644 --- a/test/manual/etags/ETAGS.good_4 +++ b/test/manual/etags/ETAGS.good_4 @@ -664,86 +664,86 @@ enum mcheck_status283,9093 MCHECK_HEAD,288,9271 MCHECK_TAIL 289,9335 struct mstats308,10154 -char *_heapbase;_heapbase355,11831 -malloc_info *_heapinfo;_heapinfo358,11929 -static size_t heapsize;361,11985 -size_t _heapindex;364,12049 -size_t _heaplimit;367,12111 -struct list _fraghead[_fraghead370,12173 -size_t _chunks_used;373,12231 -size_t _bytes_used;374,12252 -size_t _chunks_free;375,12272 -size_t _bytes_free;376,12293 -int __malloc_initialized;379,12342 -size_t __malloc_extra_blocks;381,12369 -static int state_protected_p;400,12914 -static size_t last_state_size;401,12944 -static malloc_info *last_heapinfo;last_heapinfo402,12975 -protect_malloc_state 405,13016 -#define PROTECT_MALLOC_STATE(426,13629 -#define PROTECT_MALLOC_STATE(429,13699 -align 435,13796 -get_contiguous_space 466,14618 -register_heapinfo 497,15327 -pthread_mutex_t _malloc_mutex 517,15881 -pthread_mutex_t _aligned_blocks_mutex 518,15940 -int _malloc_thread_enabled_p;519,16007 -malloc_atfork_handler_prepare 522,16050 -malloc_atfork_handler_parent 529,16141 -malloc_atfork_handler_child 536,16235 -malloc_enable_thread 544,16377 -malloc_initialize_1 563,16963 -__malloc_initialize 594,17795 -static int morecore_recursing;604,17928 -morecore_nolock 609,18068 -_malloc_internal_nolock 722,21586 -_malloc_internal 920,28104 -malloc 932,28249 -_malloc 961,29142 -_free 967,29198 -_realloc 973,29242 -struct alignlist *_aligned_blocks _aligned_blocks1004,30348 -_free_internal_nolock 1009,30477 -_free_internal 1255,38479 -free 1265,38606 -weak_alias 1277,38802 -#define min(1306,39817 -_realloc_internal_nolock 1319,40313 -_realloc_internal 1435,43567 -realloc 1447,43730 -calloc 1478,44899 -#define __sbrk 1513,46048 -__default_morecore 1525,46517 -aligned_alloc 1557,47529 -memalign 1647,49711 -posix_memalign 1656,49916 -static size_t pagesize;1703,51325 -valloc 1706,51357 -#undef malloc1715,51498 -#undef realloc1716,51512 -#undef calloc1717,51527 -#undef aligned_alloc1718,51541 -#undef free1719,51562 -hybrid_malloc 1736,52091 -hybrid_calloc 1744,52196 -hybrid_free 1752,52327 -hybrid_aligned_alloc 1765,52634 -hybrid_realloc 1780,52990 -hybrid_get_current_dir_name 1811,53803 -#define MAGICWORD 1854,55213 -#define MAGICFREE 1855,55268 -#define MAGICBYTE 1856,55323 -#define MALLOCFLOOD 1857,55355 -#define FREEFLOOD 1858,55389 -struct hdr1860,55422 -checkhdr 1867,55588 -freehook 1891,56029 -mallochook 1927,56811 -reallochook 1944,57150 -mabort 1978,57908 -static int mcheck_used 2012,58593 -mcheck 2015,58626 -mprobe 2035,59145 +char *_heapbase;_heapbase356,11852 +malloc_info *_heapinfo;_heapinfo359,11950 +static size_t heapsize;362,12006 +size_t _heapindex;365,12070 +size_t _heaplimit;368,12132 +struct list _fraghead[_fraghead371,12194 +size_t _chunks_used;374,12252 +size_t _bytes_used;375,12273 +size_t _chunks_free;376,12293 +size_t _bytes_free;377,12314 +int __malloc_initialized;380,12363 +size_t __malloc_extra_blocks;382,12390 +static int state_protected_p;401,12935 +static size_t last_state_size;402,12965 +static malloc_info *last_heapinfo;last_heapinfo403,12996 +protect_malloc_state 406,13037 +#define PROTECT_MALLOC_STATE(427,13650 +#define PROTECT_MALLOC_STATE(430,13720 +align 436,13817 +get_contiguous_space 467,14639 +register_heapinfo 498,15348 +pthread_mutex_t _malloc_mutex 518,15902 +pthread_mutex_t _aligned_blocks_mutex 519,15961 +int _malloc_thread_enabled_p;520,16028 +malloc_atfork_handler_prepare 523,16071 +malloc_atfork_handler_parent 530,16162 +malloc_atfork_handler_child 537,16256 +malloc_enable_thread 545,16398 +malloc_initialize_1 564,16984 +__malloc_initialize 595,17816 +static int morecore_recursing;605,17949 +morecore_nolock 610,18089 +_malloc_internal_nolock 723,21607 +_malloc_internal 921,28125 +malloc 933,28270 +_malloc 962,29163 +_free 968,29219 +_realloc 974,29263 +struct alignlist *_aligned_blocks _aligned_blocks1006,30396 +_free_internal_nolock 1011,30525 +_free_internal 1257,38527 +free 1267,38654 +weak_alias 1279,38850 +#define min(1309,39886 +_realloc_internal_nolock 1322,40382 +_realloc_internal 1438,43636 +realloc 1450,43799 +calloc 1481,44973 +#define __sbrk 1516,46115 +__default_morecore 1528,46584 +aligned_alloc 1560,47593 +memalign 1650,49775 +posix_memalign 1659,49980 +static size_t pagesize;1707,51420 +valloc 1710,51452 +#undef malloc1719,51593 +#undef realloc1720,51607 +#undef calloc1721,51622 +#undef aligned_alloc1722,51636 +#undef free1723,51657 +hybrid_malloc 1740,52186 +hybrid_calloc 1748,52291 +hybrid_free 1756,52422 +hybrid_aligned_alloc 1769,52729 +hybrid_realloc 1784,53085 +hybrid_get_current_dir_name 1815,53898 +#define MAGICWORD 1859,55335 +#define MAGICFREE 1860,55390 +#define MAGICBYTE 1861,55445 +#define MALLOCFLOOD 1862,55477 +#define FREEFLOOD 1863,55511 +struct hdr1865,55544 +checkhdr 1872,55710 +freehook 1896,56151 +mallochook 1932,56933 +reallochook 1949,57272 +mabort 1983,58030 +static int mcheck_used 2017,58715 +mcheck 2020,58748 +mprobe 2040,59267 c-src/emacs/src/regex.h,3761 #define _REGEX_H 21,837 @@ -4698,59 +4698,59 @@ y-src/parse.c,520 # define L_GE 27,510 /usr/share/bison/bison.simple,1693 -# define YYSTD(40, -# define YYSTD(42, -# define YYSTACK_ALLOC 50, -# define YYSIZE_T 51, -# define YYSTACK_ALLOC 55, -# define YYSIZE_T 56, -# define YYSTACK_ALLOC 59, -# define YYSTACK_FREE(67, -# define YYSIZE_T 71, -# define YYSIZE_T 75, -# define YYSTACK_ALLOC 78, -# define YYSTACK_FREE 79, -union yyalloc83, -# define YYSTACK_GAP_MAX 93, -# define YYSTACK_BYTES(98, -# define YYSTACK_BYTES(102, -# define YYSTACK_RELOCATE(112, -# define YYSIZE_T 128, -# define YYSIZE_T 131, -# define YYSIZE_T 136, -# define YYSIZE_T 140, -# define YYSIZE_T 145, -#define yyerrok 148, -#define yyclearin 149, -#define YYEMPTY 150, -#define YYEOF 151, -#define YYACCEPT 152, -#define YYABORT 153, -#define YYERROR 154, -#define YYFAIL 158, -#define YYRECOVERING(159, -#define YYBACKUP(160, -#define YYTERROR 177, -#define YYERRCODE 178, -# define YYLLOC_DEFAULT(189, -# define YYLEX 200, -# define YYLEX 202, -# define YYLEX 206, -# define YYLEX 208, -# define YYLEX 212, -# define YYFPRINTF 225, -# define YYDPRINTF(228, -int yydebug;237, -# define YYDPRINTF(239, -# define YYINITDEPTH 244, -# undef YYMAXDEPTH255, -# define YYMAXDEPTH 259, -# define yymemcpy 264, -yymemcpy 271, -# define yystrlen 293, -yystrlen 298, -# define yystpcpy 316, -yystpcpy 322, +# define YYSTD(41, +# define YYSTD(43, +# define YYSTACK_ALLOC 51, +# define YYSIZE_T 52, +# define YYSTACK_ALLOC 56, +# define YYSIZE_T 57, +# define YYSTACK_ALLOC 60, +# define YYSTACK_FREE(68, +# define YYSIZE_T 72, +# define YYSIZE_T 76, +# define YYSTACK_ALLOC 79, +# define YYSTACK_FREE 80, +union yyalloc84, +# define YYSTACK_GAP_MAX 94, +# define YYSTACK_BYTES(99, +# define YYSTACK_BYTES(103, +# define YYSTACK_RELOCATE(113, +# define YYSIZE_T 129, +# define YYSIZE_T 132, +# define YYSIZE_T 137, +# define YYSIZE_T 141, +# define YYSIZE_T 146, +#define yyerrok 149, +#define yyclearin 150, +#define YYEMPTY 151, +#define YYEOF 152, +#define YYACCEPT 153, +#define YYABORT 154, +#define YYERROR 155, +#define YYFAIL 159, +#define YYRECOVERING(160, +#define YYBACKUP(161, +#define YYTERROR 178, +#define YYERRCODE 179, +# define YYLLOC_DEFAULT(190, +# define YYLEX 201, +# define YYLEX 203, +# define YYLEX 207, +# define YYLEX 209, +# define YYLEX 213, +# define YYFPRINTF 226, +# define YYDPRINTF(229, +int yydebug;238, +# define YYDPRINTF(240, +# define YYINITDEPTH 245, +# undef YYMAXDEPTH256, +# define YYMAXDEPTH 260, +# define yymemcpy 265, +yymemcpy 272, +# define yystrlen 294, +yystrlen 299, +# define yystpcpy 317, +yystpcpy 323, # define YYPARSE_PARAM_ARG 351, # define YYPARSE_PARAM_DECL352, # define YYPARSE_PARAM_ARG 354, diff --git a/test/manual/etags/ETAGS.good_5 b/test/manual/etags/ETAGS.good_5 index 42f30f2fe19..7375ec3b5b5 100644 --- a/test/manual/etags/ETAGS.good_5 +++ b/test/manual/etags/ETAGS.good_5 @@ -863,111 +863,111 @@ struct mstats308,10154 size_t bytes_free;314,10407 extern struct mstats mstats 318,10519 extern void memory_warnings 321,10626 -void *(*__malloc_hook)__malloc_hook352,11745 -char *_heapbase;_heapbase355,11831 -malloc_info *_heapinfo;_heapinfo358,11929 -static size_t heapsize;361,11985 -size_t _heapindex;364,12049 -size_t _heaplimit;367,12111 -struct list _fraghead[_fraghead370,12173 -size_t _chunks_used;373,12231 -size_t _bytes_used;374,12252 -size_t _chunks_free;375,12272 -size_t _bytes_free;376,12293 -int __malloc_initialized;379,12342 -size_t __malloc_extra_blocks;381,12369 -void (*__malloc_initialize_hook)__malloc_initialize_hook383,12400 -void (*__after_morecore_hook)__after_morecore_hook384,12441 -static int state_protected_p;400,12914 -static size_t last_state_size;401,12944 -static malloc_info *last_heapinfo;last_heapinfo402,12975 -protect_malloc_state 405,13016 -#define PROTECT_MALLOC_STATE(426,13629 -#define PROTECT_MALLOC_STATE(429,13699 -align 435,13796 -get_contiguous_space 466,14618 -register_heapinfo 497,15327 -pthread_mutex_t _malloc_mutex 517,15881 -pthread_mutex_t _aligned_blocks_mutex 518,15940 -int _malloc_thread_enabled_p;519,16007 -malloc_atfork_handler_prepare 522,16050 -malloc_atfork_handler_parent 529,16141 -malloc_atfork_handler_child 536,16235 -malloc_enable_thread 544,16377 -malloc_initialize_1 563,16963 -__malloc_initialize 594,17795 -static int morecore_recursing;604,17928 -morecore_nolock 609,18068 -_malloc_internal_nolock 722,21586 -_malloc_internal 920,28104 -malloc 932,28249 -extern void *_malloc _malloc956,29035 -extern void _free 957,29066 -extern void *_realloc _realloc958,29094 -_malloc 961,29142 -_free 967,29198 -_realloc 973,29242 -void (*__free_hook)__free_hook1001,30262 -struct alignlist *_aligned_blocks _aligned_blocks1004,30348 -_free_internal_nolock 1009,30477 -_free_internal 1255,38479 -free 1265,38606 -weak_alias 1277,38802 -#define min(1306,39817 -void *(*__realloc_hook)__realloc_hook1310,39902 -_realloc_internal_nolock 1319,40313 -_realloc_internal 1435,43567 -realloc 1447,43730 -calloc 1478,44899 -#define __sbrk 1513,46048 -extern void *__sbrk __sbrk1518,46253 -__default_morecore 1525,46517 -void *(*__memalign_hook)__memalign_hook1554,47463 -aligned_alloc 1557,47529 -memalign 1647,49711 -posix_memalign 1656,49916 -extern void *valloc valloc1695,51148 -extern int getpagesize 1700,51286 -static size_t pagesize;1703,51325 -valloc 1706,51357 -#undef malloc1715,51498 -#undef realloc1716,51512 -#undef calloc1717,51527 -#undef aligned_alloc1718,51541 -#undef free1719,51562 -extern void *malloc malloc1722,51617 -extern void *realloc realloc1723,51652 -extern void *calloc calloc1724,51699 -extern void free 1725,51748 -extern void *aligned_alloc aligned_alloc1727,51804 -extern int posix_memalign 1729,51898 -hybrid_malloc 1736,52091 -hybrid_calloc 1744,52196 -hybrid_free 1752,52327 -hybrid_aligned_alloc 1765,52634 -hybrid_realloc 1780,52990 -char *gget_current_dir_name gget_current_dir_name1808,53759 -hybrid_get_current_dir_name 1811,53803 -static void (*old_free_hook)old_free_hook1846,54928 -static void *(*old_malloc_hook)old_malloc_hook1847,54970 -static void *(*old_realloc_hook)old_realloc_hook1848,55017 -static void (*abortfunc)abortfunc1851,55131 -#define MAGICWORD 1854,55213 -#define MAGICFREE 1855,55268 -#define MAGICBYTE 1856,55323 -#define MALLOCFLOOD 1857,55355 -#define FREEFLOOD 1858,55389 -struct hdr1860,55422 - size_t size;1862,55437 - size_t magic;1863,55491 -checkhdr 1867,55588 -freehook 1891,56029 -mallochook 1927,56811 -reallochook 1944,57150 -mabort 1978,57908 -static int mcheck_used 2012,58593 -mcheck 2015,58626 -mprobe 2035,59145 +void *(*__malloc_hook)__malloc_hook353,11766 +char *_heapbase;_heapbase356,11852 +malloc_info *_heapinfo;_heapinfo359,11950 +static size_t heapsize;362,12006 +size_t _heapindex;365,12070 +size_t _heaplimit;368,12132 +struct list _fraghead[_fraghead371,12194 +size_t _chunks_used;374,12252 +size_t _bytes_used;375,12273 +size_t _chunks_free;376,12293 +size_t _bytes_free;377,12314 +int __malloc_initialized;380,12363 +size_t __malloc_extra_blocks;382,12390 +void (*__malloc_initialize_hook)__malloc_initialize_hook384,12421 +void (*__after_morecore_hook)__after_morecore_hook385,12462 +static int state_protected_p;401,12935 +static size_t last_state_size;402,12965 +static malloc_info *last_heapinfo;last_heapinfo403,12996 +protect_malloc_state 406,13037 +#define PROTECT_MALLOC_STATE(427,13650 +#define PROTECT_MALLOC_STATE(430,13720 +align 436,13817 +get_contiguous_space 467,14639 +register_heapinfo 498,15348 +pthread_mutex_t _malloc_mutex 518,15902 +pthread_mutex_t _aligned_blocks_mutex 519,15961 +int _malloc_thread_enabled_p;520,16028 +malloc_atfork_handler_prepare 523,16071 +malloc_atfork_handler_parent 530,16162 +malloc_atfork_handler_child 537,16256 +malloc_enable_thread 545,16398 +malloc_initialize_1 564,16984 +__malloc_initialize 595,17816 +static int morecore_recursing;605,17949 +morecore_nolock 610,18089 +_malloc_internal_nolock 723,21607 +_malloc_internal 921,28125 +malloc 933,28270 +extern void *_malloc _malloc957,29056 +extern void _free 958,29087 +extern void *_realloc _realloc959,29115 +_malloc 962,29163 +_free 968,29219 +_realloc 974,29263 +void (*__free_hook)__free_hook1003,30310 +struct alignlist *_aligned_blocks _aligned_blocks1006,30396 +_free_internal_nolock 1011,30525 +_free_internal 1257,38527 +free 1267,38654 +weak_alias 1279,38850 +#define min(1309,39886 +void *(*__realloc_hook)__realloc_hook1313,39971 +_realloc_internal_nolock 1322,40382 +_realloc_internal 1438,43636 +realloc 1450,43799 +calloc 1481,44973 +#define __sbrk 1516,46115 +extern void *__sbrk __sbrk1521,46320 +__default_morecore 1528,46584 +void *(*__memalign_hook)__memalign_hook1557,47527 +aligned_alloc 1560,47593 +memalign 1650,49775 +posix_memalign 1659,49980 +extern void *valloc valloc1699,51243 +extern int getpagesize 1704,51381 +static size_t pagesize;1707,51420 +valloc 1710,51452 +#undef malloc1719,51593 +#undef realloc1720,51607 +#undef calloc1721,51622 +#undef aligned_alloc1722,51636 +#undef free1723,51657 +extern void *malloc malloc1726,51712 +extern void *realloc realloc1727,51747 +extern void *calloc calloc1728,51794 +extern void free 1729,51843 +extern void *aligned_alloc aligned_alloc1731,51899 +extern int posix_memalign 1733,51993 +hybrid_malloc 1740,52186 +hybrid_calloc 1748,52291 +hybrid_free 1756,52422 +hybrid_aligned_alloc 1769,52729 +hybrid_realloc 1784,53085 +char *gget_current_dir_name gget_current_dir_name1812,53854 +hybrid_get_current_dir_name 1815,53898 +static void (*old_free_hook)old_free_hook1851,55050 +static void *(*old_malloc_hook)old_malloc_hook1852,55092 +static void *(*old_realloc_hook)old_realloc_hook1853,55139 +static void (*abortfunc)abortfunc1856,55253 +#define MAGICWORD 1859,55335 +#define MAGICFREE 1860,55390 +#define MAGICBYTE 1861,55445 +#define MALLOCFLOOD 1862,55477 +#define FREEFLOOD 1863,55511 +struct hdr1865,55544 + size_t size;1867,55559 + size_t magic;1868,55613 +checkhdr 1872,55710 +freehook 1896,56151 +mallochook 1932,56933 +reallochook 1949,57272 +mabort 1983,58030 +static int mcheck_used 2017,58715 +mcheck 2020,58748 +mprobe 2040,59267 c-src/emacs/src/regex.h,5300 #define _REGEX_H 21,837 @@ -5769,62 +5769,62 @@ y-src/parse.c,520 # define L_GE 27,510 /usr/share/bison/bison.simple,1787 -# define YYSTD(40, -# define YYSTD(42, -# define YYSTACK_ALLOC 50, -# define YYSIZE_T 51, -# define YYSTACK_ALLOC 55, -# define YYSIZE_T 56, -# define YYSTACK_ALLOC 59, -# define YYSTACK_FREE(67, -# define YYSIZE_T 71, -# define YYSIZE_T 75, -# define YYSTACK_ALLOC 78, -# define YYSTACK_FREE 79, -union yyalloc83, - short yyss;85, - YYSTYPE yyvs;86, - YYLTYPE yyls;88, -# define YYSTACK_GAP_MAX 93, -# define YYSTACK_BYTES(98, -# define YYSTACK_BYTES(102, -# define YYSTACK_RELOCATE(112, -# define YYSIZE_T 128, -# define YYSIZE_T 131, -# define YYSIZE_T 136, -# define YYSIZE_T 140, -# define YYSIZE_T 145, -#define yyerrok 148, -#define yyclearin 149, -#define YYEMPTY 150, -#define YYEOF 151, -#define YYACCEPT 152, -#define YYABORT 153, -#define YYERROR 154, -#define YYFAIL 158, -#define YYRECOVERING(159, -#define YYBACKUP(160, -#define YYTERROR 177, -#define YYERRCODE 178, -# define YYLLOC_DEFAULT(189, -# define YYLEX 200, -# define YYLEX 202, -# define YYLEX 206, -# define YYLEX 208, -# define YYLEX 212, -# define YYFPRINTF 225, -# define YYDPRINTF(228, -int yydebug;237, -# define YYDPRINTF(239, -# define YYINITDEPTH 244, -# undef YYMAXDEPTH255, -# define YYMAXDEPTH 259, -# define yymemcpy 264, -yymemcpy 271, -# define yystrlen 293, -yystrlen 298, -# define yystpcpy 316, -yystpcpy 322, +# define YYSTD(41, +# define YYSTD(43, +# define YYSTACK_ALLOC 51, +# define YYSIZE_T 52, +# define YYSTACK_ALLOC 56, +# define YYSIZE_T 57, +# define YYSTACK_ALLOC 60, +# define YYSTACK_FREE(68, +# define YYSIZE_T 72, +# define YYSIZE_T 76, +# define YYSTACK_ALLOC 79, +# define YYSTACK_FREE 80, +union yyalloc84, + short yyss;86, + YYSTYPE yyvs;87, + YYLTYPE yyls;89, +# define YYSTACK_GAP_MAX 94, +# define YYSTACK_BYTES(99, +# define YYSTACK_BYTES(103, +# define YYSTACK_RELOCATE(113, +# define YYSIZE_T 129, +# define YYSIZE_T 132, +# define YYSIZE_T 137, +# define YYSIZE_T 141, +# define YYSIZE_T 146, +#define yyerrok 149, +#define yyclearin 150, +#define YYEMPTY 151, +#define YYEOF 152, +#define YYACCEPT 153, +#define YYABORT 154, +#define YYERROR 155, +#define YYFAIL 159, +#define YYRECOVERING(160, +#define YYBACKUP(161, +#define YYTERROR 178, +#define YYERRCODE 179, +# define YYLLOC_DEFAULT(190, +# define YYLEX 201, +# define YYLEX 203, +# define YYLEX 207, +# define YYLEX 209, +# define YYLEX 213, +# define YYFPRINTF 226, +# define YYDPRINTF(229, +int yydebug;238, +# define YYDPRINTF(240, +# define YYINITDEPTH 245, +# undef YYMAXDEPTH256, +# define YYMAXDEPTH 260, +# define yymemcpy 265, +yymemcpy 272, +# define yystrlen 294, +yystrlen 299, +# define yystpcpy 317, +yystpcpy 323, # define YYPARSE_PARAM_ARG 351, # define YYPARSE_PARAM_DECL352, # define YYPARSE_PARAM_ARG 354, diff --git a/test/manual/etags/ETAGS.good_6 b/test/manual/etags/ETAGS.good_6 index e6c83fc9140..55f03f4742c 100644 --- a/test/manual/etags/ETAGS.good_6 +++ b/test/manual/etags/ETAGS.good_6 @@ -863,111 +863,111 @@ struct mstats308,10154 size_t bytes_free;314,10407 extern struct mstats mstats 318,10519 extern void memory_warnings 321,10626 -void *(*__malloc_hook)__malloc_hook352,11745 -char *_heapbase;_heapbase355,11831 -malloc_info *_heapinfo;_heapinfo358,11929 -static size_t heapsize;361,11985 -size_t _heapindex;364,12049 -size_t _heaplimit;367,12111 -struct list _fraghead[_fraghead370,12173 -size_t _chunks_used;373,12231 -size_t _bytes_used;374,12252 -size_t _chunks_free;375,12272 -size_t _bytes_free;376,12293 -int __malloc_initialized;379,12342 -size_t __malloc_extra_blocks;381,12369 -void (*__malloc_initialize_hook)__malloc_initialize_hook383,12400 -void (*__after_morecore_hook)__after_morecore_hook384,12441 -static int state_protected_p;400,12914 -static size_t last_state_size;401,12944 -static malloc_info *last_heapinfo;last_heapinfo402,12975 -protect_malloc_state 405,13016 -#define PROTECT_MALLOC_STATE(426,13629 -#define PROTECT_MALLOC_STATE(429,13699 -align 435,13796 -get_contiguous_space 466,14618 -register_heapinfo 497,15327 -pthread_mutex_t _malloc_mutex 517,15881 -pthread_mutex_t _aligned_blocks_mutex 518,15940 -int _malloc_thread_enabled_p;519,16007 -malloc_atfork_handler_prepare 522,16050 -malloc_atfork_handler_parent 529,16141 -malloc_atfork_handler_child 536,16235 -malloc_enable_thread 544,16377 -malloc_initialize_1 563,16963 -__malloc_initialize 594,17795 -static int morecore_recursing;604,17928 -morecore_nolock 609,18068 -_malloc_internal_nolock 722,21586 -_malloc_internal 920,28104 -malloc 932,28249 -extern void *_malloc _malloc956,29035 -extern void _free 957,29066 -extern void *_realloc _realloc958,29094 -_malloc 961,29142 -_free 967,29198 -_realloc 973,29242 -void (*__free_hook)__free_hook1001,30262 -struct alignlist *_aligned_blocks _aligned_blocks1004,30348 -_free_internal_nolock 1009,30477 -_free_internal 1255,38479 -free 1265,38606 -weak_alias 1277,38802 -#define min(1306,39817 -void *(*__realloc_hook)__realloc_hook1310,39902 -_realloc_internal_nolock 1319,40313 -_realloc_internal 1435,43567 -realloc 1447,43730 -calloc 1478,44899 -#define __sbrk 1513,46048 -extern void *__sbrk __sbrk1518,46253 -__default_morecore 1525,46517 -void *(*__memalign_hook)__memalign_hook1554,47463 -aligned_alloc 1557,47529 -memalign 1647,49711 -posix_memalign 1656,49916 -extern void *valloc valloc1695,51148 -extern int getpagesize 1700,51286 -static size_t pagesize;1703,51325 -valloc 1706,51357 -#undef malloc1715,51498 -#undef realloc1716,51512 -#undef calloc1717,51527 -#undef aligned_alloc1718,51541 -#undef free1719,51562 -extern void *malloc malloc1722,51617 -extern void *realloc realloc1723,51652 -extern void *calloc calloc1724,51699 -extern void free 1725,51748 -extern void *aligned_alloc aligned_alloc1727,51804 -extern int posix_memalign 1729,51898 -hybrid_malloc 1736,52091 -hybrid_calloc 1744,52196 -hybrid_free 1752,52327 -hybrid_aligned_alloc 1765,52634 -hybrid_realloc 1780,52990 -char *gget_current_dir_name gget_current_dir_name1808,53759 -hybrid_get_current_dir_name 1811,53803 -static void (*old_free_hook)old_free_hook1846,54928 -static void *(*old_malloc_hook)old_malloc_hook1847,54970 -static void *(*old_realloc_hook)old_realloc_hook1848,55017 -static void (*abortfunc)abortfunc1851,55131 -#define MAGICWORD 1854,55213 -#define MAGICFREE 1855,55268 -#define MAGICBYTE 1856,55323 -#define MALLOCFLOOD 1857,55355 -#define FREEFLOOD 1858,55389 -struct hdr1860,55422 - size_t size;1862,55437 - size_t magic;1863,55491 -checkhdr 1867,55588 -freehook 1891,56029 -mallochook 1927,56811 -reallochook 1944,57150 -mabort 1978,57908 -static int mcheck_used 2012,58593 -mcheck 2015,58626 -mprobe 2035,59145 +void *(*__malloc_hook)__malloc_hook353,11766 +char *_heapbase;_heapbase356,11852 +malloc_info *_heapinfo;_heapinfo359,11950 +static size_t heapsize;362,12006 +size_t _heapindex;365,12070 +size_t _heaplimit;368,12132 +struct list _fraghead[_fraghead371,12194 +size_t _chunks_used;374,12252 +size_t _bytes_used;375,12273 +size_t _chunks_free;376,12293 +size_t _bytes_free;377,12314 +int __malloc_initialized;380,12363 +size_t __malloc_extra_blocks;382,12390 +void (*__malloc_initialize_hook)__malloc_initialize_hook384,12421 +void (*__after_morecore_hook)__after_morecore_hook385,12462 +static int state_protected_p;401,12935 +static size_t last_state_size;402,12965 +static malloc_info *last_heapinfo;last_heapinfo403,12996 +protect_malloc_state 406,13037 +#define PROTECT_MALLOC_STATE(427,13650 +#define PROTECT_MALLOC_STATE(430,13720 +align 436,13817 +get_contiguous_space 467,14639 +register_heapinfo 498,15348 +pthread_mutex_t _malloc_mutex 518,15902 +pthread_mutex_t _aligned_blocks_mutex 519,15961 +int _malloc_thread_enabled_p;520,16028 +malloc_atfork_handler_prepare 523,16071 +malloc_atfork_handler_parent 530,16162 +malloc_atfork_handler_child 537,16256 +malloc_enable_thread 545,16398 +malloc_initialize_1 564,16984 +__malloc_initialize 595,17816 +static int morecore_recursing;605,17949 +morecore_nolock 610,18089 +_malloc_internal_nolock 723,21607 +_malloc_internal 921,28125 +malloc 933,28270 +extern void *_malloc _malloc957,29056 +extern void _free 958,29087 +extern void *_realloc _realloc959,29115 +_malloc 962,29163 +_free 968,29219 +_realloc 974,29263 +void (*__free_hook)__free_hook1003,30310 +struct alignlist *_aligned_blocks _aligned_blocks1006,30396 +_free_internal_nolock 1011,30525 +_free_internal 1257,38527 +free 1267,38654 +weak_alias 1279,38850 +#define min(1309,39886 +void *(*__realloc_hook)__realloc_hook1313,39971 +_realloc_internal_nolock 1322,40382 +_realloc_internal 1438,43636 +realloc 1450,43799 +calloc 1481,44973 +#define __sbrk 1516,46115 +extern void *__sbrk __sbrk1521,46320 +__default_morecore 1528,46584 +void *(*__memalign_hook)__memalign_hook1557,47527 +aligned_alloc 1560,47593 +memalign 1650,49775 +posix_memalign 1659,49980 +extern void *valloc valloc1699,51243 +extern int getpagesize 1704,51381 +static size_t pagesize;1707,51420 +valloc 1710,51452 +#undef malloc1719,51593 +#undef realloc1720,51607 +#undef calloc1721,51622 +#undef aligned_alloc1722,51636 +#undef free1723,51657 +extern void *malloc malloc1726,51712 +extern void *realloc realloc1727,51747 +extern void *calloc calloc1728,51794 +extern void free 1729,51843 +extern void *aligned_alloc aligned_alloc1731,51899 +extern int posix_memalign 1733,51993 +hybrid_malloc 1740,52186 +hybrid_calloc 1748,52291 +hybrid_free 1756,52422 +hybrid_aligned_alloc 1769,52729 +hybrid_realloc 1784,53085 +char *gget_current_dir_name gget_current_dir_name1812,53854 +hybrid_get_current_dir_name 1815,53898 +static void (*old_free_hook)old_free_hook1851,55050 +static void *(*old_malloc_hook)old_malloc_hook1852,55092 +static void *(*old_realloc_hook)old_realloc_hook1853,55139 +static void (*abortfunc)abortfunc1856,55253 +#define MAGICWORD 1859,55335 +#define MAGICFREE 1860,55390 +#define MAGICBYTE 1861,55445 +#define MALLOCFLOOD 1862,55477 +#define FREEFLOOD 1863,55511 +struct hdr1865,55544 + size_t size;1867,55559 + size_t magic;1868,55613 +checkhdr 1872,55710 +freehook 1896,56151 +mallochook 1932,56933 +reallochook 1949,57272 +mabort 1983,58030 +static int mcheck_used 2017,58715 +mcheck 2020,58748 +mprobe 2040,59267 c-src/emacs/src/regex.h,5300 #define _REGEX_H 21,837 @@ -5769,62 +5769,62 @@ y-src/parse.c,520 # define L_GE 27,510 /usr/share/bison/bison.simple,1787 -# define YYSTD(40, -# define YYSTD(42, -# define YYSTACK_ALLOC 50, -# define YYSIZE_T 51, -# define YYSTACK_ALLOC 55, -# define YYSIZE_T 56, -# define YYSTACK_ALLOC 59, -# define YYSTACK_FREE(67, -# define YYSIZE_T 71, -# define YYSIZE_T 75, -# define YYSTACK_ALLOC 78, -# define YYSTACK_FREE 79, -union yyalloc83, - short yyss;85, - YYSTYPE yyvs;86, - YYLTYPE yyls;88, -# define YYSTACK_GAP_MAX 93, -# define YYSTACK_BYTES(98, -# define YYSTACK_BYTES(102, -# define YYSTACK_RELOCATE(112, -# define YYSIZE_T 128, -# define YYSIZE_T 131, -# define YYSIZE_T 136, -# define YYSIZE_T 140, -# define YYSIZE_T 145, -#define yyerrok 148, -#define yyclearin 149, -#define YYEMPTY 150, -#define YYEOF 151, -#define YYACCEPT 152, -#define YYABORT 153, -#define YYERROR 154, -#define YYFAIL 158, -#define YYRECOVERING(159, -#define YYBACKUP(160, -#define YYTERROR 177, -#define YYERRCODE 178, -# define YYLLOC_DEFAULT(189, -# define YYLEX 200, -# define YYLEX 202, -# define YYLEX 206, -# define YYLEX 208, -# define YYLEX 212, -# define YYFPRINTF 225, -# define YYDPRINTF(228, -int yydebug;237, -# define YYDPRINTF(239, -# define YYINITDEPTH 244, -# undef YYMAXDEPTH255, -# define YYMAXDEPTH 259, -# define yymemcpy 264, -yymemcpy 271, -# define yystrlen 293, -yystrlen 298, -# define yystpcpy 316, -yystpcpy 322, +# define YYSTD(41, +# define YYSTD(43, +# define YYSTACK_ALLOC 51, +# define YYSIZE_T 52, +# define YYSTACK_ALLOC 56, +# define YYSIZE_T 57, +# define YYSTACK_ALLOC 60, +# define YYSTACK_FREE(68, +# define YYSIZE_T 72, +# define YYSIZE_T 76, +# define YYSTACK_ALLOC 79, +# define YYSTACK_FREE 80, +union yyalloc84, + short yyss;86, + YYSTYPE yyvs;87, + YYLTYPE yyls;89, +# define YYSTACK_GAP_MAX 94, +# define YYSTACK_BYTES(99, +# define YYSTACK_BYTES(103, +# define YYSTACK_RELOCATE(113, +# define YYSIZE_T 129, +# define YYSIZE_T 132, +# define YYSIZE_T 137, +# define YYSIZE_T 141, +# define YYSIZE_T 146, +#define yyerrok 149, +#define yyclearin 150, +#define YYEMPTY 151, +#define YYEOF 152, +#define YYACCEPT 153, +#define YYABORT 154, +#define YYERROR 155, +#define YYFAIL 159, +#define YYRECOVERING(160, +#define YYBACKUP(161, +#define YYTERROR 178, +#define YYERRCODE 179, +# define YYLLOC_DEFAULT(190, +# define YYLEX 201, +# define YYLEX 203, +# define YYLEX 207, +# define YYLEX 209, +# define YYLEX 213, +# define YYFPRINTF 226, +# define YYDPRINTF(229, +int yydebug;238, +# define YYDPRINTF(240, +# define YYINITDEPTH 245, +# undef YYMAXDEPTH256, +# define YYMAXDEPTH 260, +# define yymemcpy 265, +yymemcpy 272, +# define yystrlen 294, +yystrlen 299, +# define yystpcpy 317, +yystpcpy 323, # define YYPARSE_PARAM_ARG 351, # define YYPARSE_PARAM_DECL352, # define YYPARSE_PARAM_ARG 354, diff --git a/test/manual/etags/ETAGS.good_7 b/test/manual/etags/ETAGS.good_7 index 5f5c9890f70..1a6c1455e4c 100644 --- a/test/manual/etags/ETAGS.good_7 +++ b/test/manual/etags/ETAGS.good_7 @@ -638,86 +638,86 @@ enum mcheck_status283,9093 MCHECK_HEAD,288,9271 MCHECK_TAIL 289,9335 struct mstats308,10154 -char *_heapbase;_heapbase355,11831 -malloc_info *_heapinfo;_heapinfo358,11929 -static size_t heapsize;361,11985 -size_t _heapindex;364,12049 -size_t _heaplimit;367,12111 -struct list _fraghead[_fraghead370,12173 -size_t _chunks_used;373,12231 -size_t _bytes_used;374,12252 -size_t _chunks_free;375,12272 -size_t _bytes_free;376,12293 -int __malloc_initialized;379,12342 -size_t __malloc_extra_blocks;381,12369 -static int state_protected_p;400,12914 -static size_t last_state_size;401,12944 -static malloc_info *last_heapinfo;last_heapinfo402,12975 -protect_malloc_state 405,13016 -#define PROTECT_MALLOC_STATE(426,13629 -#define PROTECT_MALLOC_STATE(429,13699 -align 435,13796 -get_contiguous_space 466,14618 -register_heapinfo 497,15327 -pthread_mutex_t _malloc_mutex 517,15881 -pthread_mutex_t _aligned_blocks_mutex 518,15940 -int _malloc_thread_enabled_p;519,16007 -malloc_atfork_handler_prepare 522,16050 -malloc_atfork_handler_parent 529,16141 -malloc_atfork_handler_child 536,16235 -malloc_enable_thread 544,16377 -malloc_initialize_1 563,16963 -__malloc_initialize 594,17795 -static int morecore_recursing;604,17928 -morecore_nolock 609,18068 -_malloc_internal_nolock 722,21586 -_malloc_internal 920,28104 -malloc 932,28249 -_malloc 961,29142 -_free 967,29198 -_realloc 973,29242 -struct alignlist *_aligned_blocks _aligned_blocks1004,30348 -_free_internal_nolock 1009,30477 -_free_internal 1255,38479 -free 1265,38606 -weak_alias 1277,38802 -#define min(1306,39817 -_realloc_internal_nolock 1319,40313 -_realloc_internal 1435,43567 -realloc 1447,43730 -calloc 1478,44899 -#define __sbrk 1513,46048 -__default_morecore 1525,46517 -aligned_alloc 1557,47529 -memalign 1647,49711 -posix_memalign 1656,49916 -static size_t pagesize;1703,51325 -valloc 1706,51357 -#undef malloc1715,51498 -#undef realloc1716,51512 -#undef calloc1717,51527 -#undef aligned_alloc1718,51541 -#undef free1719,51562 -hybrid_malloc 1736,52091 -hybrid_calloc 1744,52196 -hybrid_free 1752,52327 -hybrid_aligned_alloc 1765,52634 -hybrid_realloc 1780,52990 -hybrid_get_current_dir_name 1811,53803 -#define MAGICWORD 1854,55213 -#define MAGICFREE 1855,55268 -#define MAGICBYTE 1856,55323 -#define MALLOCFLOOD 1857,55355 -#define FREEFLOOD 1858,55389 -struct hdr1860,55422 -checkhdr 1867,55588 -freehook 1891,56029 -mallochook 1927,56811 -reallochook 1944,57150 -mabort 1978,57908 -static int mcheck_used 2012,58593 -mcheck 2015,58626 -mprobe 2035,59145 +char *_heapbase;_heapbase356,11852 +malloc_info *_heapinfo;_heapinfo359,11950 +static size_t heapsize;362,12006 +size_t _heapindex;365,12070 +size_t _heaplimit;368,12132 +struct list _fraghead[_fraghead371,12194 +size_t _chunks_used;374,12252 +size_t _bytes_used;375,12273 +size_t _chunks_free;376,12293 +size_t _bytes_free;377,12314 +int __malloc_initialized;380,12363 +size_t __malloc_extra_blocks;382,12390 +static int state_protected_p;401,12935 +static size_t last_state_size;402,12965 +static malloc_info *last_heapinfo;last_heapinfo403,12996 +protect_malloc_state 406,13037 +#define PROTECT_MALLOC_STATE(427,13650 +#define PROTECT_MALLOC_STATE(430,13720 +align 436,13817 +get_contiguous_space 467,14639 +register_heapinfo 498,15348 +pthread_mutex_t _malloc_mutex 518,15902 +pthread_mutex_t _aligned_blocks_mutex 519,15961 +int _malloc_thread_enabled_p;520,16028 +malloc_atfork_handler_prepare 523,16071 +malloc_atfork_handler_parent 530,16162 +malloc_atfork_handler_child 537,16256 +malloc_enable_thread 545,16398 +malloc_initialize_1 564,16984 +__malloc_initialize 595,17816 +static int morecore_recursing;605,17949 +morecore_nolock 610,18089 +_malloc_internal_nolock 723,21607 +_malloc_internal 921,28125 +malloc 933,28270 +_malloc 962,29163 +_free 968,29219 +_realloc 974,29263 +struct alignlist *_aligned_blocks _aligned_blocks1006,30396 +_free_internal_nolock 1011,30525 +_free_internal 1257,38527 +free 1267,38654 +weak_alias 1279,38850 +#define min(1309,39886 +_realloc_internal_nolock 1322,40382 +_realloc_internal 1438,43636 +realloc 1450,43799 +calloc 1481,44973 +#define __sbrk 1516,46115 +__default_morecore 1528,46584 +aligned_alloc 1560,47593 +memalign 1650,49775 +posix_memalign 1659,49980 +static size_t pagesize;1707,51420 +valloc 1710,51452 +#undef malloc1719,51593 +#undef realloc1720,51607 +#undef calloc1721,51622 +#undef aligned_alloc1722,51636 +#undef free1723,51657 +hybrid_malloc 1740,52186 +hybrid_calloc 1748,52291 +hybrid_free 1756,52422 +hybrid_aligned_alloc 1769,52729 +hybrid_realloc 1784,53085 +hybrid_get_current_dir_name 1815,53898 +#define MAGICWORD 1859,55335 +#define MAGICFREE 1860,55390 +#define MAGICBYTE 1861,55445 +#define MALLOCFLOOD 1862,55477 +#define FREEFLOOD 1863,55511 +struct hdr1865,55544 +checkhdr 1872,55710 +freehook 1896,56151 +mallochook 1932,56933 +reallochook 1949,57272 +mabort 1983,58030 +static int mcheck_used 2017,58715 +mcheck 2020,58748 +mprobe 2040,59267 c-src/emacs/src/regex.h,3761 #define _REGEX_H 21,837 @@ -4518,59 +4518,59 @@ y-src/parse.c,520 # define L_GE 27,510 /usr/share/bison/bison.simple,1693 -# define YYSTD(40, -# define YYSTD(42, -# define YYSTACK_ALLOC 50, -# define YYSIZE_T 51, -# define YYSTACK_ALLOC 55, -# define YYSIZE_T 56, -# define YYSTACK_ALLOC 59, -# define YYSTACK_FREE(67, -# define YYSIZE_T 71, -# define YYSIZE_T 75, -# define YYSTACK_ALLOC 78, -# define YYSTACK_FREE 79, -union yyalloc83, -# define YYSTACK_GAP_MAX 93, -# define YYSTACK_BYTES(98, -# define YYSTACK_BYTES(102, -# define YYSTACK_RELOCATE(112, -# define YYSIZE_T 128, -# define YYSIZE_T 131, -# define YYSIZE_T 136, -# define YYSIZE_T 140, -# define YYSIZE_T 145, -#define yyerrok 148, -#define yyclearin 149, -#define YYEMPTY 150, -#define YYEOF 151, -#define YYACCEPT 152, -#define YYABORT 153, -#define YYERROR 154, -#define YYFAIL 158, -#define YYRECOVERING(159, -#define YYBACKUP(160, -#define YYTERROR 177, -#define YYERRCODE 178, -# define YYLLOC_DEFAULT(189, -# define YYLEX 200, -# define YYLEX 202, -# define YYLEX 206, -# define YYLEX 208, -# define YYLEX 212, -# define YYFPRINTF 225, -# define YYDPRINTF(228, -int yydebug;237, -# define YYDPRINTF(239, -# define YYINITDEPTH 244, -# undef YYMAXDEPTH255, -# define YYMAXDEPTH 259, -# define yymemcpy 264, -yymemcpy 271, -# define yystrlen 293, -yystrlen 298, -# define yystpcpy 316, -yystpcpy 322, +# define YYSTD(41, +# define YYSTD(43, +# define YYSTACK_ALLOC 51, +# define YYSIZE_T 52, +# define YYSTACK_ALLOC 56, +# define YYSIZE_T 57, +# define YYSTACK_ALLOC 60, +# define YYSTACK_FREE(68, +# define YYSIZE_T 72, +# define YYSIZE_T 76, +# define YYSTACK_ALLOC 79, +# define YYSTACK_FREE 80, +union yyalloc84, +# define YYSTACK_GAP_MAX 94, +# define YYSTACK_BYTES(99, +# define YYSTACK_BYTES(103, +# define YYSTACK_RELOCATE(113, +# define YYSIZE_T 129, +# define YYSIZE_T 132, +# define YYSIZE_T 137, +# define YYSIZE_T 141, +# define YYSIZE_T 146, +#define yyerrok 149, +#define yyclearin 150, +#define YYEMPTY 151, +#define YYEOF 152, +#define YYACCEPT 153, +#define YYABORT 154, +#define YYERROR 155, +#define YYFAIL 159, +#define YYRECOVERING(160, +#define YYBACKUP(161, +#define YYTERROR 178, +#define YYERRCODE 179, +# define YYLLOC_DEFAULT(190, +# define YYLEX 201, +# define YYLEX 203, +# define YYLEX 207, +# define YYLEX 209, +# define YYLEX 213, +# define YYFPRINTF 226, +# define YYDPRINTF(229, +int yydebug;238, +# define YYDPRINTF(240, +# define YYINITDEPTH 245, +# undef YYMAXDEPTH256, +# define YYMAXDEPTH 260, +# define yymemcpy 265, +yymemcpy 272, +# define yystrlen 294, +yystrlen 299, +# define yystpcpy 317, +yystpcpy 323, # define YYPARSE_PARAM_ARG 351, # define YYPARSE_PARAM_DECL352, # define YYPARSE_PARAM_ARG 354,