[m-dev.] trivial diff: remove mercury_builtin.m references

[Simon Taylor]

Estimated hours taken: 0.25

compiler/rl_exprn.m:
	Fix a problem reported by Fergus - the code still referred
	to mercury_builtin.m.



Index: rl_exprn.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/rl_exprn.m,v
retrieving revision 1.4
diff -u -u -r1.4 rl_exprn.m
--- rl_exprn.m	1999/06/16 00:36:31	1.4
+++ rl_exprn.m	1999/06/16 00:50:18
@@ -82,7 +82,7 @@
 
 :- import_module code_util, hlds_pred, hlds_data, inst_match.
 :- import_module instmap, mode_util, tree, type_util, prog_out.
-:- import_module rl_out, llds, inlining, hlds_goal.
+:- import_module rl_out, llds, inlining, hlds_goal, prog_util.
 :- import_module assoc_list, bool, char, int, map.
 :- import_module require, set, std_util, string, term, varset.
 
@@ -754,12 +754,10 @@
 		{ rl_exprn__type_to_aditi_type(Type, AditiType) },
 		{ rl_exprn__compare_bytecode(AditiType, Compare) },
 
-		{ EQConsId = cons(qualified(unqualified("mercury_builtin"),
-				"="), 0) },
-		{ LTConsId = cons(qualified(unqualified("mercury_builtin"),
-				"<"), 0) },
-		{ GTConsId = cons(qualified(unqualified("mercury_builtin"),
-				">"), 0) },
+		{ mercury_public_builtin_module(Builtin) },
+		{ EQConsId = cons(qualified(Builtin, "="), 0) },
+		{ LTConsId = cons(qualified(Builtin, "<"), 0) },
+		{ GTConsId = cons(qualified(Builtin, ">"), 0) },
 		rl_exprn__cons_id_to_rule_number(EQConsId, ResType, EQRuleNo),
 		rl_exprn__cons_id_to_rule_number(GTConsId, ResType, GTRuleNo),
 		rl_exprn__cons_id_to_rule_number(LTConsId, ResType, LTRuleNo),
@@ -838,8 +836,8 @@
 	( 
 		{ ConsId = cons(SymName, _) },
 		(
-			{ SymName = qualified(unqualified("mercury_builtin"),
-					TypeInfo) },
+			{ mercury_private_builtin_module(Builtin) },
+			{ SymName = qualified(Builtin, TypeInfo) },
 			( { TypeInfo = "type_info" }
 			; { TypeInfo = "type_ctor_info" }
 			)
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------