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)

1 files changed, 64 insertions, 85 deletions

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 %
 \global\def={=
3307,107500
 \def\normalbackslash{\normalbackslash
3321,107882
 
-merc-src/accumulator.m,4275
-:- module transform_hlds.accumulator145,5333
+merc-src/accumulator.m,3228
+:- interface146,5371
 :- import_module hlds148,5386
-:- import_module hlds.hlds_module149,5409
-:- import_module hlds.hlds_pred150,5444
 :- import_module univ152,5478
-:- pred accu_transform_proc(159,5793
-:- import_module hlds.assertion168,6135
-:- import_module hlds.goal_util169,6168
-:- import_module hlds.hlds_error_util170,6201
-:- import_module hlds.hlds_goal171,6240
-:- import_module hlds.hlds_out172,6273
-:- import_module hlds.hlds_out.hlds_out_util173,6305
-:- import_module hlds.hlds_promise174,6351
-:- import_module hlds.instmap175,6387
-:- import_module hlds.pred_table176,6418
-:- import_module hlds.quantification177,6452
-:- import_module hlds.status178,6490
-:- import_module hlds.vartypes179,6520
+:- pred accu_transform_proc159,5793
+:- implementation166,6115
 :- import_module libs180,6552
-:- import_module libs.globals181,6575
-:- import_module libs.optimization_options182,6606
-:- import_module libs.options183,6650
 :- import_module mdbcomp184,6681
-:- import_module mdbcomp.sym_name185,6707
 :- import_module parse_tree186,6742
-:- import_module parse_tree.error_util187,6771
-:- import_module parse_tree.prog_data188,6811
-:- import_module parse_tree.prog_mode189,6850
-:- import_module parse_tree.prog_util190,6889
-:- import_module parse_tree.set_of_var191,6928
-:- import_module transform_hlds.goal_store192,6968
 :- import_module assoc_list194,7013
 :- import_module bool195,7042
 :- import_module int196,7065
@@ -4095,69 +4072,71 @@ merc-src/accumulator.m,4275
 :- type accu_goal_store234,8091
 :- type accu_subst238,8216
 :- type accu_warning240,8264
-:- pred generate_warnings(334,12550
-:- pred generate_warning(342,12895
-:- pred should_attempt_accu_transform(365,13886
-:- pred should_attempt_accu_transform_2(398,15406
-:- pred accu_standardize(440,17390
-:- pred identify_goal_type(465,18169
-:- pred is_recursive_case(549,21175
+:- pred generate_warnings334,12550
+:- pred generate_warning342,12895
+:- pred should_attempt_accu_transform365,13886
+:- pred should_attempt_accu_transform_2398,15406
+:- pred accu_standardize440,17390
+:- pred identify_goal_type465,18169
+:- pred is_recursive_case549,21175
 :- type store_info560,21713
-:- func initialize_goal_store(570,22060
-:- pred accu_store(580,22421
-:- pred identify_recursive_calls(601,23288
-:- pred identify_out_and_out_prime(626,24396
+:- func initialize_goal_store570,22060
+:- pred accu_store580,22421
+:- pred identify_recursive_calls601,23288
+:- pred identify_out_and_out_prime626,24396
 :- type accu_sets676,26425
-:- pred accu_stage1(689,26977
-:- pred accu_stage1_2(727,28347
-:- pred accu_sets_init(781,30557
-:- func set_upto(796,30984
-:- pred accu_before(812,31498
-:- pred accu_assoc(835,32477
-:- pred accu_construct(862,33712
-:- pred accu_construct_assoc(896,35307
-:- pred accu_update(938,37069
-:- pred member_lessthan_goalid(964,38219
+:- pred accu_stage1689,26977
+:- pred accu_stage1_2727,28347
+:- pred accu_sets_init781,30557
+:- func set_upto796,30984
+:- pred accu_before812,31498
+:- pred accu_assoc835,32477
+:- pred accu_construct862,33712
+:- pred accu_construct_assoc896,35307
+:- pred accu_update938,37069
+:- pred member_lessthan_goalid964,38219
 :- type accu_assoc975,38652
-:- pred accu_is_associative(986,39138
-:- pred associativity_assertion(1014,40263
-:- pred commutativity_assertion(1037,41242
-:- pred accu_is_update(1057,41952
-:- pred is_associative_construction(1078,42802
+:- pred accu_is_associative986,39138
+:- pred associativity_assertion1014,40263
+:- pred commutativity_assertion1037,41242
+:- pred accu_is_update1057,41952
+:- pred is_associative_construction1078,42802
 :- type accu_substs1095,43480
 :- type accu_base1103,43744
-:- pred accu_stage2(1124,44605
-:- pred accu_substs_init(1179,46957
-:- pred acc_var_subst_init(1194,47573
-:- pred create_new_var(1207,48147
-:- pred accu_process_assoc_set(1223,48862
-:- pred accu_has_heuristic(1297,52081
-:- pred accu_heuristic(1304,52336
-:- pred accu_process_update_set(1318,52906
-:- pred accu_divide_base_case(1380,55844
-:- pred accu_related(1412,57146
-:- pred lookup_call(1449,58601
-:- pred accu_stage3(1470,59432
-:- pred acc_proc_info(1508,61326
-:- pred acc_pred_info(1556,63449
-:- pred accu_create_goal(1600,65285
-:- func create_acc_call(1621,66400
-:- pred create_orig_goal(1634,66987
-:- pred create_acc_goal(1662,68157
-:- func create_new_orig_recursive_goals(1709,70225
-:- func create_new_recursive_goals(1723,70918
-:- func create_new_base_goals(1738,71717
-:- pred acc_unification(1749,72156
-:- pred accu_top_level(1766,72896
-:- pred update_accumulator_pred(1856,76290
-:- func accu_rename(1876,77253
-:- func base_case_ids(1889,77784
-:- func base_case_ids_set(1898,78048
-:- func accu_goal_list(1905,78269
-:- pred calculate_goal_info(1916,78680
-:- func chain_subst(1932,79319
-:- pred chain_subst_2(1938,79482
-:- end_module transform_hlds.accumulator1953,79939
+:- pred accu_stage21124,44605
+:- pred accu_substs_init1179,46957
+:- pred acc_var_subst_init1194,47573
+:- pred create_new_var1207,48147
+:- pred accu_process_assoc_set1223,48862
+:- pred accu_has_heuristic1297,52081
+:- pred accu_heuristic1304,52336
+:- pred accu_process_update_set1318,52906
+:- pred accu_divide_base_case1380,55844
+:- pred accu_related1412,57146
+:- inst stored_goal_plain_call1444,58415
+:- pred lookup_call1449,58601
+:- pred accu_stage31470,59432
+:- pred acc_proc_info1508,61326
+:- pred acc_pred_info1556,63449
+:- pred accu_create_goal1600,65285
+:- func create_acc_call1621,66400
+:- pred create_orig_goal1634,66987
+:- pred create_acc_goal1662,68157
+:- func create_new_orig_recursive_goals1709,70225
+:- func create_new_recursive_goals1723,70918
+:- func create_new_base_goals1738,71717
+:- pred acc_unification1749,72156
+:- pred accu_top_level1766,72896
+:- pred update_accumulator_pred1856,76290
+:- func accu_rename1876,77253
+:- func base_case_ids1889,77784
+:- func base_case_ids_set1898,78048
+:- func accu_goal_list1905,78269
+:- pred calculate_goal_info1916,78680
+:- func chain_subst1932,79319
+:- pred chain_subst_21938,79482
+:- some [T] pred unravel_univ1956,80060
+:- pragma foreign_export1957,80116
 
 c-src/c.c,76
 T f(1,0