[m-rev.] diff: further support for building mmc with the erlang grade

[Julien Fischer]

Branches: main, 11.01

Get more of the system compiling directly in the erlang grade.  We now
get as far as the compiler directory.

browser/MDB_FLAGS.in:
ssdb/SSDB_FLAGS.in
 	Specify the location of .hrl files required for the standard and
 	mdbcomp libraries.

mdbcomp/rtti_access.m:
 	Avoid a warning about an unbound variable.

browser/listing.m:
 	Provide an Erlang definition for the c_file_ptr/0 type.

Julien.

Index: browser/MDB_FLAGS.in
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/browser/MDB_FLAGS.in,v
retrieving revision 1.6
diff -u -r1.6 MDB_FLAGS.in
--- browser/MDB_FLAGS.in	17 May 2010 01:09:20 -0000	1.6
+++ browser/MDB_FLAGS.in	19 Jan 2011 06:26:44 -0000
@@ -18,6 +18,8 @@
  --c-include-directory ../library/Mercury/mihs
  --c-include-directory ../mdbcomp
  --c-include-directory ../mdbcomp/Mercury/mihs
+--erlang-include-directory ../library/Mercury/hrls
+--erlang-include-directory ../mdbcomp/Mercury/hrls
  -L../boehm_gc
  -L../runtime
  -L../library
Index: browser/listing.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/browser/listing.m,v
retrieving revision 1.14
diff -u -r1.14 listing.m
--- browser/listing.m	26 Oct 2010 04:59:10 -0000	1.14
+++ browser/listing.m	19 Jan 2011 06:26:44 -0000
@@ -106,6 +106,7 @@
      % stub.
  :- pragma foreign_type("C#", c_file_ptr, "object").
  :- pragma foreign_type("Java", c_file_ptr, "java.lang.Object").
+:- pragma foreign_type("Erlang", c_file_ptr, "").

      % These predicates are called from trace/mercury_trace_internal.c.
      %
Index: mdbcomp/rtti_access.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/mdbcomp/rtti_access.m,v
retrieving revision 1.18
diff -u -r1.18 rtti_access.m
--- mdbcomp/rtti_access.m	13 Jan 2011 00:36:56 -0000	1.18
+++ mdbcomp/rtti_access.m	19 Jan 2011 06:26:44 -0000
@@ -565,9 +565,10 @@
  ").

  :- pragma foreign_proc("Erlang",
-    proc_bytecode_bytes(_ProcLayout::in) = (_ByteCodeBytes::out),
+    proc_bytecode_bytes(_ProcLayout::in) = (ByteCodeBytes::out),
      [will_not_call_mercury, thread_safe, promise_pure],
  "
+    ByteCodeBytes = 0,  % Avoid a warning.
      throw({""not supported in erlang grade""})
  ").

Index: ssdb/SSDB_FLAGS.in
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/ssdb/SSDB_FLAGS.in,v
retrieving revision 1.6
diff -u -r1.6 SSDB_FLAGS.in
--- ssdb/SSDB_FLAGS.in	17 May 2010 01:09:22 -0000	1.6
+++ ssdb/SSDB_FLAGS.in	19 Jan 2011 06:26:44 -0000
@@ -20,6 +20,9 @@
  --c-include-directory ../mdbcomp/Mercury/mihs
  --c-include-directory ../browser
  --c-include-directory ../browser/Mercury/mihs
+--erlang-include-directory ../library/Mercury/hrls
+--erlang-include-directory ../mdbcomp/Mercury/hrls
+--erlang-include-directory ../browser/Mercury/hrls
  -L../boehm_gc
  -L../runtime
  -L../library

--------------------------------------------------------------------------
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
--------------------------------------------------------------------------