[PPL-devel] [GIT] ppl/ppl(termination): Fixed some bugs in the Prolog interface termination code.

[Patricia Hill]

Module: ppl/ppl
Branch: termination
Commit: f8bcb32b2739e509d24cdd6daf74e085a388165b
URL:    http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f8bcb32b2739e509d24cdd6daf74e085a388165b

Author: Patricia Hill <p.m.hill at leeds.ac.uk>
Date:   Mon Mar  8 12:46:14 2010 +0000

Fixed some bugs in the Prolog interface termination code.

---

 .../ppl_interface_generator_prolog_hh_code.m4      |   12 ++++++------
 ...erface_generator_prolog_procedure_generators.m4 |    6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4
index bc50e6b..1c38748 100644
--- a/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4
+++ b/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4
@@ -511,22 +511,22 @@ m4_define(`ppl_ at CLASS@_ at MEMBYTES@_code',
 
 ')
 
-m4_define(`ppl_ at CLASS@_termination_test_MS_code',
+m4_define(`ppl_ at CLASS@_termination_test_ at TERMINATION_ID@_code',
   `extern "C" Prolog_foreign_return_type
-  ppl_ at CLASS@_termination_test_MS(Prolog_term_ref t_x);
+  ppl_ at CLASS@_termination_test_ at TERMINATION_ID@(Prolog_term_ref t_x);
 
 ')
 
-m4_define(`ppl_ at CLASS@_one_affine_ranking_function_MS_code',
+m4_define(`ppl_ at CLASS@_one_affine_ranking_function_ at TERMINATION_ID@_code',
   `extern "C" Prolog_foreign_return_type
-  ppl_ at CLASS@_one_affine_ranking_function_MS(Prolog_term_ref t_x,
+  ppl_ at CLASS@_one_affine_ranking_function_ at TERMINATION_ID@(Prolog_term_ref t_x,
                                              Prolog_term_ref t_g);
 
 ')
 
-m4_define(`ppl_ at CLASS@_all_affine_ranking_functions_MS_code',
+m4_define(`ppl_ at CLASS@_all_affine_ranking_functions_ at TERMINATION_ID@_code',
   `extern "C" Prolog_foreign_return_type
-  ppl_ at CLASS@_all_affine_ranking_functions_MS(Prolog_term_ref t_x,
+  ppl_ at CLASS@_all_affine_ranking_functions_ at TERMINATION_ID@(Prolog_term_ref t_x,
                                               Prolog_term_ref t_g);
 
 ')
diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4
index 08798d0..5ee84aa 100644
--- a/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4
+++ b/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4
@@ -87,8 +87,8 @@ ppl_MIP_Problem_ascii_dump/1`'dnl
 
 m4_define(`m4_procedure_list',
   `m4_echo_unquoted(`m4_common_procedure_list',
-ppl_ at CLASS@_termination_test_MS/1 +simple,
-ppl_ at CLASS@_one_affine_ranking_function_MS/2 +simple,
-ppl_ at CLASS@_all_affine_ranking_functions_MS/2 +simple,
+ppl_ at CLASS@_termination_test_ at TERMINATION_ID@/1 +simple,
+ppl_ at CLASS@_one_affine_ranking_function_ at TERMINATION_ID@/2 +simple,
+ppl_ at CLASS@_all_affine_ranking_functions_ at TERMINATION_ID@/2 +simple,
 )
 ')