aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2021-06-18 14:28:16 +0300
committerEli Zaretskii2021-06-18 14:28:16 +0300
commit6af9f1f3efc98f3ad736db9e2cf6dfb63bf7e3ff (patch)
treee4d2ec83a50dcb2af1aa42bcb0b95d67d0fb4f79
parent0ffcf7479c49ad5e0f9f675124c7cf741197aedd (diff)
downloademacs-6af9f1f3efc98f3ad736db9e2cf6dfb63bf7e3ff.tar.gz
emacs-6af9f1f3efc98f3ad736db9e2cf6dfb63bf7e3ff.zip
Improve and update the 'etags' test suite
* lib-src/etags.c (mercury_pr): Remove redundant comment. * test/manual/etags/merc-src/accumulator.m: Add more complex declarations. * 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/CTAGS.good: Adapt to latest changes in 'etags' and the test suite. (Bug#47408)
Diffstat
-rw-r--r--lib-src/etags.c2
-rw-r--r--test/manual/etags/CTAGS.good31
-rw-r--r--test/manual/etags/ETAGS.good_1149
-rw-r--r--test/manual/etags/ETAGS.good_2266
-rw-r--r--test/manual/etags/ETAGS.good_3149
-rw-r--r--test/manual/etags/ETAGS.good_4149
-rw-r--r--test/manual/etags/ETAGS.good_5266
-rw-r--r--test/manual/etags/ETAGS.good_6266
-rw-r--r--test/manual/etags/merc-src/accumulator.m8
9 files changed, 574 insertions, 712 deletions
diff --git a/lib-src/etags.c b/lib-src/etags.c
index bd57ede2f37..c39c93db336 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -6597,8 +6597,6 @@ mercury_pr (char *s, char *last, ptrdiff_t lastlen)
6597 && c_isspace (s[pos - namelength - offset])) 6597 && c_isspace (s[pos - namelength - offset]))
6598 --offset; 6598 --offset;
6599 6599
6600 /* There is no need to correct namelength or call notinname. */
6601
6602 make_tag (s + pos - namelength - offset, namelength - 1, true, 6600 make_tag (s + pos - namelength - offset, namelength - 1, true,
6603 s, pos - offset - 1, lineno, linecharno); 6601 s, pos - offset - 1, lineno, linecharno);
6604 return pos; 6602 return pos;
diff --git a/test/manual/etags/CTAGS.good b/test/manual/etags/CTAGS.good
index e265836fd2b..84a56b23cfa 100644
--- a/test/manual/etags/CTAGS.good
+++ b/test/manual/etags/CTAGS.good
@@ -3102,6 +3102,7 @@ foperator c-src/etags.c 2411
3102force_auto_save_soon c-src/emacs/src/keyboard.c /^force_auto_save_soon (void)$/ 3102force_auto_save_soon c-src/emacs/src/keyboard.c /^force_auto_save_soon (void)$/
3103force_explicit_name c-src/etags.c 265 3103force_explicit_name c-src/etags.c 265
3104force_quit_count c-src/emacs/src/keyboard.c 10387 3104force_quit_count c-src/emacs/src/keyboard.c 10387
3105foreign_export merc-src/accumulator.m /^:- pragma foreign_export("C", unravel_univ(in, out/
3105formatSize objc-src/PackInsp.m /^-(const char *)formatSize:(const char *)size inBuf/ 3106formatSize objc-src/PackInsp.m /^-(const char *)formatSize:(const char *)size inBuf/
3106found c-src/emacs/src/lisp.h 2344 3107found c-src/emacs/src/lisp.h 2344
3107fracas html-src/software.html /^Fracas$/ 3108fracas html-src/software.html /^Fracas$/
@@ -3230,20 +3231,6 @@ help_form_saved_window_configs c-src/emacs/src/keyboard.c 2156
3230helpwin pyt-src/server.py /^def helpwin(helpdict):$/ 3231helpwin pyt-src/server.py /^def helpwin(helpdict):$/
3231hide_cursor cp-src/screen.cpp /^void hide_cursor(void)$/ 3232hide_cursor cp-src/screen.cpp /^void hide_cursor(void)$/
3232hlds merc-src/accumulator.m /^:- import_module hlds.$/ 3233hlds merc-src/accumulator.m /^:- import_module hlds.$/
3233hlds.assertion merc-src/accumulator.m /^:- import_module hlds.assertion.$/
3234hlds.goal_util merc-src/accumulator.m /^:- import_module hlds.goal_util.$/
3235hlds.hlds_error_util merc-src/accumulator.m /^:- import_module hlds.hlds_error_util.$/
3236hlds.hlds_goal merc-src/accumulator.m /^:- import_module hlds.hlds_goal.$/
3237hlds.hlds_module merc-src/accumulator.m /^:- import_module hlds.hlds_module.$/
3238hlds.hlds_out merc-src/accumulator.m /^:- import_module hlds.hlds_out.$/
3239hlds.hlds_out.hlds_out_util merc-src/accumulator.m /^:- import_module hlds.hlds_out.hlds_out_util.$/
3240hlds.hlds_pred merc-src/accumulator.m /^:- import_module hlds.hlds_pred.$/
3241hlds.hlds_promise merc-src/accumulator.m /^:- import_module hlds.hlds_promise.$/
3242hlds.instmap merc-src/accumulator.m /^:- import_module hlds.instmap.$/
3243hlds.pred_table merc-src/accumulator.m /^:- import_module hlds.pred_table.$/
3244hlds.quantification merc-src/accumulator.m /^:- import_module hlds.quantification.$/
3245hlds.status merc-src/accumulator.m /^:- import_module hlds.status.$/
3246hlds.vartypes merc-src/accumulator.m /^:- import_module hlds.vartypes.$/
3247htmltreelist prol-src/natded.prolog /^htmltreelist([]).$/ 3234htmltreelist prol-src/natded.prolog /^htmltreelist([]).$/
3248hybrid_aligned_alloc c-src/emacs/src/gmalloc.c /^hybrid_aligned_alloc (size_t alignment, size_t siz/ 3235hybrid_aligned_alloc c-src/emacs/src/gmalloc.c /^hybrid_aligned_alloc (size_t alignment, size_t siz/
3249hybrid_calloc c-src/emacs/src/gmalloc.c /^hybrid_calloc (size_t nmemb, size_t size)$/ 3236hybrid_calloc c-src/emacs/src/gmalloc.c /^hybrid_calloc (size_t nmemb, size_t size)$/
@@ -3272,6 +3259,7 @@ ignore_mouse_drag_p c-src/emacs/src/keyboard.c 1256
3272ill=\relax tex-src/texinfo.tex /^\\let\\refill=\\relax$/ 3259ill=\relax tex-src/texinfo.tex /^\\let\\refill=\\relax$/
3273immediate_quit c-src/emacs/src/keyboard.c 174 3260immediate_quit c-src/emacs/src/keyboard.c 174
3274impatto html-src/softwarelibero.html /^Impatto pratico del software libero$/ 3261impatto html-src/softwarelibero.html /^Impatto pratico del software libero$/
3262implementation merc-src/accumulator.m /^:- implementation.$/
3275in_word_set c-src/etags.c /^in_word_set (register const char *str, register un/ 3263in_word_set c-src/etags.c /^in_word_set (register const char *str, register un/
3276inattribute c-src/etags.c 2400 3264inattribute c-src/etags.c 2400
3277inc cp-src/Range.h /^ double inc (void) const { return rng_inc; }$/ 3265inc cp-src/Range.h /^ double inc (void) const { return rng_inc; }$/
@@ -3320,6 +3308,7 @@ integertonmstr pas-src/common.pas /^function integertonmstr; (* (TheInteger : in
3320intensity1 f-src/entry.for /^ & intensity1(efv,fv,svin,svquad,sfpv,maxp,val/ 3308intensity1 f-src/entry.for /^ & intensity1(efv,fv,svin,svquad,sfpv,maxp,val/
3321intensity1 f-src/entry.strange_suffix /^ & intensity1(efv,fv,svin,svquad,sfpv,maxp,val/ 3309intensity1 f-src/entry.strange_suffix /^ & intensity1(efv,fv,svin,svquad,sfpv,maxp,val/
3322intensity1 f-src/entry.strange /^ & intensity1(efv,fv,svin,svquad,sfpv,maxp,val/ 3310intensity1 f-src/entry.strange /^ & intensity1(efv,fv,svin,svquad,sfpv,maxp,val/
3311interface merc-src/accumulator.m /^:- interface.$/
3323interface_locate c-src/c.c /^interface_locate(void)$/ 3312interface_locate c-src/c.c /^interface_locate(void)$/
3324intern c-src/emacs/src/lisp.h /^intern (const char *str)$/ 3313intern c-src/emacs/src/lisp.h /^intern (const char *str)$/
3325intern_c_string c-src/emacs/src/lisp.h /^intern_c_string (const char *str)$/ 3314intern_c_string c-src/emacs/src/lisp.h /^intern_c_string (const char *str)$/
@@ -3451,9 +3440,6 @@ level c-src/emacs/src/lisp.h 3153
3451lex prol-src/natded.prolog /^lex(W,SynOut,Sem):-$/ 3440lex prol-src/natded.prolog /^lex(W,SynOut,Sem):-$/
3452lexptr y-src/cccp.y 332 3441lexptr y-src/cccp.y 332
3453libs merc-src/accumulator.m /^:- import_module libs.$/ 3442libs merc-src/accumulator.m /^:- import_module libs.$/
3454libs.globals merc-src/accumulator.m /^:- import_module libs.globals.$/
3455libs.optimization_options merc-src/accumulator.m /^:- import_module libs.optimization_options.$/
3456libs.options merc-src/accumulator.m /^:- import_module libs.options.$/
3457licenze html-src/softwarelibero.html /^Licenze d'uso di un programma$/ 3443licenze html-src/softwarelibero.html /^Licenze d'uso di un programma$/
3458limit cp-src/Range.h /^ double limit (void) const { return rng_limit; }$/ 3444limit cp-src/Range.h /^ double limit (void) const { return rng_limit; }$/
3459line c-src/etags.c 2493 3445line c-src/etags.c 2493
@@ -3595,7 +3581,6 @@ mcheck c-src/emacs/src/gmalloc.c /^mcheck (void (*func) (enum mcheck_status))$/
3595mcheck_status c-src/emacs/src/gmalloc.c 283 3581mcheck_status c-src/emacs/src/gmalloc.c 283
3596mcheck_used c-src/emacs/src/gmalloc.c 2012 3582mcheck_used c-src/emacs/src/gmalloc.c 2012
3597mdbcomp merc-src/accumulator.m /^:- import_module mdbcomp.$/ 3583mdbcomp merc-src/accumulator.m /^:- import_module mdbcomp.$/
3598mdbcomp.sym_name merc-src/accumulator.m /^:- import_module mdbcomp.sym_name.$/
3599me22b lua-src/test.lua /^ local function test.me22b (one)$/ 3584me22b lua-src/test.lua /^ local function test.me22b (one)$/
3600me_22a lua-src/test.lua /^ function test.me_22a(one, two)$/ 3585me_22a lua-src/test.lua /^ function test.me_22a(one, two)$/
3601memalign c-src/emacs/src/gmalloc.c /^memalign (size_t alignment, size_t size)$/ 3586memalign c-src/emacs/src/gmalloc.c /^memalign (size_t alignment, size_t size)$/
@@ -3890,11 +3875,6 @@ parse_return_error y-src/cccp.y 70
3890parse_solitary_modifier c-src/emacs/src/keyboard.c /^parse_solitary_modifier (Lisp_Object symbol)$/ 3875parse_solitary_modifier c-src/emacs/src/keyboard.c /^parse_solitary_modifier (Lisp_Object symbol)$/
3891parse_tool_bar_item c-src/emacs/src/keyboard.c /^parse_tool_bar_item (Lisp_Object key, Lisp_Object / 3876parse_tool_bar_item c-src/emacs/src/keyboard.c /^parse_tool_bar_item (Lisp_Object key, Lisp_Object /
3892parse_tree merc-src/accumulator.m /^:- import_module parse_tree.$/ 3877parse_tree merc-src/accumulator.m /^:- import_module parse_tree.$/
3893parse_tree.error_util merc-src/accumulator.m /^:- import_module parse_tree.error_util.$/
3894parse_tree.prog_data merc-src/accumulator.m /^:- import_module parse_tree.prog_data.$/
3895parse_tree.prog_mode merc-src/accumulator.m /^:- import_module parse_tree.prog_mode.$/
3896parse_tree.prog_util merc-src/accumulator.m /^:- import_module parse_tree.prog_util.$/
3897parse_tree.set_of_var merc-src/accumulator.m /^:- import_module parse_tree.set_of_var.$/
3898pat c-src/etags.c 262 3878pat c-src/etags.c 262
3899pattern c-src/etags.c 260 3879pattern c-src/etags.c 260
3900pdlcount c-src/emacs/src/lisp.h 3046 3880pdlcount c-src/emacs/src/lisp.h 3046
@@ -4277,6 +4257,7 @@ step_everybody cp-src/clheir.cpp /^void step_everybody(void)$/
4277stop_polling c-src/emacs/src/keyboard.c /^stop_polling (void)$/ 4257stop_polling c-src/emacs/src/keyboard.c /^stop_polling (void)$/
4278store_info merc-src/accumulator.m /^:- type store_info$/ 4258store_info merc-src/accumulator.m /^:- type store_info$/
4279store_user_signal_events c-src/emacs/src/keyboard.c /^store_user_signal_events (void)$/ 4259store_user_signal_events c-src/emacs/src/keyboard.c /^store_user_signal_events (void)$/
4260stored_goal_plain_call merc-src/accumulator.m /^:- inst stored_goal_plain_call for goal_store.stor/
4280str go-src/test1.go 9 4261str go-src/test1.go 9
4281strcaseeq c-src/etags.c /^#define strcaseeq(s,t) (assert ((s)!=NULL && (t)!=/ 4262strcaseeq c-src/etags.c /^#define strcaseeq(s,t) (assert ((s)!=NULL && (t)!=/
4282streq c-src/etags.c /^#define streq(s,t) (assert ((s)!=NULL || (t)!=NULL/ 4263streq c-src/etags.c /^#define streq(s,t) (assert ((s)!=NULL || (t)!=NULL/
@@ -4484,9 +4465,6 @@ tpcmd c-src/h.h 15
4484track-mouse c-src/emacs/src/keyboard.c /^DEFUN ("internal--track-mouse", Ftrack_mouse, Stra/ 4465track-mouse c-src/emacs/src/keyboard.c /^DEFUN ("internal--track-mouse", Ftrack_mouse, Stra/
4485tracking_off c-src/emacs/src/keyboard.c /^tracking_off (Lisp_Object old_value)$/ 4466tracking_off c-src/emacs/src/keyboard.c /^tracking_off (Lisp_Object old_value)$/
4486traffic_light cp-src/conway.cpp /^void traffic_light(int x, int y)$/ 4467traffic_light cp-src/conway.cpp /^void traffic_light(int x, int y)$/
4487transform_hlds.accumulator merc-src/accumulator.m /^:- module transform_hlds.accumulator.$/
4488transform_hlds.accumulator merc-src/accumulator.m /^:- end_module transform_hlds.accumulator.$/
4489transform_hlds.goal_store merc-src/accumulator.m /^:- import_module transform_hlds.goal_store.$/
4490translate c-src/emacs/src/regex.h 361 4468translate c-src/emacs/src/regex.h 361
4491treats cp-src/c.C 131 4469treats cp-src/c.C 131
4492tt prol-src/natded.prolog /^tt:-$/ 4470tt prol-src/natded.prolog /^tt:-$/
@@ -4533,6 +4511,7 @@ unblock_input_to c-src/emacs/src/keyboard.c /^unblock_input_to (int level)$/
4533unchar c-src/h.h 99 4511unchar c-src/h.h 99
4534unexpand-abbrev c-src/abbrev.c /^DEFUN ("unexpand-abbrev", Funexpand_abbrev, Sunexp/ 4512unexpand-abbrev c-src/abbrev.c /^DEFUN ("unexpand-abbrev", Funexpand_abbrev, Sunexp/
4535univ merc-src/accumulator.m /^:- import_module univ.$/ 4513univ merc-src/accumulator.m /^:- import_module univ.$/
4514unravel_univ merc-src/accumulator.m /^:- some [T] pred unravel_univ(univ::in, T::out) is/
4536unread_switch_frame c-src/emacs/src/keyboard.c 204 4515unread_switch_frame c-src/emacs/src/keyboard.c 204
4537unsignedp y-src/cccp.y 112 4516unsignedp y-src/cccp.y 112
4538unwind c-src/emacs/src/lisp.h 2962 4517unwind c-src/emacs/src/lisp.h 2962
diff --git a/test/manual/etags/ETAGS.good_1 b/test/manual/etags/ETAGS.good_1
index e05b8f2aafe..4eae68b5c25 100644
--- a/test/manual/etags/ETAGS.good_1
+++ b/test/manual/etags/ETAGS.good_1
@@ -3881,38 +3881,15 @@ Section\xreftie'char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno %
3881\global\def={=3307,107500 3881\global\def={=3307,107500
3882\def\normalbackslash{\normalbackslash3321,107882 3882\def\normalbackslash{\normalbackslash3321,107882
3883 3883
3884merc-src/accumulator.m,4275 3884merc-src/accumulator.m,3228
3885:- module transform_hlds.accumulator145,5333 3885:- interface146,5371
3886:- import_module hlds148,5386 3886:- import_module hlds148,5386
3887:- import_module hlds.hlds_module149,5409
3888:- import_module hlds.hlds_pred150,5444
3889:- import_module univ152,5478 3887:- import_module univ152,5478
3890:- pred accu_transform_proc(159,5793 3888:- pred accu_transform_proc159,5793
3891:- import_module hlds.assertion168,6135 3889:- implementation166,6115
3892:- import_module hlds.goal_util169,6168
3893:- import_module hlds.hlds_error_util170,6201
3894:- import_module hlds.hlds_goal171,6240
3895:- import_module hlds.hlds_out172,6273
3896:- import_module hlds.hlds_out.hlds_out_util173,6305
3897:- import_module hlds.hlds_promise174,6351
3898:- import_module hlds.instmap175,6387
3899:- import_module hlds.pred_table176,6418
3900:- import_module hlds.quantification177,6452
3901:- import_module hlds.status178,6490
3902:- import_module hlds.vartypes179,6520
3903:- import_module libs180,6552 3890:- import_module libs180,6552
3904:- import_module libs.globals181,6575
3905:- import_module libs.optimization_options182,6606
3906:- import_module libs.options183,6650
3907:- import_module mdbcomp184,6681 3891:- import_module mdbcomp184,6681
3908:- import_module mdbcomp.sym_name185,6707
3909:- import_module parse_tree186,6742 3892:- import_module parse_tree186,6742
3910:- import_module parse_tree.error_util187,6771
3911:- import_module parse_tree.prog_data188,6811
3912:- import_module parse_tree.prog_mode189,6850
3913:- import_module parse_tree.prog_util190,6889
3914:- import_module parse_tree.set_of_var191,6928
3915:- import_module transform_hlds.goal_store192,6968
3916:- import_module assoc_list194,7013 3893:- import_module assoc_list194,7013
3917:- import_module bool195,7042 3894:- import_module bool195,7042
3918:- import_module int196,7065 3895:- import_module int196,7065
@@ -3933,69 +3910,71 @@ merc-src/accumulator.m,4275
3933:- type accu_goal_store234,8091 3910:- type accu_goal_store234,8091
3934:- type accu_subst238,8216 3911:- type accu_subst238,8216
3935:- type accu_warning240,8264 3912:- type accu_warning240,8264
3936:- pred generate_warnings(334,12550 3913:- pred generate_warnings334,12550
3937:- pred generate_warning(342,12895 3914:- pred generate_warning342,12895
3938:- pred should_attempt_accu_transform(365,13886 3915:- pred should_attempt_accu_transform365,13886
3939:- pred should_attempt_accu_transform_2(398,15406 3916:- pred should_attempt_accu_transform_2398,15406
3940:- pred accu_standardize(440,17390 3917:- pred accu_standardize440,17390
3941:- pred identify_goal_type(465,18169 3918:- pred identify_goal_type465,18169
3942:- pred is_recursive_case(549,21175 3919:- pred is_recursive_case549,21175
3943:- type store_info560,21713 3920:- type store_info560,21713
3944:- func initialize_goal_store(570,22060 3921:- func initialize_goal_store570,22060
3945:- pred accu_store(580,22421 3922:- pred accu_store580,22421
3946:- pred identify_recursive_calls(601,23288 3923:- pred identify_recursive_calls601,23288
3947:- pred identify_out_and_out_prime(626,24396 3924:- pred identify_out_and_out_prime626,24396
3948:- type accu_sets676,26425 3925:- type accu_sets676,26425
3949:- pred accu_stage1(689,26977 3926:- pred accu_stage1689,26977
3950:- pred accu_stage1_2(727,28347 3927:- pred accu_stage1_2727,28347
3951:- pred accu_sets_init(781,30557 3928:- pred accu_sets_init781,30557
3952:- func set_upto(796,30984 3929:- func set_upto796,30984
3953:- pred accu_before(812,31498 3930:- pred accu_before812,31498
3954:- pred accu_assoc(835,32477 3931:- pred accu_assoc835,32477
3955:- pred accu_construct(862,33712 3932:- pred accu_construct862,33712
3956:- pred accu_construct_assoc(896,35307 3933:- pred accu_construct_assoc896,35307
3957:- pred accu_update(938,37069 3934:- pred accu_update938,37069
3958:- pred member_lessthan_goalid(964,38219 3935:- pred member_lessthan_goalid964,38219
3959:- type accu_assoc975,38652 3936:- type accu_assoc975,38652
3960:- pred accu_is_associative(986,39138 3937:- pred accu_is_associative986,39138
3961:- pred associativity_assertion(1014,40263 3938:- pred associativity_assertion1014,40263
3962:- pred commutativity_assertion(1037,41242 3939:- pred commutativity_assertion1037,41242
3963:- pred accu_is_update(1057,41952 3940:- pred accu_is_update1057,41952
3964:- pred is_associative_construction(1078,42802 3941:- pred is_associative_construction1078,42802
3965:- type accu_substs1095,43480 3942:- type accu_substs1095,43480
3966:- type accu_base1103,43744 3943:- type accu_base1103,43744
3967:- pred accu_stage2(1124,44605 3944:- pred accu_stage21124,44605
3968:- pred accu_substs_init(1179,46957 3945:- pred accu_substs_init1179,46957
3969:- pred acc_var_subst_init(1194,47573 3946:- pred acc_var_subst_init1194,47573
3970:- pred create_new_var(1207,48147 3947:- pred create_new_var1207,48147
3971:- pred accu_process_assoc_set(1223,48862 3948:- pred accu_process_assoc_set1223,48862
3972:- pred accu_has_heuristic(1297,52081 3949:- pred accu_has_heuristic1297,52081
3973:- pred accu_heuristic(1304,52336 3950:- pred accu_heuristic1304,52336
3974:- pred accu_process_update_set(1318,52906 3951:- pred accu_process_update_set1318,52906
3975:- pred accu_divide_base_case(1380,55844 3952:- pred accu_divide_base_case1380,55844
3976:- pred accu_related(1412,57146 3953:- pred accu_related1412,57146
3977:- pred lookup_call(1449,58601 3954:- inst stored_goal_plain_call1444,58415
3978:- pred accu_stage3(1470,59432 3955:- pred lookup_call1449,58601
3979:- pred acc_proc_info(1508,61326 3956:- pred accu_stage31470,59432
3980:- pred acc_pred_info(1556,63449 3957:- pred acc_proc_info1508,61326
3981:- pred accu_create_goal(1600,65285 3958:- pred acc_pred_info1556,63449
3982:- func create_acc_call(1621,66400 3959:- pred accu_create_goal1600,65285
3983:- pred create_orig_goal(1634,66987 3960:- func create_acc_call1621,66400
3984:- pred create_acc_goal(1662,68157 3961:- pred create_orig_goal1634,66987
3985:- func create_new_orig_recursive_goals(1709,70225 3962:- pred create_acc_goal1662,68157
3986:- func create_new_recursive_goals(1723,70918 3963:- func create_new_orig_recursive_goals1709,70225
3987:- func create_new_base_goals(1738,71717 3964:- func create_new_recursive_goals1723,70918
3988:- pred acc_unification(1749,72156 3965:- func create_new_base_goals1738,71717
3989:- pred accu_top_level(1766,72896 3966:- pred acc_unification1749,72156
3990:- pred update_accumulator_pred(1856,76290 3967:- pred accu_top_level1766,72896
3991:- func accu_rename(1876,77253 3968:- pred update_accumulator_pred1856,76290
3992:- func base_case_ids(1889,77784 3969:- func accu_rename1876,77253
3993:- func base_case_ids_set(1898,78048 3970:- func base_case_ids1889,77784
3994:- func accu_goal_list(1905,78269 3971:- func base_case_ids_set1898,78048
3995:- pred calculate_goal_info(1916,78680 3972:- func accu_goal_list1905,78269
3996:- func chain_subst(1932,79319 3973:- pred calculate_goal_info1916,78680
3997:- pred chain_subst_2(1938,79482 3974:- func chain_subst1932,79319
3998:- end_module transform_hlds.accumulator1953,79939 3975:- pred chain_subst_21938,79482
3976:- some [T] pred unravel_univ1956,80060
3977:- pragma foreign_export1957,80116
3999 3978
4000c-src/c.c,76 3979c-src/c.c,76
4001T f(1,0 3980T f(1,0
diff --git a/test/manual/etags/ETAGS.good_2 b/test/manual/etags/ETAGS.good_2
index c3d2726ece1..45979d6a763 100644
--- a/test/manual/etags/ETAGS.good_2
+++ b/test/manual/etags/ETAGS.good_2
@@ -4454,38 +4454,15 @@ Section\xreftie'char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno %
4454\global\def={=3307,107500 4454\global\def={=3307,107500
4455\def\normalbackslash{\normalbackslash3321,107882 4455\def\normalbackslash{\normalbackslash3321,107882
4456 4456
4457merc-src/accumulator.m,5996 4457merc-src/accumulator.m,4915
4458:- module transform_hlds.accumulator145,5333 4458:- interface146,5371
4459:- import_module hlds148,5386 4459:- import_module hlds148,5386
4460:- import_module hlds.hlds_module149,5409
4461:- import_module hlds.hlds_pred150,5444
4462:- import_module univ152,5478 4460:- import_module univ152,5478
4463:- pred accu_transform_proc(159,5793 4461:- pred accu_transform_proc159,5793
4464:- import_module hlds.assertion168,6135 4462:- implementation166,6115
4465:- import_module hlds.goal_util169,6168
4466:- import_module hlds.hlds_error_util170,6201
4467:- import_module hlds.hlds_goal171,6240
4468:- import_module hlds.hlds_out172,6273
4469:- import_module hlds.hlds_out.hlds_out_util173,6305
4470:- import_module hlds.hlds_promise174,6351
4471:- import_module hlds.instmap175,6387
4472:- import_module hlds.pred_table176,6418
4473:- import_module hlds.quantification177,6452
4474:- import_module hlds.status178,6490
4475:- import_module hlds.vartypes179,6520
4476:- import_module libs180,6552 4463:- import_module libs180,6552
4477:- import_module libs.globals181,6575
4478:- import_module libs.optimization_options182,6606
4479:- import_module libs.options183,6650
4480:- import_module mdbcomp184,6681 4464:- import_module mdbcomp184,6681
4481:- import_module mdbcomp.sym_name185,6707
4482:- import_module parse_tree186,6742 4465:- import_module parse_tree186,6742
4483:- import_module parse_tree.error_util187,6771
4484:- import_module parse_tree.prog_data188,6811
4485:- import_module parse_tree.prog_mode189,6850
4486:- import_module parse_tree.prog_util190,6889
4487:- import_module parse_tree.set_of_var191,6928
4488:- import_module transform_hlds.goal_store192,6968
4489:- import_module assoc_list194,7013 4466:- import_module assoc_list194,7013
4490:- import_module bool195,7042 4467:- import_module bool195,7042
4491:- import_module int196,7065 4468:- import_module int196,7065
@@ -4506,127 +4483,130 @@ merc-src/accumulator.m,5996
4506:- type accu_goal_store234,8091 4483:- type accu_goal_store234,8091
4507:- type accu_subst238,8216 4484:- type accu_subst238,8216
4508:- type accu_warning240,8264 4485:- type accu_warning240,8264
4509accu_transform_proc(247,8578 4486accu_transform_proc247,8578
4510:- pred generate_warnings(334,12550 4487:- pred generate_warnings334,12550
4511generate_warnings(337,12669 4488generate_warnings337,12669
4512:- pred generate_warning(342,12895 4489:- pred generate_warning342,12895
4513generate_warning(345,13001 4490generate_warning345,13001
4514:- pred should_attempt_accu_transform(365,13886 4491:- pred should_attempt_accu_transform365,13886
4515should_attempt_accu_transform(370,14123 4492should_attempt_accu_transform370,14123
4516:- pred should_attempt_accu_transform_2(398,15406 4493:- pred should_attempt_accu_transform_2398,15406
4517should_attempt_accu_transform_2(405,15763 4494should_attempt_accu_transform_2405,15763
4518:- pred accu_standardize(440,17390 4495:- pred accu_standardize440,17390
4519accu_standardize(442,17455 4496accu_standardize442,17455
4520:- pred identify_goal_type(465,18169 4497:- pred identify_goal_type465,18169
4521identify_goal_type(469,18359 4498identify_goal_type469,18359
4522:- pred is_recursive_case(549,21175 4499:- pred is_recursive_case549,21175
4523is_recursive_case(551,21253 4500is_recursive_case551,21253
4524:- type store_info560,21713 4501:- type store_info560,21713
4525:- func initialize_goal_store(570,22060 4502:- func initialize_goal_store570,22060
4526initialize_goal_store(573,22166 4503initialize_goal_store573,22166
4527:- pred accu_store(580,22421 4504:- pred accu_store580,22421
4528accu_store(584,22576 4505accu_store584,22576
4529:- pred identify_recursive_calls(601,23288 4506:- pred identify_recursive_calls601,23288
4530identify_recursive_calls(604,23406 4507identify_recursive_calls604,23406
4531:- pred identify_out_and_out_prime(626,24396 4508:- pred identify_out_and_out_prime626,24396
4532identify_out_and_out_prime(631,24631 4509identify_out_and_out_prime631,24631
4533:- type accu_sets676,26425 4510:- type accu_sets676,26425
4534:- pred accu_stage1(689,26977 4511:- pred accu_stage1689,26977
4535accu_stage1(693,27155 4512accu_stage1693,27155
4536:- pred accu_stage1_2(727,28347 4513:- pred accu_stage1_2727,28347
4537accu_stage1_2(731,28515 4514accu_stage1_2731,28515
4538:- pred accu_sets_init(781,30557 4515:- pred accu_sets_init781,30557
4539accu_sets_init(783,30605 4516accu_sets_init783,30605
4540:- func set_upto(796,30984 4517:- func set_upto796,30984
4541set_upto(798,31039 4518set_upto798,31039
4542:- pred accu_before(812,31498 4519:- pred accu_before812,31498
4543accu_before(815,31639 4520accu_before815,31639
4544:- pred accu_assoc(835,32477 4521:- pred accu_assoc835,32477
4545accu_assoc(838,32617 4522accu_assoc838,32617
4546:- pred accu_construct(862,33712 4523:- pred accu_construct862,33712
4547accu_construct(865,33856 4524accu_construct865,33856
4548:- pred accu_construct_assoc(896,35307 4525:- pred accu_construct_assoc896,35307
4549accu_construct_assoc(899,35457 4526accu_construct_assoc899,35457
4550:- pred accu_update(938,37069 4527:- pred accu_update938,37069
4551accu_update(941,37210 4528accu_update941,37210
4552:- pred member_lessthan_goalid(964,38219 4529:- pred member_lessthan_goalid964,38219
4553member_lessthan_goalid(967,38342 4530member_lessthan_goalid967,38342
4554:- type accu_assoc975,38652 4531:- type accu_assoc975,38652
4555:- pred accu_is_associative(986,39138 4532:- pred accu_is_associative986,39138
4556accu_is_associative(989,39250 4533accu_is_associative989,39250
4557:- pred associativity_assertion(1014,40263 4534:- pred associativity_assertion1014,40263
4558associativity_assertion(1017,40404 4535associativity_assertion1017,40404
4559:- pred commutativity_assertion(1037,41242 4536:- pred commutativity_assertion1037,41242
4560commutativity_assertion(1040,41369 4537commutativity_assertion1040,41369
4561:- pred accu_is_update(1057,41952 4538:- pred accu_is_update1057,41952
4562accu_is_update(1060,42066 4539accu_is_update1060,42066
4563:- pred is_associative_construction(1078,42802 4540:- pred is_associative_construction1078,42802
4564is_associative_construction(1081,42898 4541is_associative_construction1081,42898
4565:- type accu_substs1095,43480 4542:- type accu_substs1095,43480
4566:- type accu_base1103,43744 4543:- type accu_base1103,43744
4567:- pred accu_stage2(1124,44605 4544:- pred accu_stage21124,44605
4568accu_stage2(1131,44946 4545accu_stage21131,44946
4569:- pred accu_substs_init(1179,46957 4546:- pred accu_substs_init1179,46957
4570accu_substs_init(1182,47097 4547accu_substs_init1182,47097
4571:- pred acc_var_subst_init(1194,47573 4548:- pred acc_var_subst_init1194,47573
4572acc_var_subst_init(1198,47718 4549acc_var_subst_init1198,47718
4573:- pred create_new_var(1207,48147 4550:- pred create_new_var1207,48147
4574create_new_var(1210,48288 4551create_new_var1210,48288
4575:- pred accu_process_assoc_set(1223,48862 4552:- pred accu_process_assoc_set1223,48862
4576accu_process_assoc_set(1229,49150 4553accu_process_assoc_set1229,49150
4577:- pred accu_has_heuristic(1297,52081 4554:- pred accu_has_heuristic1297,52081
4578accu_has_heuristic(1299,52161 4555accu_has_heuristic1299,52161
4579:- pred accu_heuristic(1304,52336 4556:- pred accu_heuristic1304,52336
4580accu_heuristic(1307,52457 4557accu_heuristic1307,52457
4581:- pred accu_process_update_set(1318,52906 4558:- pred accu_process_update_set1318,52906
4582accu_process_update_set(1325,53221 4559accu_process_update_set1325,53221
4583:- pred accu_divide_base_case(1380,55844 4560:- pred accu_divide_base_case1380,55844
4584accu_divide_base_case(1385,56059 4561accu_divide_base_case1385,56059
4585:- pred accu_related(1412,57146 4562:- pred accu_related1412,57146
4586accu_related(1415,57270 4563accu_related1415,57270
4587:- pred lookup_call(1449,58601 4564:- inst stored_goal_plain_call1444,58415
4588lookup_call(1452,58715 4565:- pred lookup_call1449,58601
4589:- pred accu_stage3(1470,59432 4566lookup_call1452,58715
4590accu_stage3(1477,59826 4567:- pred accu_stage31470,59432
4591:- pred acc_proc_info(1508,61326 4568accu_stage31477,59826
4592acc_proc_info(1512,61485 4569:- pred acc_proc_info1508,61326
4593:- pred acc_pred_info(1556,63449 4570acc_proc_info1512,61485
4594acc_pred_info(1559,63597 4571:- pred acc_pred_info1556,63449
4595:- pred accu_create_goal(1600,65285 4572acc_pred_info1559,63597
4596accu_create_goal(1607,65628 4573:- pred accu_create_goal1600,65285
4597:- func create_acc_call(1621,66400 4574accu_create_goal1607,65628
4598create_acc_call(1625,66569 4575:- func create_acc_call1621,66400
4599:- pred create_orig_goal(1634,66987 4576create_acc_call1625,66569
4600create_orig_goal(1638,67176 4577:- pred create_orig_goal1634,66987
4601:- pred create_acc_goal(1662,68157 4578create_orig_goal1638,67176
4602create_acc_goal(1667,68380 4579:- pred create_acc_goal1662,68157
4603:- func create_new_orig_recursive_goals(1709,70225 4580create_acc_goal1667,68380
4604create_new_orig_recursive_goals(1712,70368 4581:- func create_new_orig_recursive_goals1709,70225
4605:- func create_new_recursive_goals(1723,70918 4582create_new_orig_recursive_goals1712,70368
4606create_new_recursive_goals(1727,71108 4583:- func create_new_recursive_goals1723,70918
4607:- func create_new_base_goals(1738,71717 4584create_new_recursive_goals1727,71108
4608create_new_base_goals(1741,71831 4585:- func create_new_base_goals1738,71717
4609:- pred acc_unification(1749,72156 4586create_new_base_goals1741,71831
4610acc_unification(1751,72225 4587:- pred acc_unification1749,72156
4611:- pred accu_top_level(1766,72896 4588acc_unification1751,72225
4612accu_top_level(1770,73058 4589:- pred accu_top_level1766,72896
4613:- pred update_accumulator_pred(1856,76290 4590accu_top_level1770,73058
4614update_accumulator_pred(1859,76411 4591:- pred update_accumulator_pred1856,76290
4615:- func accu_rename(1876,77253 4592update_accumulator_pred1859,76411
4616accu_rename(1879,77363 4593:- func accu_rename1876,77253
4617:- func base_case_ids(1889,77784 4594accu_rename1879,77363
4618base_case_ids(1891,77846 4595:- func base_case_ids1889,77784
4619:- func base_case_ids_set(1898,78048 4596base_case_ids1891,77846
4620base_case_ids_set(1900,78113 4597:- func base_case_ids_set1898,78048
4621:- func accu_goal_list(1905,78269 4598base_case_ids_set1900,78113
4622accu_goal_list(1907,78349 4599:- func accu_goal_list1905,78269
4623:- pred calculate_goal_info(1916,78680 4600accu_goal_list1907,78349
4624calculate_goal_info(1918,78753 4601:- pred calculate_goal_info1916,78680
4625:- func chain_subst(1932,79319 4602calculate_goal_info1918,78753
4626chain_subst(1934,79378 4603:- func chain_subst1932,79319
4627:- pred chain_subst_2(1938,79482 4604chain_subst1934,79378
4628chain_subst_2(1941,79576 4605:- pred chain_subst_21938,79482
4629:- end_module transform_hlds.accumulator1953,79939 4606chain_subst_21941,79576
4607:- some [T] pred unravel_univ1956,80060
4608:- pragma foreign_export1957,80116
4609unravel_univ1961,80340
4630 4610
4631c-src/c.c,76 4611c-src/c.c,76
4632T f(1,0 4612T f(1,0
diff --git a/test/manual/etags/ETAGS.good_3 b/test/manual/etags/ETAGS.good_3
index 85897febbf6..36edc389617 100644
--- a/test/manual/etags/ETAGS.good_3
+++ b/test/manual/etags/ETAGS.good_3
@@ -4288,38 +4288,15 @@ Section\xreftie'char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno %
4288\global\def={=3307,107500 4288\global\def={=3307,107500
4289\def\normalbackslash{\normalbackslash3321,107882 4289\def\normalbackslash{\normalbackslash3321,107882
4290 4290
4291merc-src/accumulator.m,4275 4291merc-src/accumulator.m,3228
4292:- module transform_hlds.accumulator145,5333 4292:- interface146,5371
4293:- import_module hlds148,5386 4293:- import_module hlds148,5386
4294:- import_module hlds.hlds_module149,5409
4295:- import_module hlds.hlds_pred150,5444
4296:- import_module univ152,5478 4294:- import_module univ152,5478
4297:- pred accu_transform_proc(159,5793 4295:- pred accu_transform_proc159,5793
4298:- import_module hlds.assertion168,6135 4296:- implementation166,6115
4299:- import_module hlds.goal_util169,6168
4300:- import_module hlds.hlds_error_util170,6201
4301:- import_module hlds.hlds_goal171,6240
4302:- import_module hlds.hlds_out172,6273
4303:- import_module hlds.hlds_out.hlds_out_util173,6305
4304:- import_module hlds.hlds_promise174,6351
4305:- import_module hlds.instmap175,6387
4306:- import_module hlds.pred_table176,6418
4307:- import_module hlds.quantification177,6452
4308:- import_module hlds.status178,6490
4309:- import_module hlds.vartypes179,6520
4310:- import_module libs180,6552 4297:- import_module libs180,6552
4311:- import_module libs.globals181,6575
4312:- import_module libs.optimization_options182,6606
4313:- import_module libs.options183,6650
4314:- import_module mdbcomp184,6681 4298:- import_module mdbcomp184,6681
4315:- import_module mdbcomp.sym_name185,6707
4316:- import_module parse_tree186,6742 4299:- import_module parse_tree186,6742
4317:- import_module parse_tree.error_util187,6771
4318:- import_module parse_tree.prog_data188,6811
4319:- import_module parse_tree.prog_mode189,6850
4320:- import_module parse_tree.prog_util190,6889
4321:- import_module parse_tree.set_of_var191,6928
4322:- import_module transform_hlds.goal_store192,6968
4323:- import_module assoc_list194,7013 4300:- import_module assoc_list194,7013
4324:- import_module bool195,7042 4301:- import_module bool195,7042
4325:- import_module int196,7065 4302:- import_module int196,7065
@@ -4340,69 +4317,71 @@ merc-src/accumulator.m,4275
4340:- type accu_goal_store234,8091 4317:- type accu_goal_store234,8091
4341:- type accu_subst238,8216 4318:- type accu_subst238,8216
4342:- type accu_warning240,8264 4319:- type accu_warning240,8264
4343:- pred generate_warnings(334,12550 4320:- pred generate_warnings334,12550
4344:- pred generate_warning(342,12895 4321:- pred generate_warning342,12895
4345:- pred should_attempt_accu_transform(365,13886 4322:- pred should_attempt_accu_transform365,13886
4346:- pred should_attempt_accu_transform_2(398,15406 4323:- pred should_attempt_accu_transform_2398,15406
4347:- pred accu_standardize(440,17390 4324:- pred accu_standardize440,17390
4348:- pred identify_goal_type(465,18169 4325:- pred identify_goal_type465,18169
4349:- pred is_recursive_case(549,21175 4326:- pred is_recursive_case549,21175
4350:- type store_info560,21713 4327:- type store_info560,21713
4351:- func initialize_goal_store(570,22060 4328:- func initialize_goal_store570,22060
4352:- pred accu_store(580,22421 4329:- pred accu_store580,22421
4353:- pred identify_recursive_calls(601,23288 4330:- pred identify_recursive_calls601,23288
4354:- pred identify_out_and_out_prime(626,24396 4331:- pred identify_out_and_out_prime626,24396
4355:- type accu_sets676,26425 4332:- type accu_sets676,26425
4356:- pred accu_stage1(689,26977 4333:- pred accu_stage1689,26977
4357:- pred accu_stage1_2(727,28347 4334:- pred accu_stage1_2727,28347
4358:- pred accu_sets_init(781,30557 4335:- pred accu_sets_init781,30557
4359:- func set_upto(796,30984 4336:- func set_upto796,30984
4360:- pred accu_before(812,31498 4337:- pred accu_before812,31498
4361:- pred accu_assoc(835,32477 4338:- pred accu_assoc835,32477
4362:- pred accu_construct(862,33712 4339:- pred accu_construct862,33712
4363:- pred accu_construct_assoc(896,35307 4340:- pred accu_construct_assoc896,35307
4364:- pred accu_update(938,37069 4341:- pred accu_update938,37069
4365:- pred member_lessthan_goalid(964,38219 4342:- pred member_lessthan_goalid964,38219
4366:- type accu_assoc975,38652 4343:- type accu_assoc975,38652
4367:- pred accu_is_associative(986,39138 4344:- pred accu_is_associative986,39138
4368:- pred associativity_assertion(1014,40263 4345:- pred associativity_assertion1014,40263
4369:- pred commutativity_assertion(1037,41242 4346:- pred commutativity_assertion1037,41242
4370:- pred accu_is_update(1057,41952 4347:- pred accu_is_update1057,41952
4371:- pred is_associative_construction(1078,42802 4348:- pred is_associative_construction1078,42802
4372:- type accu_substs1095,43480 4349:- type accu_substs1095,43480
4373:- type accu_base1103,43744 4350:- type accu_base1103,43744
4374:- pred accu_stage2(1124,44605 4351:- pred accu_stage21124,44605
4375:- pred accu_substs_init(1179,46957 4352:- pred accu_substs_init1179,46957
4376:- pred acc_var_subst_init(1194,47573 4353:- pred acc_var_subst_init1194,47573
4377:- pred create_new_var(1207,48147 4354:- pred create_new_var1207,48147
4378:- pred accu_process_assoc_set(1223,48862 4355:- pred accu_process_assoc_set1223,48862
4379:- pred accu_has_heuristic(1297,52081 4356:- pred accu_has_heuristic1297,52081
4380:- pred accu_heuristic(1304,52336 4357:- pred accu_heuristic1304,52336
4381:- pred accu_process_update_set(1318,52906 4358:- pred accu_process_update_set1318,52906
4382:- pred accu_divide_base_case(1380,55844 4359:- pred accu_divide_base_case1380,55844
4383:- pred accu_related(1412,57146 4360:- pred accu_related1412,57146
4384:- pred lookup_call(1449,58601 4361:- inst stored_goal_plain_call1444,58415
4385:- pred accu_stage3(1470,59432 4362:- pred lookup_call1449,58601
4386:- pred acc_proc_info(1508,61326 4363:- pred accu_stage31470,59432
4387:- pred acc_pred_info(1556,63449 4364:- pred acc_proc_info1508,61326
4388:- pred accu_create_goal(1600,65285 4365:- pred acc_pred_info1556,63449
4389:- func create_acc_call(1621,66400 4366:- pred accu_create_goal1600,65285
4390:- pred create_orig_goal(1634,66987 4367:- func create_acc_call1621,66400
4391:- pred create_acc_goal(1662,68157 4368:- pred create_orig_goal1634,66987
4392:- func create_new_orig_recursive_goals(1709,70225 4369:- pred create_acc_goal1662,68157
4393:- func create_new_recursive_goals(1723,70918 4370:- func create_new_orig_recursive_goals1709,70225
4394:- func create_new_base_goals(1738,71717 4371:- func create_new_recursive_goals1723,70918
4395:- pred acc_unification(1749,72156 4372:- func create_new_base_goals1738,71717
4396:- pred accu_top_level(1766,72896 4373:- pred acc_unification1749,72156
4397:- pred update_accumulator_pred(1856,76290 4374:- pred accu_top_level1766,72896
4398:- func accu_rename(1876,77253 4375:- pred update_accumulator_pred1856,76290
4399:- func base_case_ids(1889,77784 4376:- func accu_rename1876,77253
4400:- func base_case_ids_set(1898,78048 4377:- func base_case_ids1889,77784
4401:- func accu_goal_list(1905,78269 4378:- func base_case_ids_set1898,78048
4402:- pred calculate_goal_info(1916,78680 4379:- func accu_goal_list1905,78269
4403:- func chain_subst(1932,79319 4380:- pred calculate_goal_info1916,78680
4404:- pred chain_subst_2(1938,79482 4381:- func chain_subst1932,79319
4405:- end_module transform_hlds.accumulator1953,79939 4382:- pred chain_subst_21938,79482
4383:- some [T] pred unravel_univ1956,80060
4384:- pragma foreign_export1957,80116
4406 4385
4407c-src/c.c,76 4386c-src/c.c,76
4408T f(1,0 4387T f(1,0
diff --git a/test/manual/etags/ETAGS.good_4 b/test/manual/etags/ETAGS.good_4
index 828a6b864cc..e726a993a91 100644
--- a/test/manual/etags/ETAGS.good_4
+++ b/test/manual/etags/ETAGS.good_4
@@ -4043,38 +4043,15 @@ Section\xreftie'char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno %
4043\global\def={=3307,107500 4043\global\def={=3307,107500
4044\def\normalbackslash{\normalbackslash3321,107882 4044\def\normalbackslash{\normalbackslash3321,107882
4045 4045
4046merc-src/accumulator.m,4275 4046merc-src/accumulator.m,3228
4047:- module transform_hlds.accumulator145,5333 4047:- interface146,5371
4048:- import_module hlds148,5386 4048:- import_module hlds148,5386
4049:- import_module hlds.hlds_module149,5409
4050:- import_module hlds.hlds_pred150,5444
4051:- import_module univ152,5478 4049:- import_module univ152,5478
4052:- pred accu_transform_proc(159,5793 4050:- pred accu_transform_proc159,5793
4053:- import_module hlds.assertion168,6135 4051:- implementation166,6115
4054:- import_module hlds.goal_util169,6168
4055:- import_module hlds.hlds_error_util170,6201
4056:- import_module hlds.hlds_goal171,6240
4057:- import_module hlds.hlds_out172,6273
4058:- import_module hlds.hlds_out.hlds_out_util173,6305
4059:- import_module hlds.hlds_promise174,6351
4060:- import_module hlds.instmap175,6387
4061:- import_module hlds.pred_table176,6418
4062:- import_module hlds.quantification177,6452
4063:- import_module hlds.status178,6490
4064:- import_module hlds.vartypes179,6520
4065:- import_module libs180,6552 4052:- import_module libs180,6552
4066:- import_module libs.globals181,6575
4067:- import_module libs.optimization_options182,6606
4068:- import_module libs.options183,6650
4069:- import_module mdbcomp184,6681 4053:- import_module mdbcomp184,6681
4070:- import_module mdbcomp.sym_name185,6707
4071:- import_module parse_tree186,6742 4054:- import_module parse_tree186,6742
4072:- import_module parse_tree.error_util187,6771
4073:- import_module parse_tree.prog_data188,6811
4074:- import_module parse_tree.prog_mode189,6850
4075:- import_module parse_tree.prog_util190,6889
4076:- import_module parse_tree.set_of_var191,6928
4077:- import_module transform_hlds.goal_store192,6968
4078:- import_module assoc_list194,7013 4055:- import_module assoc_list194,7013
4079:- import_module bool195,7042 4056:- import_module bool195,7042
4080:- import_module int196,7065 4057:- import_module int196,7065
@@ -4095,69 +4072,71 @@ merc-src/accumulator.m,4275
4095:- type accu_goal_store234,8091 4072:- type accu_goal_store234,8091
4096:- type accu_subst238,8216 4073:- type accu_subst238,8216
4097:- type accu_warning240,8264 4074:- type accu_warning240,8264
4098:- pred generate_warnings(334,12550 4075:- pred generate_warnings334,12550
4099:- pred generate_warning(342,12895 4076:- pred generate_warning342,12895
4100:- pred should_attempt_accu_transform(365,13886 4077:- pred should_attempt_accu_transform365,13886
4101:- pred should_attempt_accu_transform_2(398,15406 4078:- pred should_attempt_accu_transform_2398,15406
4102:- pred accu_standardize(440,17390 4079:- pred accu_standardize440,17390
4103:- pred identify_goal_type(465,18169 4080:- pred identify_goal_type465,18169
4104:- pred is_recursive_case(549,21175 4081:- pred is_recursive_case549,21175
4105:- type store_info560,21713 4082:- type store_info560,21713
4106:- func initialize_goal_store(570,22060 4083:- func initialize_goal_store570,22060
4107:- pred accu_store(580,22421 4084:- pred accu_store580,22421
4108:- pred identify_recursive_calls(601,23288 4085:- pred identify_recursive_calls601,23288
4109:- pred identify_out_and_out_prime(626,24396 4086:- pred identify_out_and_out_prime626,24396
4110:- type accu_sets676,26425 4087:- type accu_sets676,26425
4111:- pred accu_stage1(689,26977 4088:- pred accu_stage1689,26977
4112:- pred accu_stage1_2(727,28347 4089:- pred accu_stage1_2727,28347
4113:- pred accu_sets_init(781,30557 4090:- pred accu_sets_init781,30557
4114:- func set_upto(796,30984 4091:- func set_upto796,30984
4115:- pred accu_before(812,31498 4092:- pred accu_before812,31498
4116:- pred accu_assoc(835,32477 4093:- pred accu_assoc835,32477
4117:- pred accu_construct(862,33712 4094:- pred accu_construct862,33712
4118:- pred accu_construct_assoc(896,35307 4095:- pred accu_construct_assoc896,35307
4119:- pred accu_update(938,37069 4096:- pred accu_update938,37069
4120:- pred member_lessthan_goalid(964,38219 4097:- pred member_lessthan_goalid964,38219
4121:- type accu_assoc975,38652 4098:- type accu_assoc975,38652
4122:- pred accu_is_associative(986,39138 4099:- pred accu_is_associative986,39138
4123:- pred associativity_assertion(1014,40263 4100:- pred associativity_assertion1014,40263
4124:- pred commutativity_assertion(1037,41242 4101:- pred commutativity_assertion1037,41242
4125:- pred accu_is_update(1057,41952 4102:- pred accu_is_update1057,41952
4126:- pred is_associative_construction(1078,42802 4103:- pred is_associative_construction1078,42802
4127:- type accu_substs1095,43480 4104:- type accu_substs1095,43480
4128:- type accu_base1103,43744 4105:- type accu_base1103,43744
4129:- pred accu_stage2(1124,44605 4106:- pred accu_stage21124,44605
4130:- pred accu_substs_init(1179,46957 4107:- pred accu_substs_init1179,46957
4131:- pred acc_var_subst_init(1194,47573 4108:- pred acc_var_subst_init1194,47573
4132:- pred create_new_var(1207,48147 4109:- pred create_new_var1207,48147
4133:- pred accu_process_assoc_set(1223,48862 4110:- pred accu_process_assoc_set1223,48862
4134:- pred accu_has_heuristic(1297,52081 4111:- pred accu_has_heuristic1297,52081
4135:- pred accu_heuristic(1304,52336 4112:- pred accu_heuristic1304,52336
4136:- pred accu_process_update_set(1318,52906 4113:- pred accu_process_update_set1318,52906
4137:- pred accu_divide_base_case(1380,55844 4114:- pred accu_divide_base_case1380,55844
4138:- pred accu_related(1412,57146 4115:- pred accu_related1412,57146
4139:- pred lookup_call(1449,58601 4116:- inst stored_goal_plain_call1444,58415
4140:- pred accu_stage3(1470,59432 4117:- pred lookup_call1449,58601
4141:- pred acc_proc_info(1508,61326 4118:- pred accu_stage31470,59432
4142:- pred acc_pred_info(1556,63449 4119:- pred acc_proc_info1508,61326
4143:- pred accu_create_goal(1600,65285 4120:- pred acc_pred_info1556,63449
4144:- func create_acc_call(1621,66400 4121:- pred accu_create_goal1600,65285
4145:- pred create_orig_goal(1634,66987 4122:- func create_acc_call1621,66400
4146:- pred create_acc_goal(1662,68157 4123:- pred create_orig_goal1634,66987
4147:- func create_new_orig_recursive_goals(1709,70225 4124:- pred create_acc_goal1662,68157
4148:- func create_new_recursive_goals(1723,70918 4125:- func create_new_orig_recursive_goals1709,70225
4149:- func create_new_base_goals(1738,71717 4126:- func create_new_recursive_goals1723,70918
4150:- pred acc_unification(1749,72156 4127:- func create_new_base_goals1738,71717
4151:- pred accu_top_level(1766,72896 4128:- pred acc_unification1749,72156
4152:- pred update_accumulator_pred(1856,76290 4129:- pred accu_top_level1766,72896
4153:- func accu_rename(1876,77253 4130:- pred update_accumulator_pred1856,76290
4154:- func base_case_ids(1889,77784 4131:- func accu_rename1876,77253
4155:- func base_case_ids_set(1898,78048 4132:- func base_case_ids1889,77784
4156:- func accu_goal_list(1905,78269 4133:- func base_case_ids_set1898,78048
4157:- pred calculate_goal_info(1916,78680 4134:- func accu_goal_list1905,78269
4158:- func chain_subst(1932,79319 4135:- pred calculate_goal_info1916,78680
4159:- pred chain_subst_2(1938,79482 4136:- func chain_subst1932,79319
4160:- end_module transform_hlds.accumulator1953,79939 4137:- pred chain_subst_21938,79482
4138:- some [T] pred unravel_univ1956,80060
4139:- pragma foreign_export1957,80116
4161 4140
4162c-src/c.c,76 4141c-src/c.c,76
4163T f(1,0 4142T f(1,0
diff --git a/test/manual/etags/ETAGS.good_5 b/test/manual/etags/ETAGS.good_5
index 5b1dc4f7bc5..5133cc9e2b5 100644
--- a/test/manual/etags/ETAGS.good_5
+++ b/test/manual/etags/ETAGS.good_5
@@ -5023,38 +5023,15 @@ Section\xreftie'char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno %
5023\global\def={=3307,107500 5023\global\def={=3307,107500
5024\def\normalbackslash{\normalbackslash3321,107882 5024\def\normalbackslash{\normalbackslash3321,107882
5025 5025
5026merc-src/accumulator.m,5996 5026merc-src/accumulator.m,4915
5027:- module transform_hlds.accumulator145,5333 5027:- interface146,5371
5028:- import_module hlds148,5386 5028:- import_module hlds148,5386
5029:- import_module hlds.hlds_module149,5409
5030:- import_module hlds.hlds_pred150,5444
5031:- import_module univ152,5478 5029:- import_module univ152,5478
5032:- pred accu_transform_proc(159,5793 5030:- pred accu_transform_proc159,5793
5033:- import_module hlds.assertion168,6135 5031:- implementation166,6115
5034:- import_module hlds.goal_util169,6168
5035:- import_module hlds.hlds_error_util170,6201
5036:- import_module hlds.hlds_goal171,6240
5037:- import_module hlds.hlds_out172,6273
5038:- import_module hlds.hlds_out.hlds_out_util173,6305
5039:- import_module hlds.hlds_promise174,6351
5040:- import_module hlds.instmap175,6387
5041:- import_module hlds.pred_table176,6418
5042:- import_module hlds.quantification177,6452
5043:- import_module hlds.status178,6490
5044:- import_module hlds.vartypes179,6520
5045:- import_module libs180,6552 5032:- import_module libs180,6552
5046:- import_module libs.globals181,6575
5047:- import_module libs.optimization_options182,6606
5048:- import_module libs.options183,6650
5049:- import_module mdbcomp184,6681 5033:- import_module mdbcomp184,6681
5050:- import_module mdbcomp.sym_name185,6707
5051:- import_module parse_tree186,6742 5034:- import_module parse_tree186,6742
5052:- import_module parse_tree.error_util187,6771
5053:- import_module parse_tree.prog_data188,6811
5054:- import_module parse_tree.prog_mode189,6850
5055:- import_module parse_tree.prog_util190,6889
5056:- import_module parse_tree.set_of_var191,6928
5057:- import_module transform_hlds.goal_store192,6968
5058:- import_module assoc_list194,7013 5035:- import_module assoc_list194,7013
5059:- import_module bool195,7042 5036:- import_module bool195,7042
5060:- import_module int196,7065 5037:- import_module int196,7065
@@ -5075,127 +5052,130 @@ merc-src/accumulator.m,5996
5075:- type accu_goal_store234,8091 5052:- type accu_goal_store234,8091
5076:- type accu_subst238,8216 5053:- type accu_subst238,8216
5077:- type accu_warning240,8264 5054:- type accu_warning240,8264
5078accu_transform_proc(247,8578 5055accu_transform_proc247,8578
5079:- pred generate_warnings(334,12550 5056:- pred generate_warnings334,12550
5080generate_warnings(337,12669 5057generate_warnings337,12669
5081:- pred generate_warning(342,12895 5058:- pred generate_warning342,12895
5082generate_warning(345,13001 5059generate_warning345,13001
5083:- pred should_attempt_accu_transform(365,13886 5060:- pred should_attempt_accu_transform365,13886
5084should_attempt_accu_transform(370,14123 5061should_attempt_accu_transform370,14123
5085:- pred should_attempt_accu_transform_2(398,15406 5062:- pred should_attempt_accu_transform_2398,15406
5086should_attempt_accu_transform_2(405,15763 5063should_attempt_accu_transform_2405,15763
5087:- pred accu_standardize(440,17390 5064:- pred accu_standardize440,17390
5088accu_standardize(442,17455 5065accu_standardize442,17455
5089:- pred identify_goal_type(465,18169 5066:- pred identify_goal_type465,18169
5090identify_goal_type(469,18359 5067identify_goal_type469,18359
5091:- pred is_recursive_case(549,21175 5068:- pred is_recursive_case549,21175
5092is_recursive_case(551,21253 5069is_recursive_case551,21253
5093:- type store_info560,21713 5070:- type store_info560,21713
5094:- func initialize_goal_store(570,22060 5071:- func initialize_goal_store570,22060
5095initialize_goal_store(573,22166 5072initialize_goal_store573,22166
5096:- pred accu_store(580,22421 5073:- pred accu_store580,22421
5097accu_store(584,22576 5074accu_store584,22576
5098:- pred identify_recursive_calls(601,23288 5075:- pred identify_recursive_calls601,23288
5099identify_recursive_calls(604,23406 5076identify_recursive_calls604,23406
5100:- pred identify_out_and_out_prime(626,24396 5077:- pred identify_out_and_out_prime626,24396
5101identify_out_and_out_prime(631,24631 5078identify_out_and_out_prime631,24631
5102:- type accu_sets676,26425 5079:- type accu_sets676,26425
5103:- pred accu_stage1(689,26977 5080:- pred accu_stage1689,26977
5104accu_stage1(693,27155 5081accu_stage1693,27155
5105:- pred accu_stage1_2(727,28347 5082:- pred accu_stage1_2727,28347
5106accu_stage1_2(731,28515 5083accu_stage1_2731,28515
5107:- pred accu_sets_init(781,30557 5084:- pred accu_sets_init781,30557
5108accu_sets_init(783,30605 5085accu_sets_init783,30605
5109:- func set_upto(796,30984 5086:- func set_upto796,30984
5110set_upto(798,31039 5087set_upto798,31039
5111:- pred accu_before(812,31498 5088:- pred accu_before812,31498
5112accu_before(815,31639 5089accu_before815,31639
5113:- pred accu_assoc(835,32477 5090:- pred accu_assoc835,32477
5114accu_assoc(838,32617 5091accu_assoc838,32617
5115:- pred accu_construct(862,33712 5092:- pred accu_construct862,33712
5116accu_construct(865,33856 5093accu_construct865,33856
5117:- pred accu_construct_assoc(896,35307 5094:- pred accu_construct_assoc896,35307
5118accu_construct_assoc(899,35457 5095accu_construct_assoc899,35457
5119:- pred accu_update(938,37069 5096:- pred accu_update938,37069
5120accu_update(941,37210 5097accu_update941,37210
5121:- pred member_lessthan_goalid(964,38219 5098:- pred member_lessthan_goalid964,38219
5122member_lessthan_goalid(967,38342 5099member_lessthan_goalid967,38342
5123:- type accu_assoc975,38652 5100:- type accu_assoc975,38652
5124:- pred accu_is_associative(986,39138 5101:- pred accu_is_associative986,39138
5125accu_is_associative(989,39250 5102accu_is_associative989,39250
5126:- pred associativity_assertion(1014,40263 5103:- pred associativity_assertion1014,40263
5127associativity_assertion(1017,40404 5104associativity_assertion1017,40404
5128:- pred commutativity_assertion(1037,41242 5105:- pred commutativity_assertion1037,41242
5129commutativity_assertion(1040,41369 5106commutativity_assertion1040,41369
5130:- pred accu_is_update(1057,41952 5107:- pred accu_is_update1057,41952
5131accu_is_update(1060,42066 5108accu_is_update1060,42066
5132:- pred is_associative_construction(1078,42802 5109:- pred is_associative_construction1078,42802
5133is_associative_construction(1081,42898 5110is_associative_construction1081,42898
5134:- type accu_substs1095,43480 5111:- type accu_substs1095,43480
5135:- type accu_base1103,43744 5112:- type accu_base1103,43744
5136:- pred accu_stage2(1124,44605 5113:- pred accu_stage21124,44605
5137accu_stage2(1131,44946 5114accu_stage21131,44946
5138:- pred accu_substs_init(1179,46957 5115:- pred accu_substs_init1179,46957
5139accu_substs_init(1182,47097 5116accu_substs_init1182,47097
5140:- pred acc_var_subst_init(1194,47573 5117:- pred acc_var_subst_init1194,47573
5141acc_var_subst_init(1198,47718 5118acc_var_subst_init1198,47718
5142:- pred create_new_var(1207,48147 5119:- pred create_new_var1207,48147
5143create_new_var(1210,48288 5120create_new_var1210,48288
5144:- pred accu_process_assoc_set(1223,48862 5121:- pred accu_process_assoc_set1223,48862
5145accu_process_assoc_set(1229,49150 5122accu_process_assoc_set1229,49150
5146:- pred accu_has_heuristic(1297,52081 5123:- pred accu_has_heuristic1297,52081
5147accu_has_heuristic(1299,52161 5124accu_has_heuristic1299,52161
5148:- pred accu_heuristic(1304,52336 5125:- pred accu_heuristic1304,52336
5149accu_heuristic(1307,52457 5126accu_heuristic1307,52457
5150:- pred accu_process_update_set(1318,52906 5127:- pred accu_process_update_set1318,52906
5151accu_process_update_set(1325,53221 5128accu_process_update_set1325,53221
5152:- pred accu_divide_base_case(1380,55844 5129:- pred accu_divide_base_case1380,55844
5153accu_divide_base_case(1385,56059 5130accu_divide_base_case1385,56059
5154:- pred accu_related(1412,57146 5131:- pred accu_related1412,57146
5155accu_related(1415,57270 5132accu_related1415,57270
5156:- pred lookup_call(1449,58601 5133:- inst stored_goal_plain_call1444,58415
5157lookup_call(1452,58715 5134:- pred lookup_call1449,58601
5158:- pred accu_stage3(1470,59432 5135lookup_call1452,58715
5159accu_stage3(1477,59826 5136:- pred accu_stage31470,59432
5160:- pred acc_proc_info(1508,61326 5137accu_stage31477,59826
5161acc_proc_info(1512,61485 5138:- pred acc_proc_info1508,61326
5162:- pred acc_pred_info(1556,63449 5139acc_proc_info1512,61485
5163acc_pred_info(1559,63597 5140:- pred acc_pred_info1556,63449
5164:- pred accu_create_goal(1600,65285 5141acc_pred_info1559,63597
5165accu_create_goal(1607,65628 5142:- pred accu_create_goal1600,65285
5166:- func create_acc_call(1621,66400 5143accu_create_goal1607,65628
5167create_acc_call(1625,66569 5144:- func create_acc_call1621,66400
5168:- pred create_orig_goal(1634,66987 5145create_acc_call1625,66569
5169create_orig_goal(1638,67176 5146:- pred create_orig_goal1634,66987
5170:- pred create_acc_goal(1662,68157 5147create_orig_goal1638,67176
5171create_acc_goal(1667,68380 5148:- pred create_acc_goal1662,68157
5172:- func create_new_orig_recursive_goals(1709,70225 5149create_acc_goal1667,68380
5173create_new_orig_recursive_goals(1712,70368 5150:- func create_new_orig_recursive_goals1709,70225
5174:- func create_new_recursive_goals(1723,70918 5151create_new_orig_recursive_goals1712,70368
5175create_new_recursive_goals(1727,71108 5152:- func create_new_recursive_goals1723,70918
5176:- func create_new_base_goals(1738,71717 5153create_new_recursive_goals1727,71108
5177create_new_base_goals(1741,71831 5154:- func create_new_base_goals1738,71717
5178:- pred acc_unification(1749,72156 5155create_new_base_goals1741,71831
5179acc_unification(1751,72225 5156:- pred acc_unification1749,72156
5180:- pred accu_top_level(1766,72896 5157acc_unification1751,72225
5181accu_top_level(1770,73058 5158:- pred accu_top_level1766,72896
5182:- pred update_accumulator_pred(1856,76290 5159accu_top_level1770,73058
5183update_accumulator_pred(1859,76411 5160:- pred update_accumulator_pred1856,76290
5184:- func accu_rename(1876,77253 5161update_accumulator_pred1859,76411
5185accu_rename(1879,77363 5162:- func accu_rename1876,77253
5186:- func base_case_ids(1889,77784 5163accu_rename1879,77363
5187base_case_ids(1891,77846 5164:- func base_case_ids1889,77784
5188:- func base_case_ids_set(1898,78048 5165base_case_ids1891,77846
5189base_case_ids_set(1900,78113 5166:- func base_case_ids_set1898,78048
5190:- func accu_goal_list(1905,78269 5167base_case_ids_set1900,78113
5191accu_goal_list(1907,78349 5168:- func accu_goal_list1905,78269
5192:- pred calculate_goal_info(1916,78680 5169accu_goal_list1907,78349
5193calculate_goal_info(1918,78753 5170:- pred calculate_goal_info1916,78680
5194:- func chain_subst(1932,79319 5171calculate_goal_info1918,78753
5195chain_subst(1934,79378 5172:- func chain_subst1932,79319
5196:- pred chain_subst_2(1938,79482 5173chain_subst1934,79378
5197chain_subst_2(1941,79576 5174:- pred chain_subst_21938,79482
5198:- end_module transform_hlds.accumulator1953,79939 5175chain_subst_21941,79576
5176:- some [T] pred unravel_univ1956,80060
5177:- pragma foreign_export1957,80116
5178unravel_univ1961,80340
5199 5179
5200c-src/c.c,76 5180c-src/c.c,76
5201T f(1,0 5181T f(1,0
diff --git a/test/manual/etags/ETAGS.good_6 b/test/manual/etags/ETAGS.good_6
index 68cbaa9b0a0..75047951a8a 100644
--- a/test/manual/etags/ETAGS.good_6
+++ b/test/manual/etags/ETAGS.good_6
@@ -5023,38 +5023,15 @@ Section\xreftie'char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno %
5023\global\def={=3307,107500 5023\global\def={=3307,107500
5024\def\normalbackslash{\normalbackslash3321,107882 5024\def\normalbackslash{\normalbackslash3321,107882
5025 5025
5026merc-src/accumulator.m,5996 5026merc-src/accumulator.m,4915
5027:- module transform_hlds.accumulator145,5333 5027:- interface146,5371
5028:- import_module hlds148,5386 5028:- import_module hlds148,5386
5029:- import_module hlds.hlds_module149,5409
5030:- import_module hlds.hlds_pred150,5444
5031:- import_module univ152,5478 5029:- import_module univ152,5478
5032:- pred accu_transform_proc(159,5793 5030:- pred accu_transform_proc159,5793
5033:- import_module hlds.assertion168,6135 5031:- implementation166,6115
5034:- import_module hlds.goal_util169,6168
5035:- import_module hlds.hlds_error_util170,6201
5036:- import_module hlds.hlds_goal171,6240
5037:- import_module hlds.hlds_out172,6273
5038:- import_module hlds.hlds_out.hlds_out_util173,6305
5039:- import_module hlds.hlds_promise174,6351
5040:- import_module hlds.instmap175,6387
5041:- import_module hlds.pred_table176,6418
5042:- import_module hlds.quantification177,6452
5043:- import_module hlds.status178,6490
5044:- import_module hlds.vartypes179,6520
5045:- import_module libs180,6552 5032:- import_module libs180,6552
5046:- import_module libs.globals181,6575
5047:- import_module libs.optimization_options182,6606
5048:- import_module libs.options183,6650
5049:- import_module mdbcomp184,6681 5033:- import_module mdbcomp184,6681
5050:- import_module mdbcomp.sym_name185,6707
5051:- import_module parse_tree186,6742 5034:- import_module parse_tree186,6742
5052:- import_module parse_tree.error_util187,6771
5053:- import_module parse_tree.prog_data188,6811
5054:- import_module parse_tree.prog_mode189,6850
5055:- import_module parse_tree.prog_util190,6889
5056:- import_module parse_tree.set_of_var191,6928
5057:- import_module transform_hlds.goal_store192,6968
5058:- import_module assoc_list194,7013 5035:- import_module assoc_list194,7013
5059:- import_module bool195,7042 5036:- import_module bool195,7042
5060:- import_module int196,7065 5037:- import_module int196,7065
@@ -5075,127 +5052,130 @@ merc-src/accumulator.m,5996
5075:- type accu_goal_store234,8091 5052:- type accu_goal_store234,8091
5076:- type accu_subst238,8216 5053:- type accu_subst238,8216
5077:- type accu_warning240,8264 5054:- type accu_warning240,8264
5078accu_transform_proc(247,8578 5055accu_transform_proc247,8578
5079:- pred generate_warnings(334,12550 5056:- pred generate_warnings334,12550
5080generate_warnings(337,12669 5057generate_warnings337,12669
5081:- pred generate_warning(342,12895 5058:- pred generate_warning342,12895
5082generate_warning(345,13001 5059generate_warning345,13001
5083:- pred should_attempt_accu_transform(365,13886 5060:- pred should_attempt_accu_transform365,13886
5084should_attempt_accu_transform(370,14123 5061should_attempt_accu_transform370,14123
5085:- pred should_attempt_accu_transform_2(398,15406 5062:- pred should_attempt_accu_transform_2398,15406
5086should_attempt_accu_transform_2(405,15763 5063should_attempt_accu_transform_2405,15763
5087:- pred accu_standardize(440,17390 5064:- pred accu_standardize440,17390
5088accu_standardize(442,17455 5065accu_standardize442,17455
5089:- pred identify_goal_type(465,18169 5066:- pred identify_goal_type465,18169
5090identify_goal_type(469,18359 5067identify_goal_type469,18359
5091:- pred is_recursive_case(549,21175 5068:- pred is_recursive_case549,21175
5092is_recursive_case(551,21253 5069is_recursive_case551,21253
5093:- type store_info560,21713 5070:- type store_info560,21713
5094:- func initialize_goal_store(570,22060 5071:- func initialize_goal_store570,22060
5095initialize_goal_store(573,22166 5072initialize_goal_store573,22166
5096:- pred accu_store(580,22421 5073:- pred accu_store580,22421
5097accu_store(584,22576 5074accu_store584,22576
5098:- pred identify_recursive_calls(601,23288 5075:- pred identify_recursive_calls601,23288
5099identify_recursive_calls(604,23406 5076identify_recursive_calls604,23406
5100:- pred identify_out_and_out_prime(626,24396 5077:- pred identify_out_and_out_prime626,24396
5101identify_out_and_out_prime(631,24631 5078identify_out_and_out_prime631,24631
5102:- type accu_sets676,26425 5079:- type accu_sets676,26425
5103:- pred accu_stage1(689,26977 5080:- pred accu_stage1689,26977
5104accu_stage1(693,27155 5081accu_stage1693,27155
5105:- pred accu_stage1_2(727,28347 5082:- pred accu_stage1_2727,28347
5106accu_stage1_2(731,28515 5083accu_stage1_2731,28515
5107:- pred accu_sets_init(781,30557 5084:- pred accu_sets_init781,30557
5108accu_sets_init(783,30605 5085accu_sets_init783,30605
5109:- func set_upto(796,30984 5086:- func set_upto796,30984
5110set_upto(798,31039 5087set_upto798,31039
5111:- pred accu_before(812,31498 5088:- pred accu_before812,31498
5112accu_before(815,31639 5089accu_before815,31639
5113:- pred accu_assoc(835,32477 5090:- pred accu_assoc835,32477
5114accu_assoc(838,32617 5091accu_assoc838,32617
5115:- pred accu_construct(862,33712 5092:- pred accu_construct862,33712
5116accu_construct(865,33856 5093accu_construct865,33856
5117:- pred accu_construct_assoc(896,35307 5094:- pred accu_construct_assoc896,35307
5118accu_construct_assoc(899,35457 5095accu_construct_assoc899,35457
5119:- pred accu_update(938,37069 5096:- pred accu_update938,37069
5120accu_update(941,37210 5097accu_update941,37210
5121:- pred member_lessthan_goalid(964,38219 5098:- pred member_lessthan_goalid964,38219
5122member_lessthan_goalid(967,38342 5099member_lessthan_goalid967,38342
5123:- type accu_assoc975,38652 5100:- type accu_assoc975,38652
5124:- pred accu_is_associative(986,39138 5101:- pred accu_is_associative986,39138
5125accu_is_associative(989,39250 5102accu_is_associative989,39250
5126:- pred associativity_assertion(1014,40263 5103:- pred associativity_assertion1014,40263
5127associativity_assertion(1017,40404 5104associativity_assertion1017,40404
5128:- pred commutativity_assertion(1037,41242 5105:- pred commutativity_assertion1037,41242
5129commutativity_assertion(1040,41369 5106commutativity_assertion1040,41369
5130:- pred accu_is_update(1057,41952 5107:- pred accu_is_update1057,41952
5131accu_is_update(1060,42066 5108accu_is_update1060,42066
5132:- pred is_associative_construction(1078,42802 5109:- pred is_associative_construction1078,42802
5133is_associative_construction(1081,42898 5110is_associative_construction1081,42898
5134:- type accu_substs1095,43480 5111:- type accu_substs1095,43480
5135:- type accu_base1103,43744 5112:- type accu_base1103,43744
5136:- pred accu_stage2(1124,44605 5113:- pred accu_stage21124,44605
5137accu_stage2(1131,44946 5114accu_stage21131,44946
5138:- pred accu_substs_init(1179,46957 5115:- pred accu_substs_init1179,46957
5139accu_substs_init(1182,47097 5116accu_substs_init1182,47097
5140:- pred acc_var_subst_init(1194,47573 5117:- pred acc_var_subst_init1194,47573
5141acc_var_subst_init(1198,47718 5118acc_var_subst_init1198,47718
5142:- pred create_new_var(1207,48147 5119:- pred create_new_var1207,48147
5143create_new_var(1210,48288 5120create_new_var1210,48288
5144:- pred accu_process_assoc_set(1223,48862 5121:- pred accu_process_assoc_set1223,48862
5145accu_process_assoc_set(1229,49150 5122accu_process_assoc_set1229,49150
5146:- pred accu_has_heuristic(1297,52081 5123:- pred accu_has_heuristic1297,52081
5147accu_has_heuristic(1299,52161 5124accu_has_heuristic1299,52161
5148:- pred accu_heuristic(1304,52336 5125:- pred accu_heuristic1304,52336
5149accu_heuristic(1307,52457 5126accu_heuristic1307,52457
5150:- pred accu_process_update_set(1318,52906 5127:- pred accu_process_update_set1318,52906
5151accu_process_update_set(1325,53221 5128accu_process_update_set1325,53221
5152:- pred accu_divide_base_case(1380,55844 5129:- pred accu_divide_base_case1380,55844
5153accu_divide_base_case(1385,56059 5130accu_divide_base_case1385,56059
5154:- pred accu_related(1412,57146 5131:- pred accu_related1412,57146
5155accu_related(1415,57270 5132accu_related1415,57270
5156:- pred lookup_call(1449,58601 5133:- inst stored_goal_plain_call1444,58415
5157lookup_call(1452,58715 5134:- pred lookup_call1449,58601
5158:- pred accu_stage3(1470,59432 5135lookup_call1452,58715
5159accu_stage3(1477,59826 5136:- pred accu_stage31470,59432
5160:- pred acc_proc_info(1508,61326 5137accu_stage31477,59826
5161acc_proc_info(1512,61485 5138:- pred acc_proc_info1508,61326
5162:- pred acc_pred_info(1556,63449 5139acc_proc_info1512,61485
5163acc_pred_info(1559,63597 5140:- pred acc_pred_info1556,63449
5164:- pred accu_create_goal(1600,65285 5141acc_pred_info1559,63597
5165accu_create_goal(1607,65628 5142:- pred accu_create_goal1600,65285
5166:- func create_acc_call(1621,66400 5143accu_create_goal1607,65628
5167create_acc_call(1625,66569 5144:- func create_acc_call1621,66400
5168:- pred create_orig_goal(1634,66987 5145create_acc_call1625,66569
5169create_orig_goal(1638,67176 5146:- pred create_orig_goal1634,66987
5170:- pred create_acc_goal(1662,68157 5147create_orig_goal1638,67176
5171create_acc_goal(1667,68380 5148:- pred create_acc_goal1662,68157
5172:- func create_new_orig_recursive_goals(1709,70225 5149create_acc_goal1667,68380
5173create_new_orig_recursive_goals(1712,70368 5150:- func create_new_orig_recursive_goals1709,70225
5174:- func create_new_recursive_goals(1723,70918 5151create_new_orig_recursive_goals1712,70368
5175create_new_recursive_goals(1727,71108 5152:- func create_new_recursive_goals1723,70918
5176:- func create_new_base_goals(1738,71717 5153create_new_recursive_goals1727,71108
5177create_new_base_goals(1741,71831 5154:- func create_new_base_goals1738,71717
5178:- pred acc_unification(1749,72156 5155create_new_base_goals1741,71831
5179acc_unification(1751,72225 5156:- pred acc_unification1749,72156
5180:- pred accu_top_level(1766,72896 5157acc_unification1751,72225
5181accu_top_level(1770,73058 5158:- pred accu_top_level1766,72896
5182:- pred update_accumulator_pred(1856,76290 5159accu_top_level1770,73058
5183update_accumulator_pred(1859,76411 5160:- pred update_accumulator_pred1856,76290
5184:- func accu_rename(1876,77253 5161update_accumulator_pred1859,76411
5185accu_rename(1879,77363 5162:- func accu_rename1876,77253
5186:- func base_case_ids(1889,77784 5163accu_rename1879,77363
5187base_case_ids(1891,77846 5164:- func base_case_ids1889,77784
5188:- func base_case_ids_set(1898,78048 5165base_case_ids1891,77846
5189base_case_ids_set(1900,78113 5166:- func base_case_ids_set1898,78048
5190:- func accu_goal_list(1905,78269 5167base_case_ids_set1900,78113
5191accu_goal_list(1907,78349 5168:- func accu_goal_list1905,78269
5192:- pred calculate_goal_info(1916,78680 5169accu_goal_list1907,78349
5193calculate_goal_info(1918,78753 5170:- pred calculate_goal_info1916,78680
5194:- func chain_subst(1932,79319 5171calculate_goal_info1918,78753
5195chain_subst(1934,79378 5172:- func chain_subst1932,79319
5196:- pred chain_subst_2(1938,79482 5173chain_subst1934,79378
5197chain_subst_2(1941,79576 5174:- pred chain_subst_21938,79482
5198:- end_module transform_hlds.accumulator1953,79939 5175chain_subst_21941,79576
5176:- some [T] pred unravel_univ1956,80060
5177:- pragma foreign_export1957,80116
5178unravel_univ1961,80340
5199 5179
5200c-src/c.c,76 5180c-src/c.c,76
5201T f(1,0 5181T f(1,0
diff --git a/test/manual/etags/merc-src/accumulator.m b/test/manual/etags/merc-src/accumulator.m
index 94a6b1d8589..c82dbf58ff8 100644
--- a/test/manual/etags/merc-src/accumulator.m
+++ b/test/manual/etags/merc-src/accumulator.m
@@ -1952,3 +1952,11 @@ chain_subst_2([A | As], AtoB, BtoC, AtoC) :-
1952%---------------------------------------------------------------------------% 1952%---------------------------------------------------------------------------%
1953:- end_module transform_hlds.accumulator. 1953:- end_module transform_hlds.accumulator.
1954%---------------------------------------------------------------------------% 1954%---------------------------------------------------------------------------%
1955
1956:- some [T] pred unravel_univ(univ::in, T::out) is det.
1957:- pragma foreign_export("C", unravel_univ(in, out), "ML_unravel_univ").
1958:- pragma foreign_export("C#", unravel_univ(in, out), "ML_unravel_univ").
1959:- pragma foreign_export("Java", unravel_univ(in, out), "ML_unravel_univ").
1960
1961unravel_univ(Univ, X) :-
1962 univ_value(Univ) = X.
generated by cgit v1.2.1 (git 2.18.0) at 2026-02-12 23:05:54 +0000