[m-rev.] diff: fix compilation of compiler in non C grades

[Julien Fischer]

Branches: main

Fix compilation of the compiler in non C grades.

compiler/equiv_type_hlds.m:
compiler/hlds_out_mode.m:
compiler/inst_match.m:
compiler/make.util.m:
 	Provide Mercury clauses for various foreign_procs that have
 	been added recently.

Julien.

Index: compiler/equiv_type_hlds.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/equiv_type_hlds.m,v
retrieving revision 1.74
diff -u -r1.74 equiv_type_hlds.m
--- compiler/equiv_type_hlds.m	8 Jun 2012 15:36:54 -0000	1.74
+++ compiler/equiv_type_hlds.m	22 Jun 2012 17:13:36 -0000
@@ -845,6 +845,9 @@
      }
  ").

+lookup_inst_may_occur(_, no, no) :-
+    semipure semipure_true.
+
      % Record the result for Inst in the cache.
      %
  :- impure pred record_inst_may_occur(mer_inst::in, bool::in) is det.
@@ -863,6 +866,9 @@
      type_in_inst_cache[hash].tice_may_occur = MayOccur;
  ").

+record_inst_may_occur(_, _) :-
+    impure impure_true.
+
  %-----------------------------------------------------------------------------%

  :- pred replace_in_inst_2(eqv_map::in, mer_inst::in, mer_inst::out, bool::out,
Index: compiler/hlds_out_mode.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/hlds_out_mode.m,v
retrieving revision 1.10
diff -u -r1.10 hlds_out_mode.m
--- compiler/hlds_out_mode.m	11 Jun 2012 03:13:21 -0000	1.10
+++ compiler/hlds_out_mode.m	22 Jun 2012 17:15:52 -0000
@@ -890,6 +890,8 @@
      InstAddr = Inst;
  ").

+get_inst_addr(_, -1).
+
  %-----------------------------------------------------------------------------%

  :- pred mercury_format_structured_inst_name(inst_name::in, int::in,
Index: compiler/inst_match.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/inst_match.m,v
retrieving revision 1.100
diff -u -r1.100 inst_match.m
--- compiler/inst_match.m	19 Jun 2012 07:21:23 -0000	1.100
+++ compiler/inst_match.m	22 Jun 2012 17:00:33 -0000
@@ -1662,6 +1662,9 @@
      }
  ").

+lookup_inst_is_ground(_, no, no) :-
+    semipure semipure_true.
+
      % Record the result for Inst in the cache.
      %
  :- impure pred record_inst_is_ground(mer_inst::in, bool::in) is det.
@@ -1680,6 +1683,9 @@
      inst_is_ground_cache[hash].iig_is_ground = IsGround;
  ").

+record_inst_is_ground(_, _) :-
+    impure impure_true.
+
  %-----------------------------------------------------------------------------%

  :- pred inst_is_ground_mt(module_info::in, maybe(mer_type)::in, mer_inst::in)
@@ -2689,6 +2695,9 @@
      SUCCESS_INDICATOR = ((void *) InstA == (void *) InstB);
  ").

+same_addr_insts(_, _) :-
+    semidet_fail.
+
  %-----------------------------------------------------------------------------%
  :- end_module check_hlds.inst_match.
  %-----------------------------------------------------------------------------%
Index: compiler/make.util.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/make.util.m,v
retrieving revision 1.88
diff -u -r1.88 make.util.m
--- compiler/make.util.m	11 May 2012 03:56:48 -0000	1.88
+++ compiler/make.util.m	22 Jun 2012 17:03:50 -0000
@@ -924,6 +924,8 @@
  #endif
  ").

+lock_stdout(_, !IO).
+
  :- pred unlock_stdout(stdout_lock::in, io::di, io::uo) is det.

  :- pragma foreign_proc("C",
@@ -936,6 +938,8 @@
  #endif
  ").

+unlock_stdout(_, !IO).
+
  :- pred with_locked_stdout(make_info::in,
      pred(io, io)::in(pred(di, uo) is det), io::di, io::uo) is det.


--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------