[m-rev.] diff: fix name clash in hlc.gc grade

[Tyson Dowd]

Hi,


===================================================================


Estimated hours taken: 0.5
Branches: main

Fix a bug that stopped the build in hlc.gc grade.

library/exception.m:
	s/ML_call_handler_det/ML_call_handler_det_handcoded/
	in the code for high level C code, to avoid a name conflict with
	the new exported Mercury code called ML_call_handler_det.


Index: library/exception.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/exception.m,v
retrieving revision 1.51
diff -u -r1.51 exception.m
--- library/exception.m	2001/08/27 16:09:19	1.51
+++ library/exception.m	2001/08/29 10:00:36
@@ -879,7 +879,7 @@
 /*---------------------------------------------------------------------------*/
 
 static void
-ML_call_handler_det(MR_Mercury_Type_Info type_info,
+ML_call_handler_det_handcoded(MR_Mercury_Type_Info type_info,
 	MR_Pred closure, MR_Univ exception, MR_Box *result)
 {
 	typedef void MR_CALL HandlerFuncType(void *, MR_Box, MR_Box *);
@@ -940,7 +940,7 @@
 #endif
 
 		ML_exception_handler = this_handler.prev;
-		ML_call_handler_det(type_info, handler_pred,
+		ML_call_handler_det_handcoded(type_info, handler_pred,
 			this_handler.exception, output);
 	}
 }
@@ -970,7 +970,7 @@
 #endif
 
 		ML_exception_handler = this_handler.prev;
-		ML_call_handler_det(type_info, handler_pred,
+		ML_call_handler_det_handcoded(type_info, handler_pred,
 			this_handler.exception, output);
 		return TRUE;
 	}
@@ -1023,7 +1023,7 @@
 #endif
 
 		ML_exception_handler = this_handler.prev;
-		ML_call_handler_det(type_info, handler_pred,
+		ML_call_handler_det_handcoded(type_info, handler_pred,
 			this_handler.exception, output);
 		(*cont)();
 	}
@@ -1101,7 +1101,7 @@
 
 
 		ML_exception_handler = locals.this_handler.prev;
-		ML_call_handler_det(type_info, handler_pred,
+		ML_call_handler_det_handcoded(type_info, handler_pred,
 			locals.this_handler.exception, output);
 		cont(cont_env);
 	}


-- 
       Tyson Dowd           # 
                            #  Surreal humour isn't everyone's cup of fur.
     trd at cs.mu.oz.au        # 
http://www.cs.mu.oz.au/~trd #
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------