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, 123 insertions, 143 deletions

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 %
 \global\def={=
3307,107500
 \def\normalbackslash{\normalbackslash
3321,107882
 
-merc-src/accumulator.m,5996
-:- module transform_hlds.accumulator145,5333
+merc-src/accumulator.m,4915
+:- 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
@@ -5075,127 +5052,130 @@ merc-src/accumulator.m,5996
 :- type accu_goal_store234,8091
 :- type accu_subst238,8216
 :- type accu_warning240,8264
-accu_transform_proc(247,8578
-:- pred generate_warnings(334,12550
-generate_warnings(337,12669
-:- pred generate_warning(342,12895
-generate_warning(345,13001
-:- pred should_attempt_accu_transform(365,13886
-should_attempt_accu_transform(370,14123
-:- pred should_attempt_accu_transform_2(398,15406
-should_attempt_accu_transform_2(405,15763
-:- pred accu_standardize(440,17390
-accu_standardize(442,17455
-:- pred identify_goal_type(465,18169
-identify_goal_type(469,18359
-:- pred is_recursive_case(549,21175
-is_recursive_case(551,21253
+accu_transform_proc247,8578
+:- pred generate_warnings334,12550
+generate_warnings337,12669
+:- pred generate_warning342,12895
+generate_warning345,13001
+:- pred should_attempt_accu_transform365,13886
+should_attempt_accu_transform370,14123
+:- pred should_attempt_accu_transform_2398,15406
+should_attempt_accu_transform_2405,15763
+:- pred accu_standardize440,17390
+accu_standardize442,17455
+:- pred identify_goal_type465,18169
+identify_goal_type469,18359
+:- pred is_recursive_case549,21175
+is_recursive_case551,21253
 :- type store_info560,21713
-:- func initialize_goal_store(570,22060
-initialize_goal_store(573,22166
-:- pred accu_store(580,22421
-accu_store(584,22576
-:- pred identify_recursive_calls(601,23288
-identify_recursive_calls(604,23406
-:- pred identify_out_and_out_prime(626,24396
-identify_out_and_out_prime(631,24631
+:- func initialize_goal_store570,22060
+initialize_goal_store573,22166
+:- pred accu_store580,22421
+accu_store584,22576
+:- pred identify_recursive_calls601,23288
+identify_recursive_calls604,23406
+:- pred identify_out_and_out_prime626,24396
+identify_out_and_out_prime631,24631
 :- type accu_sets676,26425
-:- pred accu_stage1(689,26977
-accu_stage1(693,27155
-:- pred accu_stage1_2(727,28347
-accu_stage1_2(731,28515
-:- pred accu_sets_init(781,30557
-accu_sets_init(783,30605
-:- func set_upto(796,30984
-set_upto(798,31039
-:- pred accu_before(812,31498
-accu_before(815,31639
-:- pred accu_assoc(835,32477
-accu_assoc(838,32617
-:- pred accu_construct(862,33712
-accu_construct(865,33856
-:- pred accu_construct_assoc(896,35307
-accu_construct_assoc(899,35457
-:- pred accu_update(938,37069
-accu_update(941,37210
-:- pred member_lessthan_goalid(964,38219
-member_lessthan_goalid(967,38342
+:- pred accu_stage1689,26977
+accu_stage1693,27155
+:- pred accu_stage1_2727,28347
+accu_stage1_2731,28515
+:- pred accu_sets_init781,30557
+accu_sets_init783,30605
+:- func set_upto796,30984
+set_upto798,31039
+:- pred accu_before812,31498
+accu_before815,31639
+:- pred accu_assoc835,32477
+accu_assoc838,32617
+:- pred accu_construct862,33712
+accu_construct865,33856
+:- pred accu_construct_assoc896,35307
+accu_construct_assoc899,35457
+:- pred accu_update938,37069
+accu_update941,37210
+:- pred member_lessthan_goalid964,38219
+member_lessthan_goalid967,38342
 :- type accu_assoc975,38652
-:- pred accu_is_associative(986,39138
-accu_is_associative(989,39250
-:- pred associativity_assertion(1014,40263
-associativity_assertion(1017,40404
-:- pred commutativity_assertion(1037,41242
-commutativity_assertion(1040,41369
-:- pred accu_is_update(1057,41952
-accu_is_update(1060,42066
-:- pred is_associative_construction(1078,42802
-is_associative_construction(1081,42898
+:- pred accu_is_associative986,39138
+accu_is_associative989,39250
+:- pred associativity_assertion1014,40263
+associativity_assertion1017,40404
+:- pred commutativity_assertion1037,41242
+commutativity_assertion1040,41369
+:- pred accu_is_update1057,41952
+accu_is_update1060,42066
+:- pred is_associative_construction1078,42802
+is_associative_construction1081,42898
 :- type accu_substs1095,43480
 :- type accu_base1103,43744
-:- pred accu_stage2(1124,44605
-accu_stage2(1131,44946
-:- pred accu_substs_init(1179,46957
-accu_substs_init(1182,47097
-:- pred acc_var_subst_init(1194,47573
-acc_var_subst_init(1198,47718
-:- pred create_new_var(1207,48147
-create_new_var(1210,48288
-:- pred accu_process_assoc_set(1223,48862
-accu_process_assoc_set(1229,49150
-:- pred accu_has_heuristic(1297,52081
-accu_has_heuristic(1299,52161
-:- pred accu_heuristic(1304,52336
-accu_heuristic(1307,52457
-:- pred accu_process_update_set(1318,52906
-accu_process_update_set(1325,53221
-:- pred accu_divide_base_case(1380,55844
-accu_divide_base_case(1385,56059
-:- pred accu_related(1412,57146
-accu_related(1415,57270
-:- pred lookup_call(1449,58601
-lookup_call(1452,58715
-:- pred accu_stage3(1470,59432
-accu_stage3(1477,59826
-:- pred acc_proc_info(1508,61326
-acc_proc_info(1512,61485
-:- pred acc_pred_info(1556,63449
-acc_pred_info(1559,63597
-:- pred accu_create_goal(1600,65285
-accu_create_goal(1607,65628
-:- func create_acc_call(1621,66400
-create_acc_call(1625,66569
-:- pred create_orig_goal(1634,66987
-create_orig_goal(1638,67176
-:- pred create_acc_goal(1662,68157
-create_acc_goal(1667,68380
-:- func create_new_orig_recursive_goals(1709,70225
-create_new_orig_recursive_goals(1712,70368
-:- func create_new_recursive_goals(1723,70918
-create_new_recursive_goals(1727,71108
-:- func create_new_base_goals(1738,71717
-create_new_base_goals(1741,71831
-:- pred acc_unification(1749,72156
-acc_unification(1751,72225
-:- pred accu_top_level(1766,72896
-accu_top_level(1770,73058
-:- pred update_accumulator_pred(1856,76290
-update_accumulator_pred(1859,76411
-:- func accu_rename(1876,77253
-accu_rename(1879,77363
-:- func base_case_ids(1889,77784
-base_case_ids(1891,77846
-:- func base_case_ids_set(1898,78048
-base_case_ids_set(1900,78113
-:- func accu_goal_list(1905,78269
-accu_goal_list(1907,78349
-:- pred calculate_goal_info(1916,78680
-calculate_goal_info(1918,78753
-:- func chain_subst(1932,79319
-chain_subst(1934,79378
-:- pred chain_subst_2(1938,79482
-chain_subst_2(1941,79576
-:- end_module transform_hlds.accumulator1953,79939
+:- pred accu_stage21124,44605
+accu_stage21131,44946
+:- pred accu_substs_init1179,46957
+accu_substs_init1182,47097
+:- pred acc_var_subst_init1194,47573
+acc_var_subst_init1198,47718
+:- pred create_new_var1207,48147
+create_new_var1210,48288
+:- pred accu_process_assoc_set1223,48862
+accu_process_assoc_set1229,49150
+:- pred accu_has_heuristic1297,52081
+accu_has_heuristic1299,52161
+:- pred accu_heuristic1304,52336
+accu_heuristic1307,52457
+:- pred accu_process_update_set1318,52906
+accu_process_update_set1325,53221
+:- pred accu_divide_base_case1380,55844
+accu_divide_base_case1385,56059
+:- pred accu_related1412,57146
+accu_related1415,57270
+:- inst stored_goal_plain_call1444,58415
+:- pred lookup_call1449,58601
+lookup_call1452,58715
+:- pred accu_stage31470,59432
+accu_stage31477,59826
+:- pred acc_proc_info1508,61326
+acc_proc_info1512,61485
+:- pred acc_pred_info1556,63449
+acc_pred_info1559,63597
+:- pred accu_create_goal1600,65285
+accu_create_goal1607,65628
+:- func create_acc_call1621,66400
+create_acc_call1625,66569
+:- pred create_orig_goal1634,66987
+create_orig_goal1638,67176
+:- pred create_acc_goal1662,68157
+create_acc_goal1667,68380
+:- func create_new_orig_recursive_goals1709,70225
+create_new_orig_recursive_goals1712,70368
+:- func create_new_recursive_goals1723,70918
+create_new_recursive_goals1727,71108
+:- func create_new_base_goals1738,71717
+create_new_base_goals1741,71831
+:- pred acc_unification1749,72156
+acc_unification1751,72225
+:- pred accu_top_level1766,72896
+accu_top_level1770,73058
+:- pred update_accumulator_pred1856,76290
+update_accumulator_pred1859,76411
+:- func accu_rename1876,77253
+accu_rename1879,77363
+:- func base_case_ids1889,77784
+base_case_ids1891,77846
+:- func base_case_ids_set1898,78048
+base_case_ids_set1900,78113
+:- func accu_goal_list1905,78269
+accu_goal_list1907,78349
+:- pred calculate_goal_info1916,78680
+calculate_goal_info1918,78753
+:- func chain_subst1932,79319
+chain_subst1934,79378
+:- pred chain_subst_21938,79482
+chain_subst_21941,79576
+:- some [T] pred unravel_univ1956,80060
+:- pragma foreign_export1957,80116
+unravel_univ1961,80340
 
 c-src/c.c,76
 T f(1,0