[m-rev.] diff: fix for interactive_query in .rt grades

Fergus Henderson fjh at cs.mu.OZ.AU
Tue Feb 26 20:28:22 AEDT 2002


Estimated hours taken: 1
Branches: main

Fix a bug where `tests/interactive' was failing in grade `asm_fast.gc.tr.rt',
because the `.rt' part wasn't being include in MR_GRADE_OPT, which is used
by browser/interactive_query.m to know the grade to use when compiling
the query.

runtime/mercury_grade.h:
	Include the setting of `--reserve-tag' in MR_GRADE and MR_GRADE_OPT.

Workspace: /home/ceres/fjh/mercury
Index: runtime/mercury_grade.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_grade.h,v
retrieving revision 1.35
diff -u -d -r1.35 mercury_grade.h
--- runtime/mercury_grade.h	18 Feb 2002 07:01:16 -0000	1.35
+++ runtime/mercury_grade.h	26 Feb 2002 09:23:19 -0000
@@ -164,10 +164,16 @@
   #define MR_GRADE_PART_6	MR_GRADE_PART_5
 #endif
 
+#ifdef MR_RESERVE_TAG
+  #define MR_GRADE_PART_6b	MR_PASTE2(MR_GRADE_PART_6, _rt)
+#else
+  #define MR_GRADE_PART_6b	MR_GRADE_PART_6
+#endif
+
 #ifdef MR_USE_MINIMAL_MODEL
-  #define MR_GRADE_PART_7	MR_PASTE2(MR_GRADE_PART_6, _mm)
+  #define MR_GRADE_PART_7	MR_PASTE2(MR_GRADE_PART_6b, _mm)
 #else
-  #define MR_GRADE_PART_7	MR_GRADE_PART_6
+  #define MR_GRADE_PART_7	MR_GRADE_PART_6b
 #endif
 
 #if defined(MR_USE_TRAIL) && defined(MR_USE_MINIMAL_MODEL)
@@ -334,10 +340,16 @@
   #define MR_GRADE_OPT_PART_6	MR_GRADE_OPT_PART_5
 #endif
 
+#ifdef MR_RESERVE_TAG
+  #define MR_GRADE_OPT_PART_6b	MR_GRADE_OPT_PART_6 ".rt"
+#else
+  #define MR_GRADE_OPT_PART_6b	MR_GRADE_OPT_PART_6
+#endif
+
 #ifdef MR_USE_MINIMAL_MODEL
-  #define MR_GRADE_OPT_PART_7	MR_GRADE_OPT_PART_6 ".mm"
+  #define MR_GRADE_OPT_PART_7	MR_GRADE_OPT_PART_6b ".mm"
 #else
-  #define MR_GRADE_OPT_PART_7	MR_GRADE_OPT_PART_6
+  #define MR_GRADE_OPT_PART_7	MR_GRADE_OPT_PART_6b
 #endif
 
 /*

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------



More information about the reviews mailing list