[m-dev.] diff: avoid shadowing sp and curfr

[Zoltan Somogyi]

trace/mercury_trace.c:
	Avoid problems with some argument names shadowing the global macros sp
	and curfr.

Zoltan.

cvs diff: Diffing .
Index: mercury_trace.c
===================================================================
RCS file: /home/mercury1/repository/mercury/trace/mercury_trace.c,v
retrieving revision 1.32
diff -u -b -r1.32 mercury_trace.c
--- mercury_trace.c	2000/12/06 06:06:03	1.32
+++ mercury_trace.c	2000/12/08 06:36:16
@@ -1127,7 +1127,7 @@
 
 static void
 MR_maybe_record_call_table(const MR_Stack_Layout_Entry *level_layout,
-	MR_Word *sp, MR_Word *curfr)
+	MR_Word *base_sp, MR_Word *base_curfr)
 {
 	MR_TrieNode	call_table;
 
@@ -1150,10 +1150,12 @@
 	case MR_EVAL_METHOD_MEMO:
 	case MR_EVAL_METHOD_LOOP_CHECK:
 		if (MR_DETISM_DET_STACK(level_layout->MR_sle_detism)) {
-			call_table = (MR_TrieNode) MR_based_stackvar(sp, 
+			call_table = (MR_TrieNode) MR_based_stackvar(
+				base_sp, 
 				level_layout->MR_sle_maybe_call_table);
 		} else {
-			call_table = (MR_TrieNode) MR_based_framevar(curfr, 
+			call_table = (MR_TrieNode) MR_based_framevar(
+				base_curfr, 
 				level_layout->MR_sle_maybe_call_table);
 		}
 
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------