]> git.eshelyaron.com Git - emacs.git/commitdiff
Improve and update the 'etags' test suite
authorEli Zaretskii <eliz@gnu.org>
Fri, 18 Jun 2021 11:28:16 +0000 (14:28 +0300)
committerEli Zaretskii <eliz@gnu.org>
Fri, 18 Jun 2021 11:28:16 +0000 (14:28 +0300)
* 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)

lib-src/etags.c
test/manual/etags/CTAGS.good
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/merc-src/accumulator.m

index bd57ede2f379eff8a97dc6a0beb7895ccb29075f..c39c93db33672deaf1681bd6c906f291f94a6ac9 100644 (file)
@@ -6597,8 +6597,6 @@ mercury_pr (char *s, char *last, ptrdiff_t lastlen)
             && c_isspace (s[pos - namelength - offset]))
        --offset;
 
-      /* There is no need to correct namelength or call notinname.  */
-
       make_tag (s + pos - namelength - offset, namelength - 1, true,
                                s, pos - offset - 1, lineno, linecharno);
       return pos;
index e265836fd2b25f299001613824e3068e0fc8a49c..84a56b23cfaf8d675d162e18309976373294cc58 100644 (file)
@@ -3102,6 +3102,7 @@ foperator c-src/etags.c   2411
 force_auto_save_soon   c-src/emacs/src/keyboard.c      /^force_auto_save_soon (void)$/
 force_explicit_name    c-src/etags.c   265
 force_quit_count       c-src/emacs/src/keyboard.c      10387
+foreign_export merc-src/accumulator.m  /^:- pragma foreign_export("C", unravel_univ(in, out/
 formatSize     objc-src/PackInsp.m     /^-(const char *)formatSize:(const char *)size inBuf/
 found  c-src/emacs/src/lisp.h  2344
 fracas html-src/software.html  /^Fracas$/
@@ -3230,20 +3231,6 @@ help_form_saved_window_configs   c-src/emacs/src/keyboard.c      2156
 helpwin        pyt-src/server.py       /^def helpwin(helpdict):$/
 hide_cursor    cp-src/screen.cpp       /^void hide_cursor(void)$/
 hlds   merc-src/accumulator.m  /^:- import_module hlds.$/
-hlds.assertion merc-src/accumulator.m  /^:- import_module hlds.assertion.$/
-hlds.goal_util merc-src/accumulator.m  /^:- import_module hlds.goal_util.$/
-hlds.hlds_error_util   merc-src/accumulator.m  /^:- import_module hlds.hlds_error_util.$/
-hlds.hlds_goal merc-src/accumulator.m  /^:- import_module hlds.hlds_goal.$/
-hlds.hlds_module       merc-src/accumulator.m  /^:- import_module hlds.hlds_module.$/
-hlds.hlds_out  merc-src/accumulator.m  /^:- import_module hlds.hlds_out.$/
-hlds.hlds_out.hlds_out_util    merc-src/accumulator.m  /^:- import_module hlds.hlds_out.hlds_out_util.$/
-hlds.hlds_pred merc-src/accumulator.m  /^:- import_module hlds.hlds_pred.$/
-hlds.hlds_promise      merc-src/accumulator.m  /^:- import_module hlds.hlds_promise.$/
-hlds.instmap   merc-src/accumulator.m  /^:- import_module hlds.instmap.$/
-hlds.pred_table        merc-src/accumulator.m  /^:- import_module hlds.pred_table.$/
-hlds.quantification    merc-src/accumulator.m  /^:- import_module hlds.quantification.$/
-hlds.status    merc-src/accumulator.m  /^:- import_module hlds.status.$/
-hlds.vartypes  merc-src/accumulator.m  /^:- import_module hlds.vartypes.$/
 htmltreelist   prol-src/natded.prolog  /^htmltreelist([]).$/
 hybrid_aligned_alloc   c-src/emacs/src/gmalloc.c       /^hybrid_aligned_alloc (size_t alignment, size_t siz/
 hybrid_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
 ill=\relax     tex-src/texinfo.tex     /^\\let\\refill=\\relax$/
 immediate_quit c-src/emacs/src/keyboard.c      174
 impatto        html-src/softwarelibero.html    /^Impatto pratico del software libero$/
+implementation merc-src/accumulator.m  /^:- implementation.$/
 in_word_set    c-src/etags.c   /^in_word_set (register const char *str, register un/
 inattribute    c-src/etags.c   2400
 inc    cp-src/Range.h  /^  double inc (void) const { return rng_inc;   }$/
@@ -3320,6 +3308,7 @@ integertonmstr    pas-src/common.pas      /^function integertonmstr; (* (TheInteger : in
 intensity1     f-src/entry.for /^     & intensity1(efv,fv,svin,svquad,sfpv,maxp,val/
 intensity1     f-src/entry.strange_suffix      /^     & intensity1(efv,fv,svin,svquad,sfpv,maxp,val/
 intensity1     f-src/entry.strange     /^     & intensity1(efv,fv,svin,svquad,sfpv,maxp,val/
+interface      merc-src/accumulator.m  /^:- interface.$/
 interface_locate       c-src/c.c       /^interface_locate(void)$/
 intern c-src/emacs/src/lisp.h  /^intern (const char *str)$/
 intern_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
 lex    prol-src/natded.prolog  /^lex(W,SynOut,Sem):-$/
 lexptr y-src/cccp.y    332
 libs   merc-src/accumulator.m  /^:- import_module libs.$/
-libs.globals   merc-src/accumulator.m  /^:- import_module libs.globals.$/
-libs.optimization_options      merc-src/accumulator.m  /^:- import_module libs.optimization_options.$/
-libs.options   merc-src/accumulator.m  /^:- import_module libs.options.$/
 licenze        html-src/softwarelibero.html    /^Licenze d'uso di un programma$/
 limit  cp-src/Range.h  /^  double limit (void) const { return rng_limit; }$/
 line   c-src/etags.c   2493
@@ -3595,7 +3581,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
 mdbcomp        merc-src/accumulator.m  /^:- import_module mdbcomp.$/
-mdbcomp.sym_name       merc-src/accumulator.m  /^:- import_module mdbcomp.sym_name.$/
 me22b  lua-src/test.lua        /^   local function test.me22b (one)$/
 me_22a lua-src/test.lua        /^   function test.me_22a(one, two)$/
 memalign       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
 parse_solitary_modifier        c-src/emacs/src/keyboard.c      /^parse_solitary_modifier (Lisp_Object symbol)$/
 parse_tool_bar_item    c-src/emacs/src/keyboard.c      /^parse_tool_bar_item (Lisp_Object key, Lisp_Object /
 parse_tree     merc-src/accumulator.m  /^:- import_module parse_tree.$/
-parse_tree.error_util  merc-src/accumulator.m  /^:- import_module parse_tree.error_util.$/
-parse_tree.prog_data   merc-src/accumulator.m  /^:- import_module parse_tree.prog_data.$/
-parse_tree.prog_mode   merc-src/accumulator.m  /^:- import_module parse_tree.prog_mode.$/
-parse_tree.prog_util   merc-src/accumulator.m  /^:- import_module parse_tree.prog_util.$/
-parse_tree.set_of_var  merc-src/accumulator.m  /^:- import_module parse_tree.set_of_var.$/
 pat    c-src/etags.c   262
 pattern        c-src/etags.c   260
 pdlcount       c-src/emacs/src/lisp.h  3046
@@ -4277,6 +4257,7 @@ step_everybody    cp-src/clheir.cpp       /^void step_everybody(void)$/
 stop_polling   c-src/emacs/src/keyboard.c      /^stop_polling (void)$/
 store_info     merc-src/accumulator.m  /^:- type store_info$/
 store_user_signal_events       c-src/emacs/src/keyboard.c      /^store_user_signal_events (void)$/
+stored_goal_plain_call merc-src/accumulator.m  /^:- inst stored_goal_plain_call for goal_store.stor/
 str    go-src/test1.go 9
 strcaseeq      c-src/etags.c   /^#define strcaseeq(s,t)        (assert ((s)!=NULL && (t)!=/
 streq  c-src/etags.c   /^#define streq(s,t)    (assert ((s)!=NULL || (t)!=NULL/
@@ -4484,9 +4465,6 @@ tpcmd     c-src/h.h       15
 track-mouse    c-src/emacs/src/keyboard.c      /^DEFUN ("internal--track-mouse", Ftrack_mouse, Stra/
 tracking_off   c-src/emacs/src/keyboard.c      /^tracking_off (Lisp_Object old_value)$/
 traffic_light  cp-src/conway.cpp       /^void traffic_light(int x, int y)$/
-transform_hlds.accumulator     merc-src/accumulator.m  /^:- module transform_hlds.accumulator.$/
-transform_hlds.accumulator     merc-src/accumulator.m  /^:- end_module transform_hlds.accumulator.$/
-transform_hlds.goal_store      merc-src/accumulator.m  /^:- import_module transform_hlds.goal_store.$/
 translate      c-src/emacs/src/regex.h 361
 treats cp-src/c.C      131
 tt     prol-src/natded.prolog  /^tt:-$/
@@ -4533,6 +4511,7 @@ unblock_input_to  c-src/emacs/src/keyboard.c      /^unblock_input_to (int level)$/
 unchar c-src/h.h       99
 unexpand-abbrev        c-src/abbrev.c  /^DEFUN ("unexpand-abbrev", Funexpand_abbrev, Sunexp/
 univ   merc-src/accumulator.m  /^:- import_module univ.$/
+unravel_univ   merc-src/accumulator.m  /^:- some [T] pred unravel_univ(univ::in, T::out) is/
 unread_switch_frame    c-src/emacs/src/keyboard.c      204
 unsignedp      y-src/cccp.y    112
 unwind c-src/emacs/src/lisp.h  2962
index e05b8f2aafe08488e0a477e7314743def35ebe2a..4eae68b5c2502e5e4e531fef4d2e2a965935cd24 100644 (file)
@@ -3881,38 +3881,15 @@ Section\xreftie'char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno %\7f
 \global\def={\7f=\ 13307,107500
 \def\normalbackslash{\7f\normalbackslash\ 13321,107882
 \f
-merc-src/accumulator.m,4275
-:- module transform_hlds.accumulator\7f145,5333
+merc-src/accumulator.m,3228
+:- interface\7f146,5371
 :- import_module hlds\7f148,5386
-:- import_module hlds.hlds_module\7f149,5409
-:- import_module hlds.hlds_pred\7f150,5444
 :- import_module univ\7f152,5478
-:- pred accu_transform_proc(\7f159,5793
-:- import_module hlds.assertion\7f168,6135
-:- import_module hlds.goal_util\7f169,6168
-:- import_module hlds.hlds_error_util\7f170,6201
-:- import_module hlds.hlds_goal\7f171,6240
-:- import_module hlds.hlds_out\7f172,6273
-:- import_module hlds.hlds_out.hlds_out_util\7f173,6305
-:- import_module hlds.hlds_promise\7f174,6351
-:- import_module hlds.instmap\7f175,6387
-:- import_module hlds.pred_table\7f176,6418
-:- import_module hlds.quantification\7f177,6452
-:- import_module hlds.status\7f178,6490
-:- import_module hlds.vartypes\7f179,6520
+:- pred accu_transform_proc\7f159,5793
+:- implementation\7f166,6115
 :- import_module libs\7f180,6552
-:- import_module libs.globals\7f181,6575
-:- import_module libs.optimization_options\7f182,6606
-:- import_module libs.options\7f183,6650
 :- import_module mdbcomp\7f184,6681
-:- import_module mdbcomp.sym_name\7f185,6707
 :- import_module parse_tree\7f186,6742
-:- import_module parse_tree.error_util\7f187,6771
-:- import_module parse_tree.prog_data\7f188,6811
-:- import_module parse_tree.prog_mode\7f189,6850
-:- import_module parse_tree.prog_util\7f190,6889
-:- import_module parse_tree.set_of_var\7f191,6928
-:- import_module transform_hlds.goal_store\7f192,6968
 :- import_module assoc_list\7f194,7013
 :- import_module bool\7f195,7042
 :- import_module int\7f196,7065
@@ -3933,69 +3910,71 @@ merc-src/accumulator.m,4275
 :- type accu_goal_store\7f234,8091
 :- type accu_subst\7f238,8216
 :- type accu_warning\7f240,8264
-:- pred generate_warnings(\7f334,12550
-:- pred generate_warning(\7f342,12895
-:- pred should_attempt_accu_transform(\7f365,13886
-:- pred should_attempt_accu_transform_2(\7f398,15406
-:- pred accu_standardize(\7f440,17390
-:- pred identify_goal_type(\7f465,18169
-:- pred is_recursive_case(\7f549,21175
+:- pred generate_warnings\7f334,12550
+:- pred generate_warning\7f342,12895
+:- pred should_attempt_accu_transform\7f365,13886
+:- pred should_attempt_accu_transform_2\7f398,15406
+:- pred accu_standardize\7f440,17390
+:- pred identify_goal_type\7f465,18169
+:- pred is_recursive_case\7f549,21175
 :- type store_info\7f560,21713
-:- func initialize_goal_store(\7f570,22060
-:- pred accu_store(\7f580,22421
-:- pred identify_recursive_calls(\7f601,23288
-:- pred identify_out_and_out_prime(\7f626,24396
+:- func initialize_goal_store\7f570,22060
+:- pred accu_store\7f580,22421
+:- pred identify_recursive_calls\7f601,23288
+:- pred identify_out_and_out_prime\7f626,24396
 :- type accu_sets\7f676,26425
-:- pred accu_stage1(\7f689,26977
-:- pred accu_stage1_2(\7f727,28347
-:- pred accu_sets_init(\7f781,30557
-:- func set_upto(\7f796,30984
-:- pred accu_before(\7f812,31498
-:- pred accu_assoc(\7f835,32477
-:- pred accu_construct(\7f862,33712
-:- pred accu_construct_assoc(\7f896,35307
-:- pred accu_update(\7f938,37069
-:- pred member_lessthan_goalid(\7f964,38219
+:- pred accu_stage1\7f689,26977
+:- pred accu_stage1_2\7f727,28347
+:- pred accu_sets_init\7f781,30557
+:- func set_upto\7f796,30984
+:- pred accu_before\7f812,31498
+:- pred accu_assoc\7f835,32477
+:- pred accu_construct\7f862,33712
+:- pred accu_construct_assoc\7f896,35307
+:- pred accu_update\7f938,37069
+:- pred member_lessthan_goalid\7f964,38219
 :- type accu_assoc\7f975,38652
-:- pred accu_is_associative(\7f986,39138
-:- pred associativity_assertion(\7f1014,40263
-:- pred commutativity_assertion(\7f1037,41242
-:- pred accu_is_update(\7f1057,41952
-:- pred is_associative_construction(\7f1078,42802
+:- pred accu_is_associative\7f986,39138
+:- pred associativity_assertion\7f1014,40263
+:- pred commutativity_assertion\7f1037,41242
+:- pred accu_is_update\7f1057,41952
+:- pred is_associative_construction\7f1078,42802
 :- type accu_substs\7f1095,43480
 :- type accu_base\7f1103,43744
-:- pred accu_stage2(\7f1124,44605
-:- pred accu_substs_init(\7f1179,46957
-:- pred acc_var_subst_init(\7f1194,47573
-:- pred create_new_var(\7f1207,48147
-:- pred accu_process_assoc_set(\7f1223,48862
-:- pred accu_has_heuristic(\7f1297,52081
-:- pred accu_heuristic(\7f1304,52336
-:- pred accu_process_update_set(\7f1318,52906
-:- pred accu_divide_base_case(\7f1380,55844
-:- pred accu_related(\7f1412,57146
-:- pred lookup_call(\7f1449,58601
-:- pred accu_stage3(\7f1470,59432
-:- pred acc_proc_info(\7f1508,61326
-:- pred acc_pred_info(\7f1556,63449
-:- pred accu_create_goal(\7f1600,65285
-:- func create_acc_call(\7f1621,66400
-:- pred create_orig_goal(\7f1634,66987
-:- pred create_acc_goal(\7f1662,68157
-:- func create_new_orig_recursive_goals(\7f1709,70225
-:- func create_new_recursive_goals(\7f1723,70918
-:- func create_new_base_goals(\7f1738,71717
-:- pred acc_unification(\7f1749,72156
-:- pred accu_top_level(\7f1766,72896
-:- pred update_accumulator_pred(\7f1856,76290
-:- func accu_rename(\7f1876,77253
-:- func base_case_ids(\7f1889,77784
-:- func base_case_ids_set(\7f1898,78048
-:- func accu_goal_list(\7f1905,78269
-:- pred calculate_goal_info(\7f1916,78680
-:- func chain_subst(\7f1932,79319
-:- pred chain_subst_2(\7f1938,79482
-:- end_module transform_hlds.accumulator\7f1953,79939
+:- pred accu_stage2\7f1124,44605
+:- pred accu_substs_init\7f1179,46957
+:- pred acc_var_subst_init\7f1194,47573
+:- pred create_new_var\7f1207,48147
+:- pred accu_process_assoc_set\7f1223,48862
+:- pred accu_has_heuristic\7f1297,52081
+:- pred accu_heuristic\7f1304,52336
+:- pred accu_process_update_set\7f1318,52906
+:- pred accu_divide_base_case\7f1380,55844
+:- pred accu_related\7f1412,57146
+:- inst stored_goal_plain_call\7f1444,58415
+:- pred lookup_call\7f1449,58601
+:- pred accu_stage3\7f1470,59432
+:- pred acc_proc_info\7f1508,61326
+:- pred acc_pred_info\7f1556,63449
+:- pred accu_create_goal\7f1600,65285
+:- func create_acc_call\7f1621,66400
+:- pred create_orig_goal\7f1634,66987
+:- pred create_acc_goal\7f1662,68157
+:- func create_new_orig_recursive_goals\7f1709,70225
+:- func create_new_recursive_goals\7f1723,70918
+:- func create_new_base_goals\7f1738,71717
+:- pred acc_unification\7f1749,72156
+:- pred accu_top_level\7f1766,72896
+:- pred update_accumulator_pred\7f1856,76290
+:- func accu_rename\7f1876,77253
+:- func base_case_ids\7f1889,77784
+:- func base_case_ids_set\7f1898,78048
+:- func accu_goal_list\7f1905,78269
+:- pred calculate_goal_info\7f1916,78680
+:- func chain_subst\7f1932,79319
+:- pred chain_subst_2\7f1938,79482
+:- some [T] pred unravel_univ\7f1956,80060
+:- pragma foreign_export\7f1957,80116
 \f
 c-src/c.c,76
 T f(\7f1,0
index c3d2726ece1b995ed1d516833fb27a4bd5cff0ae..45979d6a7630ac22df70d8391e99aafbed50ac67 100644 (file)
@@ -4454,38 +4454,15 @@ Section\xreftie'char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno %\7f
 \global\def={\7f=\ 13307,107500
 \def\normalbackslash{\7f\normalbackslash\ 13321,107882
 \f
-merc-src/accumulator.m,5996
-:- module transform_hlds.accumulator\7f145,5333
+merc-src/accumulator.m,4915
+:- interface\7f146,5371
 :- import_module hlds\7f148,5386
-:- import_module hlds.hlds_module\7f149,5409
-:- import_module hlds.hlds_pred\7f150,5444
 :- import_module univ\7f152,5478
-:- pred accu_transform_proc(\7f159,5793
-:- import_module hlds.assertion\7f168,6135
-:- import_module hlds.goal_util\7f169,6168
-:- import_module hlds.hlds_error_util\7f170,6201
-:- import_module hlds.hlds_goal\7f171,6240
-:- import_module hlds.hlds_out\7f172,6273
-:- import_module hlds.hlds_out.hlds_out_util\7f173,6305
-:- import_module hlds.hlds_promise\7f174,6351
-:- import_module hlds.instmap\7f175,6387
-:- import_module hlds.pred_table\7f176,6418
-:- import_module hlds.quantification\7f177,6452
-:- import_module hlds.status\7f178,6490
-:- import_module hlds.vartypes\7f179,6520
+:- pred accu_transform_proc\7f159,5793
+:- implementation\7f166,6115
 :- import_module libs\7f180,6552
-:- import_module libs.globals\7f181,6575
-:- import_module libs.optimization_options\7f182,6606
-:- import_module libs.options\7f183,6650
 :- import_module mdbcomp\7f184,6681
-:- import_module mdbcomp.sym_name\7f185,6707
 :- import_module parse_tree\7f186,6742
-:- import_module parse_tree.error_util\7f187,6771
-:- import_module parse_tree.prog_data\7f188,6811
-:- import_module parse_tree.prog_mode\7f189,6850
-:- import_module parse_tree.prog_util\7f190,6889
-:- import_module parse_tree.set_of_var\7f191,6928
-:- import_module transform_hlds.goal_store\7f192,6968
 :- import_module assoc_list\7f194,7013
 :- import_module bool\7f195,7042
 :- import_module int\7f196,7065
@@ -4506,127 +4483,130 @@ merc-src/accumulator.m,5996
 :- type accu_goal_store\7f234,8091
 :- type accu_subst\7f238,8216
 :- type accu_warning\7f240,8264
-accu_transform_proc(\7f247,8578
-:- pred generate_warnings(\7f334,12550
-generate_warnings(\7f337,12669
-:- pred generate_warning(\7f342,12895
-generate_warning(\7f345,13001
-:- pred should_attempt_accu_transform(\7f365,13886
-should_attempt_accu_transform(\7f370,14123
-:- pred should_attempt_accu_transform_2(\7f398,15406
-should_attempt_accu_transform_2(\7f405,15763
-:- pred accu_standardize(\7f440,17390
-accu_standardize(\7f442,17455
-:- pred identify_goal_type(\7f465,18169
-identify_goal_type(\7f469,18359
-:- pred is_recursive_case(\7f549,21175
-is_recursive_case(\7f551,21253
+accu_transform_proc\7f247,8578
+:- pred generate_warnings\7f334,12550
+generate_warnings\7f337,12669
+:- pred generate_warning\7f342,12895
+generate_warning\7f345,13001
+:- pred should_attempt_accu_transform\7f365,13886
+should_attempt_accu_transform\7f370,14123
+:- pred should_attempt_accu_transform_2\7f398,15406
+should_attempt_accu_transform_2\7f405,15763
+:- pred accu_standardize\7f440,17390
+accu_standardize\7f442,17455
+:- pred identify_goal_type\7f465,18169
+identify_goal_type\7f469,18359
+:- pred is_recursive_case\7f549,21175
+is_recursive_case\7f551,21253
 :- type store_info\7f560,21713
-:- func initialize_goal_store(\7f570,22060
-initialize_goal_store(\7f573,22166
-:- pred accu_store(\7f580,22421
-accu_store(\7f584,22576
-:- pred identify_recursive_calls(\7f601,23288
-identify_recursive_calls(\7f604,23406
-:- pred identify_out_and_out_prime(\7f626,24396
-identify_out_and_out_prime(\7f631,24631
+:- func initialize_goal_store\7f570,22060
+initialize_goal_store\7f573,22166
+:- pred accu_store\7f580,22421
+accu_store\7f584,22576
+:- pred identify_recursive_calls\7f601,23288
+identify_recursive_calls\7f604,23406
+:- pred identify_out_and_out_prime\7f626,24396
+identify_out_and_out_prime\7f631,24631
 :- type accu_sets\7f676,26425
-:- pred accu_stage1(\7f689,26977
-accu_stage1(\7f693,27155
-:- pred accu_stage1_2(\7f727,28347
-accu_stage1_2(\7f731,28515
-:- pred accu_sets_init(\7f781,30557
-accu_sets_init(\7f783,30605
-:- func set_upto(\7f796,30984
-set_upto(\7f798,31039
-:- pred accu_before(\7f812,31498
-accu_before(\7f815,31639
-:- pred accu_assoc(\7f835,32477
-accu_assoc(\7f838,32617
-:- pred accu_construct(\7f862,33712
-accu_construct(\7f865,33856
-:- pred accu_construct_assoc(\7f896,35307
-accu_construct_assoc(\7f899,35457
-:- pred accu_update(\7f938,37069
-accu_update(\7f941,37210
-:- pred member_lessthan_goalid(\7f964,38219
-member_lessthan_goalid(\7f967,38342
+:- pred accu_stage1\7f689,26977
+accu_stage1\7f693,27155
+:- pred accu_stage1_2\7f727,28347
+accu_stage1_2\7f731,28515
+:- pred accu_sets_init\7f781,30557
+accu_sets_init\7f783,30605
+:- func set_upto\7f796,30984
+set_upto\7f798,31039
+:- pred accu_before\7f812,31498
+accu_before\7f815,31639
+:- pred accu_assoc\7f835,32477
+accu_assoc\7f838,32617
+:- pred accu_construct\7f862,33712
+accu_construct\7f865,33856
+:- pred accu_construct_assoc\7f896,35307
+accu_construct_assoc\7f899,35457
+:- pred accu_update\7f938,37069
+accu_update\7f941,37210
+:- pred member_lessthan_goalid\7f964,38219
+member_lessthan_goalid\7f967,38342
 :- type accu_assoc\7f975,38652
-:- pred accu_is_associative(\7f986,39138
-accu_is_associative(\7f989,39250
-:- pred associativity_assertion(\7f1014,40263
-associativity_assertion(\7f1017,40404
-:- pred commutativity_assertion(\7f1037,41242
-commutativity_assertion(\7f1040,41369
-:- pred accu_is_update(\7f1057,41952
-accu_is_update(\7f1060,42066
-:- pred is_associative_construction(\7f1078,42802
-is_associative_construction(\7f1081,42898
+:- pred accu_is_associative\7f986,39138
+accu_is_associative\7f989,39250
+:- pred associativity_assertion\7f1014,40263
+associativity_assertion\7f1017,40404
+:- pred commutativity_assertion\7f1037,41242
+commutativity_assertion\7f1040,41369
+:- pred accu_is_update\7f1057,41952
+accu_is_update\7f1060,42066
+:- pred is_associative_construction\7f1078,42802
+is_associative_construction\7f1081,42898
 :- type accu_substs\7f1095,43480
 :- type accu_base\7f1103,43744
-:- pred accu_stage2(\7f1124,44605
-accu_stage2(\7f1131,44946
-:- pred accu_substs_init(\7f1179,46957
-accu_substs_init(\7f1182,47097
-:- pred acc_var_subst_init(\7f1194,47573
-acc_var_subst_init(\7f1198,47718
-:- pred create_new_var(\7f1207,48147
-create_new_var(\7f1210,48288
-:- pred accu_process_assoc_set(\7f1223,48862
-accu_process_assoc_set(\7f1229,49150
-:- pred accu_has_heuristic(\7f1297,52081
-accu_has_heuristic(\7f1299,52161
-:- pred accu_heuristic(\7f1304,52336
-accu_heuristic(\7f1307,52457
-:- pred accu_process_update_set(\7f1318,52906
-accu_process_update_set(\7f1325,53221
-:- pred accu_divide_base_case(\7f1380,55844
-accu_divide_base_case(\7f1385,56059
-:- pred accu_related(\7f1412,57146
-accu_related(\7f1415,57270
-:- pred lookup_call(\7f1449,58601
-lookup_call(\7f1452,58715
-:- pred accu_stage3(\7f1470,59432
-accu_stage3(\7f1477,59826
-:- pred acc_proc_info(\7f1508,61326
-acc_proc_info(\7f1512,61485
-:- pred acc_pred_info(\7f1556,63449
-acc_pred_info(\7f1559,63597
-:- pred accu_create_goal(\7f1600,65285
-accu_create_goal(\7f1607,65628
-:- func create_acc_call(\7f1621,66400
-create_acc_call(\7f1625,66569
-:- pred create_orig_goal(\7f1634,66987
-create_orig_goal(\7f1638,67176
-:- pred create_acc_goal(\7f1662,68157
-create_acc_goal(\7f1667,68380
-:- func create_new_orig_recursive_goals(\7f1709,70225
-create_new_orig_recursive_goals(\7f1712,70368
-:- func create_new_recursive_goals(\7f1723,70918
-create_new_recursive_goals(\7f1727,71108
-:- func create_new_base_goals(\7f1738,71717
-create_new_base_goals(\7f1741,71831
-:- pred acc_unification(\7f1749,72156
-acc_unification(\7f1751,72225
-:- pred accu_top_level(\7f1766,72896
-accu_top_level(\7f1770,73058
-:- pred update_accumulator_pred(\7f1856,76290
-update_accumulator_pred(\7f1859,76411
-:- func accu_rename(\7f1876,77253
-accu_rename(\7f1879,77363
-:- func base_case_ids(\7f1889,77784
-base_case_ids(\7f1891,77846
-:- func base_case_ids_set(\7f1898,78048
-base_case_ids_set(\7f1900,78113
-:- func accu_goal_list(\7f1905,78269
-accu_goal_list(\7f1907,78349
-:- pred calculate_goal_info(\7f1916,78680
-calculate_goal_info(\7f1918,78753
-:- func chain_subst(\7f1932,79319
-chain_subst(\7f1934,79378
-:- pred chain_subst_2(\7f1938,79482
-chain_subst_2(\7f1941,79576
-:- end_module transform_hlds.accumulator\7f1953,79939
+:- pred accu_stage2\7f1124,44605
+accu_stage2\7f1131,44946
+:- pred accu_substs_init\7f1179,46957
+accu_substs_init\7f1182,47097
+:- pred acc_var_subst_init\7f1194,47573
+acc_var_subst_init\7f1198,47718
+:- pred create_new_var\7f1207,48147
+create_new_var\7f1210,48288
+:- pred accu_process_assoc_set\7f1223,48862
+accu_process_assoc_set\7f1229,49150
+:- pred accu_has_heuristic\7f1297,52081
+accu_has_heuristic\7f1299,52161
+:- pred accu_heuristic\7f1304,52336
+accu_heuristic\7f1307,52457
+:- pred accu_process_update_set\7f1318,52906
+accu_process_update_set\7f1325,53221
+:- pred accu_divide_base_case\7f1380,55844
+accu_divide_base_case\7f1385,56059
+:- pred accu_related\7f1412,57146
+accu_related\7f1415,57270
+:- inst stored_goal_plain_call\7f1444,58415
+:- pred lookup_call\7f1449,58601
+lookup_call\7f1452,58715
+:- pred accu_stage3\7f1470,59432
+accu_stage3\7f1477,59826
+:- pred acc_proc_info\7f1508,61326
+acc_proc_info\7f1512,61485
+:- pred acc_pred_info\7f1556,63449
+acc_pred_info\7f1559,63597
+:- pred accu_create_goal\7f1600,65285
+accu_create_goal\7f1607,65628
+:- func create_acc_call\7f1621,66400
+create_acc_call\7f1625,66569
+:- pred create_orig_goal\7f1634,66987
+create_orig_goal\7f1638,67176
+:- pred create_acc_goal\7f1662,68157
+create_acc_goal\7f1667,68380
+:- func create_new_orig_recursive_goals\7f1709,70225
+create_new_orig_recursive_goals\7f1712,70368
+:- func create_new_recursive_goals\7f1723,70918
+create_new_recursive_goals\7f1727,71108
+:- func create_new_base_goals\7f1738,71717
+create_new_base_goals\7f1741,71831
+:- pred acc_unification\7f1749,72156
+acc_unification\7f1751,72225
+:- pred accu_top_level\7f1766,72896
+accu_top_level\7f1770,73058
+:- pred update_accumulator_pred\7f1856,76290
+update_accumulator_pred\7f1859,76411
+:- func accu_rename\7f1876,77253
+accu_rename\7f1879,77363
+:- func base_case_ids\7f1889,77784
+base_case_ids\7f1891,77846
+:- func base_case_ids_set\7f1898,78048
+base_case_ids_set\7f1900,78113
+:- func accu_goal_list\7f1905,78269
+accu_goal_list\7f1907,78349
+:- pred calculate_goal_info\7f1916,78680
+calculate_goal_info\7f1918,78753
+:- func chain_subst\7f1932,79319
+chain_subst\7f1934,79378
+:- pred chain_subst_2\7f1938,79482
+chain_subst_2\7f1941,79576
+:- some [T] pred unravel_univ\7f1956,80060
+:- pragma foreign_export\7f1957,80116
+unravel_univ\7f1961,80340
 \f
 c-src/c.c,76
 T f(\7f1,0
index 85897febbf6ef1a20fe93477763ae17cbedf0da5..36edc38961795610d243f39e608b596281505b0c 100644 (file)
@@ -4288,38 +4288,15 @@ Section\xreftie'char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno %\7f
 \global\def={\7f=\ 13307,107500
 \def\normalbackslash{\7f\normalbackslash\ 13321,107882
 \f
-merc-src/accumulator.m,4275
-:- module transform_hlds.accumulator\7f145,5333
+merc-src/accumulator.m,3228
+:- interface\7f146,5371
 :- import_module hlds\7f148,5386
-:- import_module hlds.hlds_module\7f149,5409
-:- import_module hlds.hlds_pred\7f150,5444
 :- import_module univ\7f152,5478
-:- pred accu_transform_proc(\7f159,5793
-:- import_module hlds.assertion\7f168,6135
-:- import_module hlds.goal_util\7f169,6168
-:- import_module hlds.hlds_error_util\7f170,6201
-:- import_module hlds.hlds_goal\7f171,6240
-:- import_module hlds.hlds_out\7f172,6273
-:- import_module hlds.hlds_out.hlds_out_util\7f173,6305
-:- import_module hlds.hlds_promise\7f174,6351
-:- import_module hlds.instmap\7f175,6387
-:- import_module hlds.pred_table\7f176,6418
-:- import_module hlds.quantification\7f177,6452
-:- import_module hlds.status\7f178,6490
-:- import_module hlds.vartypes\7f179,6520
+:- pred accu_transform_proc\7f159,5793
+:- implementation\7f166,6115
 :- import_module libs\7f180,6552
-:- import_module libs.globals\7f181,6575
-:- import_module libs.optimization_options\7f182,6606
-:- import_module libs.options\7f183,6650
 :- import_module mdbcomp\7f184,6681
-:- import_module mdbcomp.sym_name\7f185,6707
 :- import_module parse_tree\7f186,6742
-:- import_module parse_tree.error_util\7f187,6771
-:- import_module parse_tree.prog_data\7f188,6811
-:- import_module parse_tree.prog_mode\7f189,6850
-:- import_module parse_tree.prog_util\7f190,6889
-:- import_module parse_tree.set_of_var\7f191,6928
-:- import_module transform_hlds.goal_store\7f192,6968
 :- import_module assoc_list\7f194,7013
 :- import_module bool\7f195,7042
 :- import_module int\7f196,7065
@@ -4340,69 +4317,71 @@ merc-src/accumulator.m,4275
 :- type accu_goal_store\7f234,8091
 :- type accu_subst\7f238,8216
 :- type accu_warning\7f240,8264
-:- pred generate_warnings(\7f334,12550
-:- pred generate_warning(\7f342,12895
-:- pred should_attempt_accu_transform(\7f365,13886
-:- pred should_attempt_accu_transform_2(\7f398,15406
-:- pred accu_standardize(\7f440,17390
-:- pred identify_goal_type(\7f465,18169
-:- pred is_recursive_case(\7f549,21175
+:- pred generate_warnings\7f334,12550
+:- pred generate_warning\7f342,12895
+:- pred should_attempt_accu_transform\7f365,13886
+:- pred should_attempt_accu_transform_2\7f398,15406
+:- pred accu_standardize\7f440,17390
+:- pred identify_goal_type\7f465,18169
+:- pred is_recursive_case\7f549,21175
 :- type store_info\7f560,21713
-:- func initialize_goal_store(\7f570,22060
-:- pred accu_store(\7f580,22421
-:- pred identify_recursive_calls(\7f601,23288
-:- pred identify_out_and_out_prime(\7f626,24396
+:- func initialize_goal_store\7f570,22060
+:- pred accu_store\7f580,22421
+:- pred identify_recursive_calls\7f601,23288
+:- pred identify_out_and_out_prime\7f626,24396
 :- type accu_sets\7f676,26425
-:- pred accu_stage1(\7f689,26977
-:- pred accu_stage1_2(\7f727,28347
-:- pred accu_sets_init(\7f781,30557
-:- func set_upto(\7f796,30984
-:- pred accu_before(\7f812,31498
-:- pred accu_assoc(\7f835,32477
-:- pred accu_construct(\7f862,33712
-:- pred accu_construct_assoc(\7f896,35307
-:- pred accu_update(\7f938,37069
-:- pred member_lessthan_goalid(\7f964,38219
+:- pred accu_stage1\7f689,26977
+:- pred accu_stage1_2\7f727,28347
+:- pred accu_sets_init\7f781,30557
+:- func set_upto\7f796,30984
+:- pred accu_before\7f812,31498
+:- pred accu_assoc\7f835,32477
+:- pred accu_construct\7f862,33712
+:- pred accu_construct_assoc\7f896,35307
+:- pred accu_update\7f938,37069
+:- pred member_lessthan_goalid\7f964,38219
 :- type accu_assoc\7f975,38652
-:- pred accu_is_associative(\7f986,39138
-:- pred associativity_assertion(\7f1014,40263
-:- pred commutativity_assertion(\7f1037,41242
-:- pred accu_is_update(\7f1057,41952
-:- pred is_associative_construction(\7f1078,42802
+:- pred accu_is_associative\7f986,39138
+:- pred associativity_assertion\7f1014,40263
+:- pred commutativity_assertion\7f1037,41242
+:- pred accu_is_update\7f1057,41952
+:- pred is_associative_construction\7f1078,42802
 :- type accu_substs\7f1095,43480
 :- type accu_base\7f1103,43744
-:- pred accu_stage2(\7f1124,44605
-:- pred accu_substs_init(\7f1179,46957
-:- pred acc_var_subst_init(\7f1194,47573
-:- pred create_new_var(\7f1207,48147
-:- pred accu_process_assoc_set(\7f1223,48862
-:- pred accu_has_heuristic(\7f1297,52081
-:- pred accu_heuristic(\7f1304,52336
-:- pred accu_process_update_set(\7f1318,52906
-:- pred accu_divide_base_case(\7f1380,55844
-:- pred accu_related(\7f1412,57146
-:- pred lookup_call(\7f1449,58601
-:- pred accu_stage3(\7f1470,59432
-:- pred acc_proc_info(\7f1508,61326
-:- pred acc_pred_info(\7f1556,63449
-:- pred accu_create_goal(\7f1600,65285
-:- func create_acc_call(\7f1621,66400
-:- pred create_orig_goal(\7f1634,66987
-:- pred create_acc_goal(\7f1662,68157
-:- func create_new_orig_recursive_goals(\7f1709,70225
-:- func create_new_recursive_goals(\7f1723,70918
-:- func create_new_base_goals(\7f1738,71717
-:- pred acc_unification(\7f1749,72156
-:- pred accu_top_level(\7f1766,72896
-:- pred update_accumulator_pred(\7f1856,76290
-:- func accu_rename(\7f1876,77253
-:- func base_case_ids(\7f1889,77784
-:- func base_case_ids_set(\7f1898,78048
-:- func accu_goal_list(\7f1905,78269
-:- pred calculate_goal_info(\7f1916,78680
-:- func chain_subst(\7f1932,79319
-:- pred chain_subst_2(\7f1938,79482
-:- end_module transform_hlds.accumulator\7f1953,79939
+:- pred accu_stage2\7f1124,44605
+:- pred accu_substs_init\7f1179,46957
+:- pred acc_var_subst_init\7f1194,47573
+:- pred create_new_var\7f1207,48147
+:- pred accu_process_assoc_set\7f1223,48862
+:- pred accu_has_heuristic\7f1297,52081
+:- pred accu_heuristic\7f1304,52336
+:- pred accu_process_update_set\7f1318,52906
+:- pred accu_divide_base_case\7f1380,55844
+:- pred accu_related\7f1412,57146
+:- inst stored_goal_plain_call\7f1444,58415
+:- pred lookup_call\7f1449,58601
+:- pred accu_stage3\7f1470,59432
+:- pred acc_proc_info\7f1508,61326
+:- pred acc_pred_info\7f1556,63449
+:- pred accu_create_goal\7f1600,65285
+:- func create_acc_call\7f1621,66400
+:- pred create_orig_goal\7f1634,66987
+:- pred create_acc_goal\7f1662,68157
+:- func create_new_orig_recursive_goals\7f1709,70225
+:- func create_new_recursive_goals\7f1723,70918
+:- func create_new_base_goals\7f1738,71717
+:- pred acc_unification\7f1749,72156
+:- pred accu_top_level\7f1766,72896
+:- pred update_accumulator_pred\7f1856,76290
+:- func accu_rename\7f1876,77253
+:- func base_case_ids\7f1889,77784
+:- func base_case_ids_set\7f1898,78048
+:- func accu_goal_list\7f1905,78269
+:- pred calculate_goal_info\7f1916,78680
+:- func chain_subst\7f1932,79319
+:- pred chain_subst_2\7f1938,79482
+:- some [T] pred unravel_univ\7f1956,80060
+:- pragma foreign_export\7f1957,80116
 \f
 c-src/c.c,76
 T f(\7f1,0
index 828a6b864cc3013be754193b08c82688d721c8e7..e726a993a91bc17e30caff6f2eb3a605829692e1 100644 (file)
@@ -4043,38 +4043,15 @@ Section\xreftie'char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno %\7f
 \global\def={\7f=\ 13307,107500
 \def\normalbackslash{\7f\normalbackslash\ 13321,107882
 \f
-merc-src/accumulator.m,4275
-:- module transform_hlds.accumulator\7f145,5333
+merc-src/accumulator.m,3228
+:- interface\7f146,5371
 :- import_module hlds\7f148,5386
-:- import_module hlds.hlds_module\7f149,5409
-:- import_module hlds.hlds_pred\7f150,5444
 :- import_module univ\7f152,5478
-:- pred accu_transform_proc(\7f159,5793
-:- import_module hlds.assertion\7f168,6135
-:- import_module hlds.goal_util\7f169,6168
-:- import_module hlds.hlds_error_util\7f170,6201
-:- import_module hlds.hlds_goal\7f171,6240
-:- import_module hlds.hlds_out\7f172,6273
-:- import_module hlds.hlds_out.hlds_out_util\7f173,6305
-:- import_module hlds.hlds_promise\7f174,6351
-:- import_module hlds.instmap\7f175,6387
-:- import_module hlds.pred_table\7f176,6418
-:- import_module hlds.quantification\7f177,6452
-:- import_module hlds.status\7f178,6490
-:- import_module hlds.vartypes\7f179,6520
+:- pred accu_transform_proc\7f159,5793
+:- implementation\7f166,6115
 :- import_module libs\7f180,6552
-:- import_module libs.globals\7f181,6575
-:- import_module libs.optimization_options\7f182,6606
-:- import_module libs.options\7f183,6650
 :- import_module mdbcomp\7f184,6681
-:- import_module mdbcomp.sym_name\7f185,6707
 :- import_module parse_tree\7f186,6742
-:- import_module parse_tree.error_util\7f187,6771
-:- import_module parse_tree.prog_data\7f188,6811
-:- import_module parse_tree.prog_mode\7f189,6850
-:- import_module parse_tree.prog_util\7f190,6889
-:- import_module parse_tree.set_of_var\7f191,6928
-:- import_module transform_hlds.goal_store\7f192,6968
 :- import_module assoc_list\7f194,7013
 :- import_module bool\7f195,7042
 :- import_module int\7f196,7065
@@ -4095,69 +4072,71 @@ merc-src/accumulator.m,4275
 :- type accu_goal_store\7f234,8091
 :- type accu_subst\7f238,8216
 :- type accu_warning\7f240,8264
-:- pred generate_warnings(\7f334,12550
-:- pred generate_warning(\7f342,12895
-:- pred should_attempt_accu_transform(\7f365,13886
-:- pred should_attempt_accu_transform_2(\7f398,15406
-:- pred accu_standardize(\7f440,17390
-:- pred identify_goal_type(\7f465,18169
-:- pred is_recursive_case(\7f549,21175
+:- pred generate_warnings\7f334,12550
+:- pred generate_warning\7f342,12895
+:- pred should_attempt_accu_transform\7f365,13886
+:- pred should_attempt_accu_transform_2\7f398,15406
+:- pred accu_standardize\7f440,17390
+:- pred identify_goal_type\7f465,18169
+:- pred is_recursive_case\7f549,21175
 :- type store_info\7f560,21713
-:- func initialize_goal_store(\7f570,22060
-:- pred accu_store(\7f580,22421
-:- pred identify_recursive_calls(\7f601,23288
-:- pred identify_out_and_out_prime(\7f626,24396
+:- func initialize_goal_store\7f570,22060
+:- pred accu_store\7f580,22421
+:- pred identify_recursive_calls\7f601,23288
+:- pred identify_out_and_out_prime\7f626,24396
 :- type accu_sets\7f676,26425
-:- pred accu_stage1(\7f689,26977
-:- pred accu_stage1_2(\7f727,28347
-:- pred accu_sets_init(\7f781,30557
-:- func set_upto(\7f796,30984
-:- pred accu_before(\7f812,31498
-:- pred accu_assoc(\7f835,32477
-:- pred accu_construct(\7f862,33712
-:- pred accu_construct_assoc(\7f896,35307
-:- pred accu_update(\7f938,37069
-:- pred member_lessthan_goalid(\7f964,38219
+:- pred accu_stage1\7f689,26977
+:- pred accu_stage1_2\7f727,28347
+:- pred accu_sets_init\7f781,30557
+:- func set_upto\7f796,30984
+:- pred accu_before\7f812,31498
+:- pred accu_assoc\7f835,32477
+:- pred accu_construct\7f862,33712
+:- pred accu_construct_assoc\7f896,35307
+:- pred accu_update\7f938,37069
+:- pred member_lessthan_goalid\7f964,38219
 :- type accu_assoc\7f975,38652
-:- pred accu_is_associative(\7f986,39138
-:- pred associativity_assertion(\7f1014,40263
-:- pred commutativity_assertion(\7f1037,41242
-:- pred accu_is_update(\7f1057,41952
-:- pred is_associative_construction(\7f1078,42802
+:- pred accu_is_associative\7f986,39138
+:- pred associativity_assertion\7f1014,40263
+:- pred commutativity_assertion\7f1037,41242
+:- pred accu_is_update\7f1057,41952
+:- pred is_associative_construction\7f1078,42802
 :- type accu_substs\7f1095,43480
 :- type accu_base\7f1103,43744
-:- pred accu_stage2(\7f1124,44605
-:- pred accu_substs_init(\7f1179,46957
-:- pred acc_var_subst_init(\7f1194,47573
-:- pred create_new_var(\7f1207,48147
-:- pred accu_process_assoc_set(\7f1223,48862
-:- pred accu_has_heuristic(\7f1297,52081
-:- pred accu_heuristic(\7f1304,52336
-:- pred accu_process_update_set(\7f1318,52906
-:- pred accu_divide_base_case(\7f1380,55844
-:- pred accu_related(\7f1412,57146
-:- pred lookup_call(\7f1449,58601
-:- pred accu_stage3(\7f1470,59432
-:- pred acc_proc_info(\7f1508,61326
-:- pred acc_pred_info(\7f1556,63449
-:- pred accu_create_goal(\7f1600,65285
-:- func create_acc_call(\7f1621,66400
-:- pred create_orig_goal(\7f1634,66987
-:- pred create_acc_goal(\7f1662,68157
-:- func create_new_orig_recursive_goals(\7f1709,70225
-:- func create_new_recursive_goals(\7f1723,70918
-:- func create_new_base_goals(\7f1738,71717
-:- pred acc_unification(\7f1749,72156
-:- pred accu_top_level(\7f1766,72896
-:- pred update_accumulator_pred(\7f1856,76290
-:- func accu_rename(\7f1876,77253
-:- func base_case_ids(\7f1889,77784
-:- func base_case_ids_set(\7f1898,78048
-:- func accu_goal_list(\7f1905,78269
-:- pred calculate_goal_info(\7f1916,78680
-:- func chain_subst(\7f1932,79319
-:- pred chain_subst_2(\7f1938,79482
-:- end_module transform_hlds.accumulator\7f1953,79939
+:- pred accu_stage2\7f1124,44605
+:- pred accu_substs_init\7f1179,46957
+:- pred acc_var_subst_init\7f1194,47573
+:- pred create_new_var\7f1207,48147
+:- pred accu_process_assoc_set\7f1223,48862
+:- pred accu_has_heuristic\7f1297,52081
+:- pred accu_heuristic\7f1304,52336
+:- pred accu_process_update_set\7f1318,52906
+:- pred accu_divide_base_case\7f1380,55844
+:- pred accu_related\7f1412,57146
+:- inst stored_goal_plain_call\7f1444,58415
+:- pred lookup_call\7f1449,58601
+:- pred accu_stage3\7f1470,59432
+:- pred acc_proc_info\7f1508,61326
+:- pred acc_pred_info\7f1556,63449
+:- pred accu_create_goal\7f1600,65285
+:- func create_acc_call\7f1621,66400
+:- pred create_orig_goal\7f1634,66987
+:- pred create_acc_goal\7f1662,68157
+:- func create_new_orig_recursive_goals\7f1709,70225
+:- func create_new_recursive_goals\7f1723,70918
+:- func create_new_base_goals\7f1738,71717
+:- pred acc_unification\7f1749,72156
+:- pred accu_top_level\7f1766,72896
+:- pred update_accumulator_pred\7f1856,76290
+:- func accu_rename\7f1876,77253
+:- func base_case_ids\7f1889,77784
+:- func base_case_ids_set\7f1898,78048
+:- func accu_goal_list\7f1905,78269
+:- pred calculate_goal_info\7f1916,78680
+:- func chain_subst\7f1932,79319
+:- pred chain_subst_2\7f1938,79482
+:- some [T] pred unravel_univ\7f1956,80060
+:- pragma foreign_export\7f1957,80116
 \f
 c-src/c.c,76
 T f(\7f1,0
index 5b1dc4f7bc5a48b0c4cc615177aeb179142e16da..5133cc9e2b58b9bb74bec1855b3366d1455eee85 100644 (file)
@@ -5023,38 +5023,15 @@ Section\xreftie'char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno %\7f
 \global\def={\7f=\ 13307,107500
 \def\normalbackslash{\7f\normalbackslash\ 13321,107882
 \f
-merc-src/accumulator.m,5996
-:- module transform_hlds.accumulator\7f145,5333
+merc-src/accumulator.m,4915
+:- interface\7f146,5371
 :- import_module hlds\7f148,5386
-:- import_module hlds.hlds_module\7f149,5409
-:- import_module hlds.hlds_pred\7f150,5444
 :- import_module univ\7f152,5478
-:- pred accu_transform_proc(\7f159,5793
-:- import_module hlds.assertion\7f168,6135
-:- import_module hlds.goal_util\7f169,6168
-:- import_module hlds.hlds_error_util\7f170,6201
-:- import_module hlds.hlds_goal\7f171,6240
-:- import_module hlds.hlds_out\7f172,6273
-:- import_module hlds.hlds_out.hlds_out_util\7f173,6305
-:- import_module hlds.hlds_promise\7f174,6351
-:- import_module hlds.instmap\7f175,6387
-:- import_module hlds.pred_table\7f176,6418
-:- import_module hlds.quantification\7f177,6452
-:- import_module hlds.status\7f178,6490
-:- import_module hlds.vartypes\7f179,6520
+:- pred accu_transform_proc\7f159,5793
+:- implementation\7f166,6115
 :- import_module libs\7f180,6552
-:- import_module libs.globals\7f181,6575
-:- import_module libs.optimization_options\7f182,6606
-:- import_module libs.options\7f183,6650
 :- import_module mdbcomp\7f184,6681
-:- import_module mdbcomp.sym_name\7f185,6707
 :- import_module parse_tree\7f186,6742
-:- import_module parse_tree.error_util\7f187,6771
-:- import_module parse_tree.prog_data\7f188,6811
-:- import_module parse_tree.prog_mode\7f189,6850
-:- import_module parse_tree.prog_util\7f190,6889
-:- import_module parse_tree.set_of_var\7f191,6928
-:- import_module transform_hlds.goal_store\7f192,6968
 :- import_module assoc_list\7f194,7013
 :- import_module bool\7f195,7042
 :- import_module int\7f196,7065
@@ -5075,127 +5052,130 @@ merc-src/accumulator.m,5996
 :- type accu_goal_store\7f234,8091
 :- type accu_subst\7f238,8216
 :- type accu_warning\7f240,8264
-accu_transform_proc(\7f247,8578
-:- pred generate_warnings(\7f334,12550
-generate_warnings(\7f337,12669
-:- pred generate_warning(\7f342,12895
-generate_warning(\7f345,13001
-:- pred should_attempt_accu_transform(\7f365,13886
-should_attempt_accu_transform(\7f370,14123
-:- pred should_attempt_accu_transform_2(\7f398,15406
-should_attempt_accu_transform_2(\7f405,15763
-:- pred accu_standardize(\7f440,17390
-accu_standardize(\7f442,17455
-:- pred identify_goal_type(\7f465,18169
-identify_goal_type(\7f469,18359
-:- pred is_recursive_case(\7f549,21175
-is_recursive_case(\7f551,21253
+accu_transform_proc\7f247,8578
+:- pred generate_warnings\7f334,12550
+generate_warnings\7f337,12669
+:- pred generate_warning\7f342,12895
+generate_warning\7f345,13001
+:- pred should_attempt_accu_transform\7f365,13886
+should_attempt_accu_transform\7f370,14123
+:- pred should_attempt_accu_transform_2\7f398,15406
+should_attempt_accu_transform_2\7f405,15763
+:- pred accu_standardize\7f440,17390
+accu_standardize\7f442,17455
+:- pred identify_goal_type\7f465,18169
+identify_goal_type\7f469,18359
+:- pred is_recursive_case\7f549,21175
+is_recursive_case\7f551,21253
 :- type store_info\7f560,21713
-:- func initialize_goal_store(\7f570,22060
-initialize_goal_store(\7f573,22166
-:- pred accu_store(\7f580,22421
-accu_store(\7f584,22576
-:- pred identify_recursive_calls(\7f601,23288
-identify_recursive_calls(\7f604,23406
-:- pred identify_out_and_out_prime(\7f626,24396
-identify_out_and_out_prime(\7f631,24631
+:- func initialize_goal_store\7f570,22060
+initialize_goal_store\7f573,22166
+:- pred accu_store\7f580,22421
+accu_store\7f584,22576
+:- pred identify_recursive_calls\7f601,23288
+identify_recursive_calls\7f604,23406
+:- pred identify_out_and_out_prime\7f626,24396
+identify_out_and_out_prime\7f631,24631
 :- type accu_sets\7f676,26425
-:- pred accu_stage1(\7f689,26977
-accu_stage1(\7f693,27155
-:- pred accu_stage1_2(\7f727,28347
-accu_stage1_2(\7f731,28515
-:- pred accu_sets_init(\7f781,30557
-accu_sets_init(\7f783,30605
-:- func set_upto(\7f796,30984
-set_upto(\7f798,31039
-:- pred accu_before(\7f812,31498
-accu_before(\7f815,31639
-:- pred accu_assoc(\7f835,32477
-accu_assoc(\7f838,32617
-:- pred accu_construct(\7f862,33712
-accu_construct(\7f865,33856
-:- pred accu_construct_assoc(\7f896,35307
-accu_construct_assoc(\7f899,35457
-:- pred accu_update(\7f938,37069
-accu_update(\7f941,37210
-:- pred member_lessthan_goalid(\7f964,38219
-member_lessthan_goalid(\7f967,38342
+:- pred accu_stage1\7f689,26977
+accu_stage1\7f693,27155
+:- pred accu_stage1_2\7f727,28347
+accu_stage1_2\7f731,28515
+:- pred accu_sets_init\7f781,30557
+accu_sets_init\7f783,30605
+:- func set_upto\7f796,30984
+set_upto\7f798,31039
+:- pred accu_before\7f812,31498
+accu_before\7f815,31639
+:- pred accu_assoc\7f835,32477
+accu_assoc\7f838,32617
+:- pred accu_construct\7f862,33712
+accu_construct\7f865,33856
+:- pred accu_construct_assoc\7f896,35307
+accu_construct_assoc\7f899,35457
+:- pred accu_update\7f938,37069
+accu_update\7f941,37210
+:- pred member_lessthan_goalid\7f964,38219
+member_lessthan_goalid\7f967,38342
 :- type accu_assoc\7f975,38652
-:- pred accu_is_associative(\7f986,39138
-accu_is_associative(\7f989,39250
-:- pred associativity_assertion(\7f1014,40263
-associativity_assertion(\7f1017,40404
-:- pred commutativity_assertion(\7f1037,41242
-commutativity_assertion(\7f1040,41369
-:- pred accu_is_update(\7f1057,41952
-accu_is_update(\7f1060,42066
-:- pred is_associative_construction(\7f1078,42802
-is_associative_construction(\7f1081,42898
+:- pred accu_is_associative\7f986,39138
+accu_is_associative\7f989,39250
+:- pred associativity_assertion\7f1014,40263
+associativity_assertion\7f1017,40404
+:- pred commutativity_assertion\7f1037,41242
+commutativity_assertion\7f1040,41369
+:- pred accu_is_update\7f1057,41952
+accu_is_update\7f1060,42066
+:- pred is_associative_construction\7f1078,42802
+is_associative_construction\7f1081,42898
 :- type accu_substs\7f1095,43480
 :- type accu_base\7f1103,43744
-:- pred accu_stage2(\7f1124,44605
-accu_stage2(\7f1131,44946
-:- pred accu_substs_init(\7f1179,46957
-accu_substs_init(\7f1182,47097
-:- pred acc_var_subst_init(\7f1194,47573
-acc_var_subst_init(\7f1198,47718
-:- pred create_new_var(\7f1207,48147
-create_new_var(\7f1210,48288
-:- pred accu_process_assoc_set(\7f1223,48862
-accu_process_assoc_set(\7f1229,49150
-:- pred accu_has_heuristic(\7f1297,52081
-accu_has_heuristic(\7f1299,52161
-:- pred accu_heuristic(\7f1304,52336
-accu_heuristic(\7f1307,52457
-:- pred accu_process_update_set(\7f1318,52906
-accu_process_update_set(\7f1325,53221
-:- pred accu_divide_base_case(\7f1380,55844
-accu_divide_base_case(\7f1385,56059
-:- pred accu_related(\7f1412,57146
-accu_related(\7f1415,57270
-:- pred lookup_call(\7f1449,58601
-lookup_call(\7f1452,58715
-:- pred accu_stage3(\7f1470,59432
-accu_stage3(\7f1477,59826
-:- pred acc_proc_info(\7f1508,61326
-acc_proc_info(\7f1512,61485
-:- pred acc_pred_info(\7f1556,63449
-acc_pred_info(\7f1559,63597
-:- pred accu_create_goal(\7f1600,65285
-accu_create_goal(\7f1607,65628
-:- func create_acc_call(\7f1621,66400
-create_acc_call(\7f1625,66569
-:- pred create_orig_goal(\7f1634,66987
-create_orig_goal(\7f1638,67176
-:- pred create_acc_goal(\7f1662,68157
-create_acc_goal(\7f1667,68380
-:- func create_new_orig_recursive_goals(\7f1709,70225
-create_new_orig_recursive_goals(\7f1712,70368
-:- func create_new_recursive_goals(\7f1723,70918
-create_new_recursive_goals(\7f1727,71108
-:- func create_new_base_goals(\7f1738,71717
-create_new_base_goals(\7f1741,71831
-:- pred acc_unification(\7f1749,72156
-acc_unification(\7f1751,72225
-:- pred accu_top_level(\7f1766,72896
-accu_top_level(\7f1770,73058
-:- pred update_accumulator_pred(\7f1856,76290
-update_accumulator_pred(\7f1859,76411
-:- func accu_rename(\7f1876,77253
-accu_rename(\7f1879,77363
-:- func base_case_ids(\7f1889,77784
-base_case_ids(\7f1891,77846
-:- func base_case_ids_set(\7f1898,78048
-base_case_ids_set(\7f1900,78113
-:- func accu_goal_list(\7f1905,78269
-accu_goal_list(\7f1907,78349
-:- pred calculate_goal_info(\7f1916,78680
-calculate_goal_info(\7f1918,78753
-:- func chain_subst(\7f1932,79319
-chain_subst(\7f1934,79378
-:- pred chain_subst_2(\7f1938,79482
-chain_subst_2(\7f1941,79576
-:- end_module transform_hlds.accumulator\7f1953,79939
+:- pred accu_stage2\7f1124,44605
+accu_stage2\7f1131,44946
+:- pred accu_substs_init\7f1179,46957
+accu_substs_init\7f1182,47097
+:- pred acc_var_subst_init\7f1194,47573
+acc_var_subst_init\7f1198,47718
+:- pred create_new_var\7f1207,48147
+create_new_var\7f1210,48288
+:- pred accu_process_assoc_set\7f1223,48862
+accu_process_assoc_set\7f1229,49150
+:- pred accu_has_heuristic\7f1297,52081
+accu_has_heuristic\7f1299,52161
+:- pred accu_heuristic\7f1304,52336
+accu_heuristic\7f1307,52457
+:- pred accu_process_update_set\7f1318,52906
+accu_process_update_set\7f1325,53221
+:- pred accu_divide_base_case\7f1380,55844
+accu_divide_base_case\7f1385,56059
+:- pred accu_related\7f1412,57146
+accu_related\7f1415,57270
+:- inst stored_goal_plain_call\7f1444,58415
+:- pred lookup_call\7f1449,58601
+lookup_call\7f1452,58715
+:- pred accu_stage3\7f1470,59432
+accu_stage3\7f1477,59826
+:- pred acc_proc_info\7f1508,61326
+acc_proc_info\7f1512,61485
+:- pred acc_pred_info\7f1556,63449
+acc_pred_info\7f1559,63597
+:- pred accu_create_goal\7f1600,65285
+accu_create_goal\7f1607,65628
+:- func create_acc_call\7f1621,66400
+create_acc_call\7f1625,66569
+:- pred create_orig_goal\7f1634,66987
+create_orig_goal\7f1638,67176
+:- pred create_acc_goal\7f1662,68157
+create_acc_goal\7f1667,68380
+:- func create_new_orig_recursive_goals\7f1709,70225
+create_new_orig_recursive_goals\7f1712,70368
+:- func create_new_recursive_goals\7f1723,70918
+create_new_recursive_goals\7f1727,71108
+:- func create_new_base_goals\7f1738,71717
+create_new_base_goals\7f1741,71831
+:- pred acc_unification\7f1749,72156
+acc_unification\7f1751,72225
+:- pred accu_top_level\7f1766,72896
+accu_top_level\7f1770,73058
+:- pred update_accumulator_pred\7f1856,76290
+update_accumulator_pred\7f1859,76411
+:- func accu_rename\7f1876,77253
+accu_rename\7f1879,77363
+:- func base_case_ids\7f1889,77784
+base_case_ids\7f1891,77846
+:- func base_case_ids_set\7f1898,78048
+base_case_ids_set\7f1900,78113
+:- func accu_goal_list\7f1905,78269
+accu_goal_list\7f1907,78349
+:- pred calculate_goal_info\7f1916,78680
+calculate_goal_info\7f1918,78753
+:- func chain_subst\7f1932,79319
+chain_subst\7f1934,79378
+:- pred chain_subst_2\7f1938,79482
+chain_subst_2\7f1941,79576
+:- some [T] pred unravel_univ\7f1956,80060
+:- pragma foreign_export\7f1957,80116
+unravel_univ\7f1961,80340
 \f
 c-src/c.c,76
 T f(\7f1,0
index 68cbaa9b0a06e3ffda458bd21c78fb9f32eb6789..75047951a8a1123af8e9020adb7daf1584791954 100644 (file)
@@ -5023,38 +5023,15 @@ Section\xreftie'char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno %\7f
 \global\def={\7f=\ 13307,107500
 \def\normalbackslash{\7f\normalbackslash\ 13321,107882
 \f
-merc-src/accumulator.m,5996
-:- module transform_hlds.accumulator\7f145,5333
+merc-src/accumulator.m,4915
+:- interface\7f146,5371
 :- import_module hlds\7f148,5386
-:- import_module hlds.hlds_module\7f149,5409
-:- import_module hlds.hlds_pred\7f150,5444
 :- import_module univ\7f152,5478
-:- pred accu_transform_proc(\7f159,5793
-:- import_module hlds.assertion\7f168,6135
-:- import_module hlds.goal_util\7f169,6168
-:- import_module hlds.hlds_error_util\7f170,6201
-:- import_module hlds.hlds_goal\7f171,6240
-:- import_module hlds.hlds_out\7f172,6273
-:- import_module hlds.hlds_out.hlds_out_util\7f173,6305
-:- import_module hlds.hlds_promise\7f174,6351
-:- import_module hlds.instmap\7f175,6387
-:- import_module hlds.pred_table\7f176,6418
-:- import_module hlds.quantification\7f177,6452
-:- import_module hlds.status\7f178,6490
-:- import_module hlds.vartypes\7f179,6520
+:- pred accu_transform_proc\7f159,5793
+:- implementation\7f166,6115
 :- import_module libs\7f180,6552
-:- import_module libs.globals\7f181,6575
-:- import_module libs.optimization_options\7f182,6606
-:- import_module libs.options\7f183,6650
 :- import_module mdbcomp\7f184,6681
-:- import_module mdbcomp.sym_name\7f185,6707
 :- import_module parse_tree\7f186,6742
-:- import_module parse_tree.error_util\7f187,6771
-:- import_module parse_tree.prog_data\7f188,6811
-:- import_module parse_tree.prog_mode\7f189,6850
-:- import_module parse_tree.prog_util\7f190,6889
-:- import_module parse_tree.set_of_var\7f191,6928
-:- import_module transform_hlds.goal_store\7f192,6968
 :- import_module assoc_list\7f194,7013
 :- import_module bool\7f195,7042
 :- import_module int\7f196,7065
@@ -5075,127 +5052,130 @@ merc-src/accumulator.m,5996
 :- type accu_goal_store\7f234,8091
 :- type accu_subst\7f238,8216
 :- type accu_warning\7f240,8264
-accu_transform_proc(\7f247,8578
-:- pred generate_warnings(\7f334,12550
-generate_warnings(\7f337,12669
-:- pred generate_warning(\7f342,12895
-generate_warning(\7f345,13001
-:- pred should_attempt_accu_transform(\7f365,13886
-should_attempt_accu_transform(\7f370,14123
-:- pred should_attempt_accu_transform_2(\7f398,15406
-should_attempt_accu_transform_2(\7f405,15763
-:- pred accu_standardize(\7f440,17390
-accu_standardize(\7f442,17455
-:- pred identify_goal_type(\7f465,18169
-identify_goal_type(\7f469,18359
-:- pred is_recursive_case(\7f549,21175
-is_recursive_case(\7f551,21253
+accu_transform_proc\7f247,8578
+:- pred generate_warnings\7f334,12550
+generate_warnings\7f337,12669
+:- pred generate_warning\7f342,12895
+generate_warning\7f345,13001
+:- pred should_attempt_accu_transform\7f365,13886
+should_attempt_accu_transform\7f370,14123
+:- pred should_attempt_accu_transform_2\7f398,15406
+should_attempt_accu_transform_2\7f405,15763
+:- pred accu_standardize\7f440,17390
+accu_standardize\7f442,17455
+:- pred identify_goal_type\7f465,18169
+identify_goal_type\7f469,18359
+:- pred is_recursive_case\7f549,21175
+is_recursive_case\7f551,21253
 :- type store_info\7f560,21713
-:- func initialize_goal_store(\7f570,22060
-initialize_goal_store(\7f573,22166
-:- pred accu_store(\7f580,22421
-accu_store(\7f584,22576
-:- pred identify_recursive_calls(\7f601,23288
-identify_recursive_calls(\7f604,23406
-:- pred identify_out_and_out_prime(\7f626,24396
-identify_out_and_out_prime(\7f631,24631
+:- func initialize_goal_store\7f570,22060
+initialize_goal_store\7f573,22166
+:- pred accu_store\7f580,22421
+accu_store\7f584,22576
+:- pred identify_recursive_calls\7f601,23288
+identify_recursive_calls\7f604,23406
+:- pred identify_out_and_out_prime\7f626,24396
+identify_out_and_out_prime\7f631,24631
 :- type accu_sets\7f676,26425
-:- pred accu_stage1(\7f689,26977
-accu_stage1(\7f693,27155
-:- pred accu_stage1_2(\7f727,28347
-accu_stage1_2(\7f731,28515
-:- pred accu_sets_init(\7f781,30557
-accu_sets_init(\7f783,30605
-:- func set_upto(\7f796,30984
-set_upto(\7f798,31039
-:- pred accu_before(\7f812,31498
-accu_before(\7f815,31639
-:- pred accu_assoc(\7f835,32477
-accu_assoc(\7f838,32617
-:- pred accu_construct(\7f862,33712
-accu_construct(\7f865,33856
-:- pred accu_construct_assoc(\7f896,35307
-accu_construct_assoc(\7f899,35457
-:- pred accu_update(\7f938,37069
-accu_update(\7f941,37210
-:- pred member_lessthan_goalid(\7f964,38219
-member_lessthan_goalid(\7f967,38342
+:- pred accu_stage1\7f689,26977
+accu_stage1\7f693,27155
+:- pred accu_stage1_2\7f727,28347
+accu_stage1_2\7f731,28515
+:- pred accu_sets_init\7f781,30557
+accu_sets_init\7f783,30605
+:- func set_upto\7f796,30984
+set_upto\7f798,31039
+:- pred accu_before\7f812,31498
+accu_before\7f815,31639
+:- pred accu_assoc\7f835,32477
+accu_assoc\7f838,32617
+:- pred accu_construct\7f862,33712
+accu_construct\7f865,33856
+:- pred accu_construct_assoc\7f896,35307
+accu_construct_assoc\7f899,35457
+:- pred accu_update\7f938,37069
+accu_update\7f941,37210
+:- pred member_lessthan_goalid\7f964,38219
+member_lessthan_goalid\7f967,38342
 :- type accu_assoc\7f975,38652
-:- pred accu_is_associative(\7f986,39138
-accu_is_associative(\7f989,39250
-:- pred associativity_assertion(\7f1014,40263
-associativity_assertion(\7f1017,40404
-:- pred commutativity_assertion(\7f1037,41242
-commutativity_assertion(\7f1040,41369
-:- pred accu_is_update(\7f1057,41952
-accu_is_update(\7f1060,42066
-:- pred is_associative_construction(\7f1078,42802
-is_associative_construction(\7f1081,42898
+:- pred accu_is_associative\7f986,39138
+accu_is_associative\7f989,39250
+:- pred associativity_assertion\7f1014,40263
+associativity_assertion\7f1017,40404
+:- pred commutativity_assertion\7f1037,41242
+commutativity_assertion\7f1040,41369
+:- pred accu_is_update\7f1057,41952
+accu_is_update\7f1060,42066
+:- pred is_associative_construction\7f1078,42802
+is_associative_construction\7f1081,42898
 :- type accu_substs\7f1095,43480
 :- type accu_base\7f1103,43744
-:- pred accu_stage2(\7f1124,44605
-accu_stage2(\7f1131,44946
-:- pred accu_substs_init(\7f1179,46957
-accu_substs_init(\7f1182,47097
-:- pred acc_var_subst_init(\7f1194,47573
-acc_var_subst_init(\7f1198,47718
-:- pred create_new_var(\7f1207,48147
-create_new_var(\7f1210,48288
-:- pred accu_process_assoc_set(\7f1223,48862
-accu_process_assoc_set(\7f1229,49150
-:- pred accu_has_heuristic(\7f1297,52081
-accu_has_heuristic(\7f1299,52161
-:- pred accu_heuristic(\7f1304,52336
-accu_heuristic(\7f1307,52457
-:- pred accu_process_update_set(\7f1318,52906
-accu_process_update_set(\7f1325,53221
-:- pred accu_divide_base_case(\7f1380,55844
-accu_divide_base_case(\7f1385,56059
-:- pred accu_related(\7f1412,57146
-accu_related(\7f1415,57270
-:- pred lookup_call(\7f1449,58601
-lookup_call(\7f1452,58715
-:- pred accu_stage3(\7f1470,59432
-accu_stage3(\7f1477,59826
-:- pred acc_proc_info(\7f1508,61326
-acc_proc_info(\7f1512,61485
-:- pred acc_pred_info(\7f1556,63449
-acc_pred_info(\7f1559,63597
-:- pred accu_create_goal(\7f1600,65285
-accu_create_goal(\7f1607,65628
-:- func create_acc_call(\7f1621,66400
-create_acc_call(\7f1625,66569
-:- pred create_orig_goal(\7f1634,66987
-create_orig_goal(\7f1638,67176
-:- pred create_acc_goal(\7f1662,68157
-create_acc_goal(\7f1667,68380
-:- func create_new_orig_recursive_goals(\7f1709,70225
-create_new_orig_recursive_goals(\7f1712,70368
-:- func create_new_recursive_goals(\7f1723,70918
-create_new_recursive_goals(\7f1727,71108
-:- func create_new_base_goals(\7f1738,71717
-create_new_base_goals(\7f1741,71831
-:- pred acc_unification(\7f1749,72156
-acc_unification(\7f1751,72225
-:- pred accu_top_level(\7f1766,72896
-accu_top_level(\7f1770,73058
-:- pred update_accumulator_pred(\7f1856,76290
-update_accumulator_pred(\7f1859,76411
-:- func accu_rename(\7f1876,77253
-accu_rename(\7f1879,77363
-:- func base_case_ids(\7f1889,77784
-base_case_ids(\7f1891,77846
-:- func base_case_ids_set(\7f1898,78048
-base_case_ids_set(\7f1900,78113
-:- func accu_goal_list(\7f1905,78269
-accu_goal_list(\7f1907,78349
-:- pred calculate_goal_info(\7f1916,78680
-calculate_goal_info(\7f1918,78753
-:- func chain_subst(\7f1932,79319
-chain_subst(\7f1934,79378
-:- pred chain_subst_2(\7f1938,79482
-chain_subst_2(\7f1941,79576
-:- end_module transform_hlds.accumulator\7f1953,79939
+:- pred accu_stage2\7f1124,44605
+accu_stage2\7f1131,44946
+:- pred accu_substs_init\7f1179,46957
+accu_substs_init\7f1182,47097
+:- pred acc_var_subst_init\7f1194,47573
+acc_var_subst_init\7f1198,47718
+:- pred create_new_var\7f1207,48147
+create_new_var\7f1210,48288
+:- pred accu_process_assoc_set\7f1223,48862
+accu_process_assoc_set\7f1229,49150
+:- pred accu_has_heuristic\7f1297,52081
+accu_has_heuristic\7f1299,52161
+:- pred accu_heuristic\7f1304,52336
+accu_heuristic\7f1307,52457
+:- pred accu_process_update_set\7f1318,52906
+accu_process_update_set\7f1325,53221
+:- pred accu_divide_base_case\7f1380,55844
+accu_divide_base_case\7f1385,56059
+:- pred accu_related\7f1412,57146
+accu_related\7f1415,57270
+:- inst stored_goal_plain_call\7f1444,58415
+:- pred lookup_call\7f1449,58601
+lookup_call\7f1452,58715
+:- pred accu_stage3\7f1470,59432
+accu_stage3\7f1477,59826
+:- pred acc_proc_info\7f1508,61326
+acc_proc_info\7f1512,61485
+:- pred acc_pred_info\7f1556,63449
+acc_pred_info\7f1559,63597
+:- pred accu_create_goal\7f1600,65285
+accu_create_goal\7f1607,65628
+:- func create_acc_call\7f1621,66400
+create_acc_call\7f1625,66569
+:- pred create_orig_goal\7f1634,66987
+create_orig_goal\7f1638,67176
+:- pred create_acc_goal\7f1662,68157
+create_acc_goal\7f1667,68380
+:- func create_new_orig_recursive_goals\7f1709,70225
+create_new_orig_recursive_goals\7f1712,70368
+:- func create_new_recursive_goals\7f1723,70918
+create_new_recursive_goals\7f1727,71108
+:- func create_new_base_goals\7f1738,71717
+create_new_base_goals\7f1741,71831
+:- pred acc_unification\7f1749,72156
+acc_unification\7f1751,72225
+:- pred accu_top_level\7f1766,72896
+accu_top_level\7f1770,73058
+:- pred update_accumulator_pred\7f1856,76290
+update_accumulator_pred\7f1859,76411
+:- func accu_rename\7f1876,77253
+accu_rename\7f1879,77363
+:- func base_case_ids\7f1889,77784
+base_case_ids\7f1891,77846
+:- func base_case_ids_set\7f1898,78048
+base_case_ids_set\7f1900,78113
+:- func accu_goal_list\7f1905,78269
+accu_goal_list\7f1907,78349
+:- pred calculate_goal_info\7f1916,78680
+calculate_goal_info\7f1918,78753
+:- func chain_subst\7f1932,79319
+chain_subst\7f1934,79378
+:- pred chain_subst_2\7f1938,79482
+chain_subst_2\7f1941,79576
+:- some [T] pred unravel_univ\7f1956,80060
+:- pragma foreign_export\7f1957,80116
+unravel_univ\7f1961,80340
 \f
 c-src/c.c,76
 T f(\7f1,0
index 94a6b1d858933e185ef1c715a9d60b9554a508a6..c82dbf58ff89dcd07c1a268a533952831216cd7f 100644 (file)
@@ -1952,3 +1952,11 @@ chain_subst_2([A | As], AtoB, BtoC, AtoC) :-
 %---------------------------------------------------------------------------%
 :- end_module transform_hlds.accumulator.
 %---------------------------------------------------------------------------%
+
+:- some [T] pred unravel_univ(univ::in, T::out) is det.
+:- pragma foreign_export("C", unravel_univ(in, out), "ML_unravel_univ").
+:- pragma foreign_export("C#", unravel_univ(in, out), "ML_unravel_univ").
+:- pragma foreign_export("Java", unravel_univ(in, out), "ML_unravel_univ").
+
+unravel_univ(Univ, X) :-
+    univ_value(Univ) = X.