diff: runtime cleanup continued.
Tyson Dowd
trd at cs.mu.oz.au
Sat Nov 22 20:18:05 AEDT 1997
Hi,
Here are the rest of the changes to the runtime.
===================================================================
Estimated hours taken: 1
runtime/*.h:
runtime/*.c:
runtime/mercury_conf.h.in:
Remove old .h files.
Update #includes to refer to mercury_*.h
Update #ifdef MODULE_H to be #ifdef MERCURY_MODULE_H
Index: runtime/mercury_calls.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_calls.h,v
retrieving revision 1.1
diff -u -r1.1 mercury_calls.h
--- mercury_calls.h 1997/11/20 01:59:42 1.1
+++ mercury_calls.h 1997/11/22 05:10:57
@@ -4,15 +4,15 @@
** Public License - see the file COPYING.LIB in the Mercury distribution.
*/
-/* calls.h - definitions for calls and returns */
+/* mercury_calls.h - definitions for calls and returns */
-#ifndef CALLS_H
-#define CALLS_H
+#ifndef MERCURY_CALLS_H
+#define MERCURY_CALLS_H
-#include "regs.h" /* for MR_succip */
-#include "goto.h" /* calls are implemented using gotos */
-#include "debug.h" /* we need to debug them */
-#include "prof.h" /* we need to profile them */
+#include "mercury_regs.h" /* for MR_succip */
+#include "mercury_goto.h" /* calls are implemented using gotos */
+#include "mercury_debug.h" /* we need to debug them */
+#include "mercury_prof.h" /* we need to profile them */
#define noprof_localcall(label, succ_cont) \
do { \
@@ -127,4 +127,4 @@
GOTO(MR_succip); \
} while (0)
-#endif /* not CALLS_H */
+#endif /* not MERCURY_CALLS_H */
Index: runtime/mercury_conf.h.in
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_conf.h.in,v
retrieving revision 1.1
diff -u -r1.1 mercury_conf.h.in
--- mercury_conf.h.in 1997/11/20 04:14:43 1.1
+++ mercury_conf.h.in 1997/11/22 05:11:57
@@ -5,7 +5,7 @@
*/
/*
-** conf.h.in -
+** mercury_conf.h.in -
** Various configuration parameters, determined automatically by
** the auto-configuration script.
*/
@@ -15,8 +15,8 @@
** for reasons explained in imp.h.
*/
-#ifndef CONF_H
-#define CONF_H
+#ifndef MERCURY_CONF_H
+#define MERCURY_CONF_H
/*
** WORD_TYPE: the base type for the definition of Word.
@@ -195,4 +195,4 @@
*/
#undef MR_CANNOT_GROK_ASM_TYPE_DIRECTIVE
-#endif /* CONF_H */
+#endif /* MERCURY_CONF_H */
Index: runtime/mercury_context.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_context.h,v
retrieving revision 1.1
diff -u -r1.1 mercury_context.h
--- mercury_context.h 1997/11/20 01:59:48 1.1
+++ mercury_context.h 1997/11/22 05:12:45
@@ -5,7 +5,7 @@
*/
/*
-** context.h - defines Mercury multithreading stuff.
+** mercury_context.h - defines Mercury multithreading stuff.
**
** A Context is like a thread. It contains a detstack, a nondetstack, a trail,
** the various pointers that refer to them, a succip, and a thread-
@@ -40,18 +40,18 @@
** to wake suspended processes.
*/
-#ifndef CONTEXT_H
-#define CONTEXT_H
+#ifndef MERCURY_CONTEXT_H
+#define MERCURY_CONTEXT_H
-#include "regs.h" /* for hp. Must come before system headers. */
+#include "mercury_regs.h" /* for hp. Must come before system headers. */
#include <sys/types.h> /* for pid_t */
#include "mercury_types.h" /* for Word */
#include "mercury_trail.h" /* for MR_TrailEntry */
-#include "memory.h" /* for MemoryZone */
-#include "spinlock.h" /* for SpinLock */
-#include "goto.h" /* for GOTO() */
+#include "mercury_memory.h" /* for MemoryZone */
+#include "mercury_spinlock.h" /* for SpinLock */
+#include "mercury_goto.h" /* for GOTO() */
/*
** If we have parallelism switched on (PARALLEL is defined),
@@ -135,7 +135,7 @@
** structures. If the MemoryZone pointers are not NULL,
** then they point to allocated MemoryZones, which will
** need to be reinitialized, but have space allocated to
-** them. (see comments in memory.h about reset_zone())
+** them. (see comments in mercury_memory.h about reset_zone())
*/
extern Context **free_context_list_ptr;
@@ -391,5 +391,5 @@
fatal_error("join_and_continue not implemented"); \
} while (0)
-#endif
+#endif /* not MERCURY_CONTEXT_H */
Index: runtime/mercury_debug.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_debug.h,v
retrieving revision 1.1
diff -u -r1.1 mercury_debug.h
--- mercury_debug.h 1997/11/20 01:59:52 1.1
+++ mercury_debug.h 1997/11/22 05:13:22
@@ -4,10 +4,10 @@
** Public License - see the file COPYING.LIB in the Mercury distribution.
*/
-/* debug.h - definitions for debugging messages */
+/* mercury_debug.h - definitions for debugging messages */
-#ifndef DEBUG_H
-#define DEBUG_H
+#ifndef MERCURY_DEBUG_H
+#define MERCURY_DEBUG_H
#ifdef DEBUG_ON
#define DEBUG(X) X
@@ -133,5 +133,5 @@
#define debugmsg3(msg, arg1, arg2, arg3) \
IF (progdebug, (printf(msg, arg1, arg2, arg3)))
-#endif
+#endif /* not MERCURY_DEBUG_H */
Index: runtime/mercury_deep_copy.c
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_deep_copy.c,v
retrieving revision 1.1
diff -u -r1.1 mercury_deep_copy.c
--- mercury_deep_copy.c 1997/11/20 01:59:54 1.1
+++ mercury_deep_copy.c 1997/11/22 04:50:19
@@ -8,9 +8,9 @@
** This module defines the deep_copy() function.
*/
-#include "imp.h"
-#include "deep_copy.h"
-#include "type_info.h"
+#include "mercury_imp.h"
+#include "mercury_deep_copy.h"
+#include "mercury_type_info.h"
#define in_range(X) ((X) >= lower_limit && (X) <= upper_limit)
Index: runtime/mercury_deep_copy.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_deep_copy.h,v
retrieving revision 1.1
diff -u -r1.1 mercury_deep_copy.h
--- mercury_deep_copy.h 1997/11/20 01:59:56 1.1
+++ mercury_deep_copy.h 1997/11/22 05:13:46
@@ -6,8 +6,8 @@
/* deepcopy.h - declares the deep_copy() function. */
-#ifndef DEEP_COPY_H
-#define DEEP_COPY_H
+#ifndef MERCURY_DEEP_COPY_H
+#define MERCURY_DEEP_COPY_H
#include "mercury_types.h" /* for `Word' */
@@ -62,4 +62,4 @@
Word deep_copy(Word data, Word *type_info, Word *lower_limit,
Word *upper_limit);
-#endif /* not DEEP_COPY_H */
+#endif /* not MERCURY_DEEP_COPY_H */
Index: runtime/mercury_dlist.c
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_dlist.c,v
retrieving revision 1.1
diff -u -r1.1 mercury_dlist.c
--- mercury_dlist.c 1997/11/20 01:59:58 1.1
+++ mercury_dlist.c 1997/11/22 04:43:22
@@ -9,8 +9,8 @@
*/
#include <stdio.h>
-#include "std.h"
-#include "dlist.h"
+#include "mercury_std.h"
+#include "mercury_dlist.h"
/*
** Make an empty list.
Index: runtime/mercury_dlist.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_dlist.h,v
retrieving revision 1.1
diff -u -r1.1 mercury_dlist.h
--- mercury_dlist.h 1997/11/20 02:00:00 1.1
+++ mercury_dlist.h 1997/11/22 05:14:08
@@ -5,11 +5,11 @@
*/
/*
-** dlist.h - defines a doubly-linked list type.
+** mercury_dlist.h - defines a doubly-linked list type.
*/
-#ifndef DLIST_H
-#define DLIST_H
+#ifndef MERCURY_DLIST_H
+#define MERCURY_DLIST_H
/*
** The lists we use are doubly-linked.
@@ -68,4 +68,4 @@
extern void dlist_delete(List *, List *, void (*)(void *));
extern void oldlist(List *, void (*)(void *));
-#endif /* not DLIST_H */
+#endif /* not MERCURY_DLIST_H */
Index: runtime/mercury_dummy.c
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_dummy.c,v
retrieving revision 1.1
diff -u -r1.1 mercury_dummy.c
--- mercury_dummy.c 1997/11/20 02:00:03 1.1
+++ mercury_dummy.c 1997/11/22 04:26:05
@@ -4,8 +4,8 @@
** Public License - see the file COPYING.LIB in the Mercury distribution.
*/
-#include "dummy.h"
-#include "imp.h" /* we need libmer_globals.h for Windows DLLs */
+#include "mercury_dummy.h"
+#include "mercury_imp.h" /* we need libmer_globals.h for Windows DLLs */
/*
** This dummy function is in a file of its own to ensure
Index: runtime/mercury_dummy.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_dummy.h,v
retrieving revision 1.1
diff -u -r1.1 mercury_dummy.h
--- mercury_dummy.h 1997/11/20 02:00:05 1.1
+++ mercury_dummy.h 1997/11/22 05:14:38
@@ -5,18 +5,18 @@
*/
/*
-** File: dummy.h
+** File: mercury_dummy.h
** Author: fjh
**
** Global variables and functions used purely for the purpose
** of suppressing over-zealous compiler optimizations.
*/
-#ifndef DUMMY_H
-#define DUMMY_H
+#ifndef MERCURY_DUMMY_H
+#define MERCURY_DUMMY_H
extern void dummy_function_call(void);
extern void *global_pointer;
extern void *global_pointer_2;
-#endif
+#endif /* not MERCURY_DUMMY_H */
Index: runtime/mercury_engine.c
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_engine.c,v
retrieving revision 1.1
diff -u -r1.1 mercury_engine.c
--- mercury_engine.c 1997/11/20 02:00:07 1.1
+++ mercury_engine.c 1997/11/22 04:51:12
@@ -8,15 +8,15 @@
** Public License - see the file COPYING.LIB in the Mercury distribution.
*/
-#include "imp.h"
+#include "mercury_imp.h"
#include <stdio.h>
#include <string.h>
#include <setjmp.h>
-#include "engine.h"
+#include "mercury_engine.h"
-#include "dummy.h"
+#include "mercury_dummy.h"
#ifdef USE_GCC_NONLOCAL_GOTOS
@@ -88,7 +88,7 @@
** That will copy the real registers we use to the fake_reg array.
**
** Beware, however, that if you are planning to return to C code
-** that did not #include "regs.h" (directly or via e.g. "imp.h"),
+** that did not #include "mercury_regs.h" (directly or via e.g. "mercury_imp.h"),
** and you have fiddled with the Mercury registers or invoked
** call_engine() or anything like that, then you will need to
** save the real registers that C is using before modifying the
Index: runtime/mercury_engine.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_engine.h,v
retrieving revision 1.1
diff -u -r1.1 mercury_engine.h
--- mercury_engine.h 1997/11/20 02:00:09 1.1
+++ mercury_engine.h 1997/11/22 08:58:49
@@ -5,20 +5,20 @@
*/
/*
-** engine.h - definitions for the Mercury runtime engine.
+** mercury_engine.h - definitions for the Mercury runtime engine.
**
** For documentation, see the comments in engine.mod.
*/
-#ifndef ENGINE_H
-#define ENGINE_H
+#ifndef MERCURY_ENGINE_H
+#define MERCURY_ENGINE_H
#include <setjmp.h>
-#include "std.h" /* for `bool' */
-#include "mercury_types.h" /* for `Code *' */
-#include "goto.h" /* for `Define_entry()' */
-#include "regs.h" /* for NUM_REAL_REGS */
+#include "mercury_std.h" /* for `bool' */
+#include "mercury_types.h" /* for `Code *' */
+#include "mercury_goto.h" /* for `Define_entry()' */
+#include "mercury_regs.h" /* for NUM_REAL_REGS */
#define PROGFLAG 0
#define GOTOFLAG 1
@@ -146,4 +146,4 @@
Declare_entry(do_succeed);
Declare_entry(do_not_reached);
-#endif /* not ENGINE_H */
+#endif /* not MERCURY_ENGINE_H */
Index: runtime/mercury_float.c
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_float.c,v
retrieving revision 1.2
diff -u -r1.2 mercury_float.c
--- mercury_float.c 1997/07/27 15:08:28 1.2
+++ mercury_float.c 1997/11/22 04:22:42
@@ -4,7 +4,7 @@
** Public License - see the file COPYING.LIB in the Mercury distribution.
*/
-#include "imp.h"
+#include "mercury_imp.h"
/*
** The function `hash_float()' is used by the library predicate `float__hash'
Index: runtime/mercury_getopt.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_getopt.h,v
retrieving revision 1.1
diff -u -r1.1 mercury_getopt.h
--- mercury_getopt.h 1997/11/20 02:00:13 1.1
+++ mercury_getopt.h 1997/11/22 05:15:39
@@ -5,7 +5,7 @@
*/
/*
-** getopt.h - declares the interface to the system function getopt()
+** mercury_getopt.h - declares the interface to the system function getopt()
**
** We use this file rather than the system's <getopt.h>
** because different systems have different ideas about
@@ -13,8 +13,8 @@
** Also, some systems might have getopt() but not <getopt.h>.
*/
-#ifndef GETOPT_H
-#define GETOPT_H
+#ifndef MERCURY_GETOPT_H
+#define MERCURY_GETOPT_H
#define GETOPTHUH '?'
#define GETOPTDONE (-1)
@@ -26,4 +26,4 @@
extern int optind;
extern int optopt;
-#endif /* not GETOPT_H */
+#endif /* not MERCURY_GETOPT_H */
Index: runtime/mercury_goto.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_goto.h,v
retrieving revision 1.1
diff -u -r1.1 mercury_goto.h
--- mercury_goto.h 1997/11/20 02:00:15 1.1
+++ mercury_goto.h 1997/11/22 05:16:07
@@ -4,13 +4,13 @@
** Public License - see the file COPYING.LIB in the Mercury distribution.
*/
-/* goto.h - definitions for the "portable assembler" non-local gotos */
+/* mercury_goto.h - definitions for the "portable assembler" non-local gotos */
-#ifndef GOTO_H
-#define GOTO_H
+#ifndef MERCURY_GOTO_H
+#define MERCURY_GOTO_H
#include "mercury_types.h" /* for `Code *' */
-#include "debug.h" /* for debuggoto() */
+#include "mercury_debug.h" /* for debuggoto() */
/*
** Taking the address of a label can inhibit gcc's optimization,
@@ -582,4 +582,4 @@
}
#define AND , /* used to separate the labels */
-#endif /* not GOTO_H */
+#endif /* not MERCURY_GOTO_H */
Index: runtime/mercury_grade.c
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_grade.c,v
retrieving revision 1.2
diff -u -r1.2 mercury_grade.c
--- mercury_grade.c 1997/10/06 06:54:16 1.2
+++ mercury_grade.c 1997/11/22 04:22:42
@@ -3,7 +3,7 @@
** This file may only be copied under the terms of the GNU Library General
** Public License - see the file COPYING.LIB in the Mercury distribution.
*/
-#include "imp.h"
+#include "mercury_imp.h"
#include "mercury_grade.h"
/*
Index: runtime/mercury_heap.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_heap.h,v
retrieving revision 1.1
diff -u -r1.1 mercury_heap.h
--- mercury_heap.h 1997/11/20 02:00:18 1.1
+++ mercury_heap.h 1997/11/22 08:59:05
@@ -4,13 +4,13 @@
** Public License - see the file COPYING.LIB in the Mercury distribution.
*/
-/* heap.h - definitions for manipulating the Mercury heap */
+/* mercury_heap.h - definitions for manipulating the Mercury heap */
-#ifndef HEAP_H
-#define HEAP_H
+#ifndef MERCURY_HEAP_H
+#define MERCURY_HEAP_H
#include "mercury_types.h" /* for `Word' */
-#include "context.h" /* for min_heap_reclamation_point() */
+#include "mercury_context.h" /* for min_heap_reclamation_point() */
#ifdef CONSERVATIVE_GC
@@ -97,7 +97,7 @@
/*
** When restoring hp, we must make sure that we don't truncate the heap
** further than it is safe to. We can only truncate it as far as
-** min_heap_reclamation_point. See the comments in context.h next to
+** min_heap_reclamation_point. See the comments in mercury_context.h next to
** the set_min_heap_reclamation_point() macro.
*/
#define restore_hp(src) ( \
@@ -189,4 +189,4 @@
save_transient_registers(); \
} while (0)
-#endif /* not HEAP_H */
+#endif /* not MERCURY_HEAP_H */
Index: runtime/mercury_ho_call.c
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_ho_call.c,v
retrieving revision 1.1
diff -u -r1.1 mercury_ho_call.c
--- mercury_ho_call.c 1997/11/20 02:00:20 1.1
+++ mercury_ho_call.c 1997/11/22 04:22:42
@@ -28,7 +28,7 @@
** eventual destinations.
*/
-#include "imp.h"
+#include "mercury_imp.h"
Define_extern_entry(do_call_det_closure);
Declare_label(det_closure_return);
Index: runtime/mercury_imp.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_imp.h,v
retrieving revision 1.1
diff -u -r1.1 mercury_imp.h
--- mercury_imp.h 1997/11/20 02:00:23 1.1
+++ mercury_imp.h 1997/11/22 05:17:15
@@ -5,7 +5,7 @@
*/
/*
-** imp.h - defines the interface to the Mercury abstract machine.
+** mercury_imp.h - defines the interface to the Mercury abstract machine.
**
** IMPORTANT: this must be the *first* header file that is #included.
** It must come before any system header files. This is because on some
@@ -16,8 +16,8 @@
** This file just #includes most of the other Mercury runtime header files.
*/
-#ifndef IMP_H
-#define IMP_H
+#ifndef MERCURY_IMP_H
+#define MERCURY_IMP_H
/*
** The #include of "mercury_conf.h" must come before the `#ifdef USE_DLLS',
@@ -33,36 +33,36 @@
#include "libmer_dll.h"
#endif
-#include "regs.h" /* must come before system headers */
+#include "mercury_regs.h" /* must come before system headers */
-#include "std.h"
+#include "mercury_std.h"
#include "mercury_types.h"
#include "mercury_string.h"
#include "mercury_float.h"
-#include "tags.h"
-#include "goto.h"
-#include "calls.h"
-#include "engine.h"
-
-#include "memory.h"
-#include "heap.h"
-#include "stacks.h"
-#include "overflow.h"
-
-#include "label.h"
-#include "wrapper.h"
-#include "context.h"
-#include "type_info.h"
+#include "mercury_tags.h"
+#include "mercury_goto.h"
+#include "mercury_calls.h"
+#include "mercury_engine.h"
+
+#include "mercury_memory.h"
+#include "mercury_heap.h"
+#include "mercury_stacks.h"
+#include "mercury_overflow.h"
+
+#include "mercury_label.h"
+#include "mercury_wrapper.h"
+#include "mercury_context.h"
+#include "mercury_type_info.h"
#ifdef MR_USE_TRAIL
#include "mercury_trail.h"
#endif
-#include "debug.h"
-#include "prof.h"
-#include "misc.h"
+#include "mercury_debug.h"
+#include "mercury_prof.h"
+#include "mercury_misc.h"
#include "mercury_grade.h"
-#endif /* not IMP_H */
+#endif /* not MERCURY_IMP_H */
Index: runtime/mercury_init.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_init.h,v
retrieving revision 1.1
diff -u -r1.1 mercury_init.h
--- mercury_init.h 1997/11/20 02:00:24 1.1
+++ mercury_init.h 1997/11/22 05:17:34
@@ -5,16 +5,16 @@
*/
/*
-** init.h - this file declares stuff defined in the automatically generated
-** *_init.c files. This is also the interface used by C code that
-** wishes to interface to Mercury.
+** mercury_init.h - this file declares stuff defined in the
+** automatically generated *_init.c files. This is also the interface
+** used by C code that wishes to interface to Mercury.
**
** It also declares some stuff that is used in the automatically
** generate *_init.c files.
*/
-#ifndef INIT_H
-#define INIT_H
+#ifndef MERCURY_INIT_H
+#define MERCURY_INIT_H
/*
** The following must come before any definitions of global variables.
@@ -76,9 +76,9 @@
** by C programs that wish to interface to Mercury.
*/
-#include "goto.h" /* for Declare_entry */
+#include "mercury_goto.h" /* for Declare_entry */
#include "mercury_types.h" /* for `Word' */
-#include "wrapper.h" /* for do_init_modules,
+#include "mercury_wrapper.h" /* for do_init_modules,
mercury_runtime_init(),
mercury_runtime_main(),
mercury_runtime_terminate(),
@@ -97,6 +97,6 @@
extern void ML_io_init_state(void); /* in the Mercury library */
extern void ML_io_finalize_state(void); /* in the Mercury library */
-#endif /* not INIT_H */
+#endif /* not MERCURY_INIT_H */
/*---------------------------------------------------------------------------*/
Index: runtime/mercury_label.c
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_label.c,v
retrieving revision 1.1
diff -u -r1.1 mercury_label.c
--- mercury_label.c 1997/11/20 02:00:26 1.1
+++ mercury_label.c 1997/11/22 05:05:51
@@ -14,13 +14,13 @@
#include "mercury_conf.h"
-#include "label.h"
+#include "mercury_label.h"
-#include "imp.h" /* we need libmer_globals.h for Windows DLLs */
-#include "table.h" /* for `Table' */
-#include "prof.h" /* for prof_output_addr_decls() */
-#include "engine.h" /* for `progdebug' */
-#include "wrapper.h" /* for do_init_modules() */
+#include "mercury_imp.h" /* we need libmer_globals.h for Windows DLLs */
+#include "mercury_table.h" /* for `Table' */
+#include "mercury_prof.h" /* for prof_output_addr_decls() */
+#include "mercury_engine.h" /* for `progdebug' */
+#include "mercury_wrapper.h" /* for do_init_modules() */
static const void *entry_name(const void *entry);
static const void *entry_addr(const void *entry);
Index: runtime/mercury_label.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_label.h,v
retrieving revision 1.1
diff -u -r1.1 mercury_label.h
--- mercury_label.h 1997/11/20 02:00:29 1.1
+++ mercury_label.h 1997/11/22 05:17:55
@@ -5,15 +5,15 @@
*/
/*
-** label.h defines the interface to the label table, which is a pair of
+** mercury_label.h defines the interface to the label table, which is a pair of
** hash tables mapping from procedure names to addresses and vice versa.
*/
-#ifndef LABEL_H
-#define LABEL_H
+#ifndef MERCURY_LABEL_H
+#define MERCURY_LABEL_H
#include "mercury_types.h" /* for `Code *' */
-#include "dlist.h" /* for `List' */
+#include "mercury_dlist.h" /* for `List' */
typedef struct s_label {
const char *e_name; /* name of the procedure */
@@ -30,4 +30,4 @@
/* expected number of entries in the table */
/* we allocate 8 bytes per entry */
-#endif /* not LABEL_H */
+#endif /* not MERCURY_LABEL_H */
Index: runtime/mercury_memory.c
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_memory.c,v
retrieving revision 1.1
diff -u -r1.1 mercury_memory.c
--- mercury_memory.c 1997/11/20 02:00:31 1.1
+++ mercury_memory.c 1997/11/22 04:46:31
@@ -32,7 +32,7 @@
#ifdef USE_DLLS
#include "libmer_dll.h"
#endif
-#include "regs.h" /* must come first, due to global register vars */
+#include "mercury_regs.h" /* must come first, due to global register vars */
#include "mercury_conf.h" /* must come second */
#ifdef HAVE_SIGCONTEXT_STRUCT
@@ -83,7 +83,7 @@
#include <sys/ucontext.h>
#endif
-#include "imp.h"
+#include "mercury_imp.h"
/*---------------------------------------------------------------------------*/
Index: runtime/mercury_memory.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_memory.h,v
retrieving revision 1.1
diff -u -r1.1 mercury_memory.h
--- mercury_memory.h 1997/11/20 02:00:33 1.1
+++ mercury_memory.h 1997/11/22 05:18:33
@@ -5,7 +5,8 @@
*/
/*
-** memory.h - general memory-allocation related stuff for the Mercury runtime.
+** mercury_memory.h - general memory-allocation related stuff for the
+** Mercury runtime.
**
** This defines the different memory areas used by the Mercury runtime,
** including the det & nondet stacks, the heap (and solutions heap),
@@ -14,15 +15,15 @@
** and for allocating (possibly shared) memory.
*/
-#ifndef MEMORY_H
-#define MEMORY_H
+#ifndef MERCURY_MEMORY_H
+#define MERCURY_MEMORY_H
-#include "regs.h" /* for NUM_REAL_REGS */
+#include "mercury_regs.h" /* for NUM_REAL_REGS */
#include <stdlib.h> /* for size_t */
#include "mercury_types.h" /* for Word */
-#include "std.h" /* for bool */
+#include "mercury_std.h" /* for bool */
/* these cannot be changed without lots of modifications elsewhere */
@@ -231,4 +232,4 @@
void deallocate_memory(void *);
-#endif /* not MEMORY_H */
+#endif /* not MERCURY_MEMORY_H */
Index: runtime/mercury_misc.c
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_misc.c,v
retrieving revision 1.1
diff -u -r1.1 mercury_misc.c
--- mercury_misc.c 1997/11/20 02:00:35 1.1
+++ mercury_misc.c 1997/11/22 04:59:38
@@ -4,10 +4,10 @@
** Public License - see the file COPYING.LIB in the Mercury distribution.
*/
-#include "imp.h"
-#include "dlist.h"
-#include "regs.h"
-#include "misc.h"
+#include "mercury_imp.h"
+#include "mercury_dlist.h"
+#include "mercury_regs.h"
+#include "mercury_misc.h"
#include <stdio.h>
@@ -489,7 +489,7 @@
}
/*
-** Note that hash_string is actually defined as a macro in imp.h,
+** Note that hash_string is actually defined as a macro in mercury_imp.h,
** if we're using GNU C. We define it here whether or not we're using
** gcc, so that users can easily switch between gcc and cc without
** rebuilding the libraries.
Index: runtime/mercury_misc.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_misc.h,v
retrieving revision 1.1
diff -u -r1.1 mercury_misc.h
--- mercury_misc.h 1997/11/20 02:00:37 1.1
+++ mercury_misc.h 1997/11/22 05:19:25
@@ -4,10 +4,10 @@
** Public License - see the file COPYING.LIB in the Mercury distribution.
*/
-/* misc.h - debugging messages, fatal_error(), and checked_malloc() */
+/* mercury_misc.h - debugging messages, fatal_error(), and checked_malloc() */
-#ifndef MISC_H
-#define MISC_H
+#ifndef MERCURY_MISC_H
+#define MERCURY_MISC_H
#include "mercury_types.h" /* for `Code *' */
@@ -63,8 +63,10 @@
#endif
extern void fatal_error(const char *msg) NO_RETURN;
-/* XXX checked_malloc() should be moved to memory.h or heap.h */
+/*
+** XXX checked_malloc() should be moved to mercury_memory.h or mercury_heap.h
+*/
#include <stddef.h> /* for size_t */
void *checked_malloc(size_t n);
-#endif /* not MISC_H */
+#endif /* not MERCURY_MISC_H */
Index: runtime/mercury_overflow.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_overflow.h,v
retrieving revision 1.1
diff -u -r1.1 mercury_overflow.h
--- mercury_overflow.h 1997/11/20 02:00:40 1.1
+++ mercury_overflow.h 1997/11/22 05:19:49
@@ -4,10 +4,10 @@
** Public License - see the file COPYING.LIB in the Mercury distribution.
*/
-/* overflow.h - definitions for overflow checks */
+/* mercury_overflow.h - definitions for overflow checks */
-#ifndef OVERFLOW_H
-#define OVERFLOW_H
+#ifndef MERCURY_OVERFLOW_H
+#define MERCURY_OVERFLOW_H
#define IF(cond, val) ((cond) ? ((val), (void)0) : (void)0)
@@ -21,8 +21,8 @@
#else /* not SPEED */
-#include "regs.h"
-#include "misc.h" /* for fatal_error() */
+#include "mercury_regs.h"
+#include "mercury_misc.h" /* for fatal_error() */
#define heap_overflow_check() \
( \
@@ -75,4 +75,4 @@
#endif /* not SPEED */
-#endif /* not OVERFLOW_H */
+#endif /* not MERCURY_OVERFLOW_H */
Index: runtime/mercury_prof.c
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_prof.c,v
retrieving revision 1.2
diff -u -r1.2 mercury_prof.c
--- mercury_prof.c 1997/11/21 06:31:05 1.2
+++ mercury_prof.c 1997/11/22 05:05:34
@@ -10,18 +10,18 @@
** Main Author : petdr
*/
-#include "imp.h"
+#include "mercury_imp.h"
#include <stdio.h>
#include <unistd.h>
#include <errno.h>
#include <string.h>
-#include "prof.h"
+#include "mercury_prof.h"
-#include "std.h"
-#include "prof_mem.h"
-#include "timing.h"
+#include "mercury_std.h"
+#include "mercury_prof_mem.h"
+#include "mercury_timing.h"
#if defined(PROFILE_TIME)
Index: runtime/mercury_prof.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_prof.h,v
retrieving revision 1.1
diff -u -r1.1 mercury_prof.h
--- mercury_prof.h 1997/11/20 02:00:44 1.1
+++ mercury_prof.h 1997/11/22 05:22:34
@@ -4,10 +4,10 @@
** Public License - see the file COPYING.LIB in the Mercury distribution.
*/
-/* prof.h -- definitions for profiling */
+/* mercury_prof.h -- definitions for profiling */
-#ifndef PROF_H
-#define PROF_H
+#ifndef MERCURY_PROF_H
+#define MERCURY_PROF_H
#include "mercury_types.h" /* for `Code *' */
@@ -46,4 +46,4 @@
extern void prof_output_addr_decls(const char *, const Code *);
extern void prof_output_addr_table(void);
-#endif /* not PROF_H */
+#endif /* not MERCURY_PROF_H */
Index: runtime/mercury_prof_mem.c
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_prof_mem.c,v
retrieving revision 1.1
diff -u -r1.1 mercury_prof_mem.c
--- mercury_prof_mem.c 1997/11/20 02:00:47 1.1
+++ mercury_prof_mem.c 1997/11/22 05:01:20
@@ -19,9 +19,9 @@
#include <stdio.h>
-#include "prof_mem.h"
+#include "mercury_prof_mem.h"
-#include "std.h" /* for newmem() */
+#include "mercury_std.h" /* for newmem() */
/*----------------------------------------------------------------------------*/
Index: runtime/mercury_prof_mem.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_prof_mem.h,v
retrieving revision 1.1
diff -u -r1.1 mercury_prof_mem.h
--- mercury_prof_mem.h 1997/11/20 02:00:49 1.1
+++ mercury_prof_mem.h 1997/11/22 05:22:54
@@ -5,14 +5,14 @@
*/
/*
-** prof_mem.h - defines memory allocation functions used to hold
+** mercury_prof_mem.h - defines memory allocation functions used to hold
** the tables of profiling counts.
**
** Author: petdr
*/
-#ifndef PROF_MEM_H
-#define PROF_MEM_H
+#ifndef MERCURY_PROF_MEM_H
+#define MERCURY_PROF_MEM_H
#include <stddef.h> /* for size_t */
@@ -27,4 +27,4 @@
#define prof_make(t) ((t *) prof_malloc(sizeof(t)))
-#endif /* not PROF_MEM_H */
+#endif /* not MERCURY_PROF_MEM_H */
Index: runtime/mercury_regorder.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_regorder.h,v
retrieving revision 1.1
diff -u -r1.1 mercury_regorder.h
--- mercury_regorder.h 1997/11/20 02:00:51 1.1
+++ mercury_regorder.h 1997/11/22 05:23:32
@@ -5,12 +5,12 @@
*/
/*
-** regorder.h - defines the mapping from the Mercury abstract machine
+** mercury_regorder.h - defines the mapping from the Mercury abstract machine
** registers (r1, r2, ..., hp, sp, etc.) to the underlying intermediate-level
** abstract machine memory (mr0, mr1, ...).
**
-** This file should be #included from "regs.h" and nowhere else.
-** The reason this is separate from "regs.h" is so that it could,
+** This file should be #included from "mercury_regs.h" and nowhere else.
+** The reason this is separate from "mercury_regs.h" is so that it could,
** at least in theory, be generated automatically based on
** profiling feedback from the register usage counts for a particular
** application. However, currently we don't do that.
@@ -19,8 +19,8 @@
** NUM_REAL_R_REGS in ../configure.in.
*/
-#ifndef REGORDER_H
-#define REGORDER_H
+#ifndef MERCURY_REGORDER_H
+#define MERCURY_REGORDER_H
#define r1 count_usage(R_RN(1), mr2)
#define r2 count_usage(R_RN(2), mr3)
@@ -109,4 +109,4 @@
36, \
}
-#endif /* not REGORDER_H */
+#endif /* not MERCURY_REGORDER_H */
Index: runtime/mercury_regs.c
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_regs.c,v
retrieving revision 1.1
diff -u -r1.1 mercury_regs.c
--- mercury_regs.c 1997/11/20 02:00:54 1.1
+++ mercury_regs.c 1997/11/22 04:46:32
@@ -4,8 +4,8 @@
** Public License - see the file COPYING.LIB in the Mercury distribution.
*/
-#include "imp.h"
-#include "regs.h"
+#include "mercury_imp.h"
+#include "mercury_regs.h"
#include <stdio.h>
Index: runtime/mercury_regs.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_regs.h,v
retrieving revision 1.1
diff -u -r1.1 mercury_regs.h
--- mercury_regs.h 1997/11/20 02:00:56 1.1
+++ mercury_regs.h 1997/11/22 05:23:52
@@ -4,8 +4,8 @@
** Public License - see the file COPYING.LIB in the Mercury distribution.
*/
-#ifndef REGS_H
-#define REGS_H
+#ifndef MERCURY_REGS_H
+#define MERCURY_REGS_H
#include "mercury_conf.h"
#include "mercury_types.h"
@@ -52,7 +52,7 @@
** Since the set of most frequently used Mercury virtual machine
** registers can be different for each program, we want to make
** this mapping as easy to change as possible. This is why the
-** map is in a minimal header file, regorder.h.
+** map is in a minimal header file, mercury_regorder.h.
*/
#if defined(USE_GCC_GLOBAL_REGISTERS)
@@ -91,9 +91,9 @@
#define count_usage(num,reg) (reg)
#endif
-#include "regorder.h"
+#include "mercury_regorder.h"
-/* regorder.h defines r1 .. r32; now define r(n) for n > 32 */
+/* mercury_regorder.h defines r1 .. r32; now define r(n) for n > 32 */
#define r(n) mr((n) + NUM_SPECIAL_REG - 1)
@@ -162,4 +162,4 @@
#define MR_MIN_SOL_HP_REC (MR_ORD_RN + 9)
#define MAX_RN (MR_ORD_RN + 10)
-#endif /* not REGS_H */
+#endif /* not MERCURY_REGS_H */
Index: runtime/mercury_spinlock.c
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_spinlock.c,v
retrieving revision 1.1
diff -u -r1.1 mercury_spinlock.c
--- mercury_spinlock.c 1997/11/20 02:00:58 1.1
+++ mercury_spinlock.c 1997/11/22 05:02:47
@@ -8,8 +8,8 @@
** spinlock.c - defines the code for locking and unlocking spin locks.
*/
-#include "imp.h"
-#include "spinlock.h"
+#include "mercury_imp.h"
+#include "mercury_spinlock.h"
void
do_spinlock(Word *l)
Index: runtime/mercury_spinlock.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_spinlock.h,v
retrieving revision 1.1
diff -u -r1.1 mercury_spinlock.h
--- mercury_spinlock.h 1997/11/20 02:01:01 1.1
+++ mercury_spinlock.h 1997/11/22 05:24:14
@@ -4,10 +4,10 @@
** Public License - see the file COPYING.LIB in the Mercury distribution.
*/
-/* spinlock.h - defines spin locks (locks obtained by busy-waiting) */
+/* mercury_spinlock.h - defines spin locks (locks obtained by busy-waiting) */
-#ifndef SPINLOCK_H
-#define SPINLOCK_H
+#ifndef MERCURY_SPINLOCK_H
+#define MERCURY_SPINLOCK_H
/*
** This part of the header file documents the abstract interface for a spinlock.
@@ -50,7 +50,7 @@
#include "mercury_types.h" /* for `SpinLock' and `Word' */
#include <stddef.h> /* for `NULL' */
#include "mercury_conf.h" /* for `PARALLEL' */
-#include "context.h" /* for `numprocs' */
+#include "mercury_context.h" /* for `numprocs' */
void do_spinlock(SpinLock *s);
@@ -87,4 +87,4 @@
#endif /* not PARALLEL */
-#endif /* not SPINLOCK_H */
+#endif /* not MERCURY_SPINLOCK_H */
Index: runtime/mercury_stacks.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_stacks.h,v
retrieving revision 1.1
diff -u -r1.1 mercury_stacks.h
--- mercury_stacks.h 1997/11/20 02:01:03 1.1
+++ mercury_stacks.h 1997/11/22 05:24:36
@@ -4,16 +4,16 @@
** Public License - see the file COPYING.LIB in the Mercury distribution.
*/
-/* stacks.h - definitions for manipulation the det and nondet stacks */
+/* mercury_stacks.h - definitions for manipulation the det and nondet stacks */
-#ifndef STACKS_H
-#define STACKS_H
+#ifndef MERCURY_STACKS_H
+#define MERCURY_STACKS_H
-#include "regs.h"
+#include "mercury_regs.h"
#include "mercury_types.h"
-#include "overflow.h"
-#include "debug.h"
-#include "goto.h"
+#include "mercury_overflow.h"
+#include "mercury_debug.h"
+#include "mercury_goto.h"
/* DEFINITIONS FOR MANIPULATING THE DET STACK */
@@ -172,4 +172,4 @@
GOTO(curredoip); \
} while (0)
-#endif /* not STACKS_H */
+#endif /* not MERCURY_STACKS_H */
Index: runtime/mercury_std.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_std.h,v
retrieving revision 1.1
diff -u -r1.1 mercury_std.h
--- mercury_std.h 1997/11/20 02:01:05 1.1
+++ mercury_std.h 1997/11/22 05:24:53
@@ -9,8 +9,8 @@
** bool, TRUE, FALSE, min(), max(), streq(), etc.
*/
-#ifndef STD_H
-#define STD_H
+#ifndef MERCURY_STD_H
+#define MERCURY_STD_H
#include <stdlib.h> /* for size_t */
#include <assert.h> /* for assert() */
@@ -38,7 +38,7 @@
#define ungetchar(c) ungetc(c, stdin)
-/* XXX these should go in memory.h or heap.h */
+/* XXX these should go in mercury_memory.h or mercury_heap.h */
#define make(t) ((t *) newmem(sizeof(t)))
#define make_many(t, n) ((t *) newmem((n) * sizeof(t)))
#define resize_many(t, p, n) ((t *) resizemem((p), (n) * sizeof(t)))
@@ -60,9 +60,9 @@
#endif
-/* XXX these should go in memory.h or heap.h */
+/* XXX these should go in mercury_memory.h or mercury_heap.h */
extern void *newmem(size_t);
extern void *resizemem(void *, size_t);
extern void oldmem(void *);
-#endif /* not STD_H */
+#endif /* not MERCURY_STD_H */
Index: runtime/mercury_string.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_string.h,v
retrieving revision 1.6
diff -u -r1.6 mercury_string.h
--- mercury_string.h 1997/10/02 01:50:30 1.6
+++ mercury_string.h 1997/11/22 05:25:04
@@ -11,7 +11,7 @@
#include <string.h> /* for strcmp() etc. */
-#include "heap.h" /* for incr_hp_atomic */
+#include "mercury_heap.h" /* for incr_hp_atomic */
/*
Index: runtime/mercury_table.c
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_table.c,v
retrieving revision 1.1
diff -u -r1.1 mercury_table.c
--- mercury_table.c 1997/11/20 02:01:08 1.1
+++ mercury_table.c 1997/11/22 05:04:14
@@ -20,9 +20,9 @@
#endif
#include <stdio.h>
-#include "std.h"
-#include "dlist.h"
-#include "table.h"
+#include "mercury_std.h"
+#include "mercury_dlist.h"
+#include "mercury_table.h"
/*
** Initialize a table.
Index: runtime/mercury_table.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_table.h,v
retrieving revision 1.1
diff -u -r1.1 mercury_table.h
--- mercury_table.h 1997/11/20 02:01:10 1.1
+++ mercury_table.h 1997/11/22 05:25:24
@@ -5,14 +5,14 @@
*/
/*
-** table.h - defines the interface to the hash table module.
+** mercury_table.h - defines the interface to the hash table module.
*/
-#ifndef TABLE_H
-#define TABLE_H
+#ifndef MERCURY_TABLE_H
+#define MERCURY_TABLE_H
-#include "std.h" /* for bool */
-#include "dlist.h" /* for List */
+#include "mercury_std.h" /* for bool */
+#include "mercury_dlist.h" /* for List */
typedef struct s_table {
int ta_size;
@@ -39,4 +39,4 @@
extern List *tab_get_all_entries(const Table *);
extern int tab_str_to_int(const char *);
-#endif /* not TABLE_H */
+#endif /* not MERCURY_TABLE_H */
Index: runtime/mercury_tags.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_tags.h,v
retrieving revision 1.1
diff -u -r1.1 mercury_tags.h
--- mercury_tags.h 1997/11/20 02:01:12 1.1
+++ mercury_tags.h 1997/11/22 05:28:16
@@ -5,12 +5,12 @@
*/
/*
-** tags.h - defines macros for tagging and untagging words.
+** mercury_tags.h - defines macros for tagging and untagging words.
** Also defines macros for accessing the Mercury list type from C.
*/
-#ifndef TAGS_H
-#define TAGS_H
+#ifndef MERCURY_TAGS_H
+#define MERCURY_TAGS_H
#include <limits.h> /* for `CHAR_BIT' */
#include "mercury_conf.h" /* for `LOW_TAG_BITS' */
@@ -107,4 +107,4 @@
body((pt), TAG_VAR); \
} while(0)
-#endif /* not TAGS_H */
+#endif /* not MERCURY_TAGS_H */
Index: runtime/mercury_timing.c
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_timing.c,v
retrieving revision 1.1
diff -u -r1.1 mercury_timing.c
--- mercury_timing.c 1997/11/20 02:01:14 1.1
+++ mercury_timing.c 1997/11/22 05:05:34
@@ -11,11 +11,11 @@
** Timing routines.
*/
-#include "imp.h"
+#include "mercury_imp.h"
#include <sys/times.h> /* for times() and `struct tms' */
-#include "timing.h"
+#include "mercury_timing.h"
int
MR_get_user_cpu_miliseconds(void)
Index: runtime/mercury_timing.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_timing.h,v
retrieving revision 1.1
diff -u -r1.1 mercury_timing.h
--- mercury_timing.h 1997/11/20 02:01:16 1.1
+++ mercury_timing.h 1997/11/22 05:28:36
@@ -5,13 +5,13 @@
*/
/*
-** timing.h - interface to timing routines.
+** mercury_timing.h - interface to timing routines.
** Defines `MR_CLOCK_TICKS_PER_SECOND'
** and `MR_get_user_cpu_miliseconds()'.
*/
-#ifndef TIMING_H
-#define TIMING_H
+#ifndef MERCURY_TIMING_H
+#define MERCURY_TIMING_H
#include "mercury_conf.h"
@@ -44,4 +44,4 @@
*/
int MR_get_user_cpu_miliseconds(void);
-#endif /* TIMING_H */
+#endif /* MERCURY_TIMING_H */
Index: runtime/mercury_trace.c
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_trace.c,v
retrieving revision 1.2
diff -u -r1.2 mercury_trace.c
--- mercury_trace.c 1997/10/13 08:10:48 1.2
+++ mercury_trace.c 1997/11/22 04:22:43
@@ -12,7 +12,7 @@
** available from http://www.irisa.fr/lande/ducasse.
*/
-#include "imp.h"
+#include "mercury_imp.h"
#include "mercury_trace.h"
#include <stdio.h>
Index: runtime/mercury_trail.c
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_trail.c,v
retrieving revision 1.5
diff -u -r1.5 mercury_trail.c
--- mercury_trail.c 1997/10/12 14:42:01 1.5
+++ mercury_trail.c 1997/11/22 04:59:39
@@ -11,12 +11,12 @@
** restored on backtracking.
*/
-#include "imp.h"
+#include "mercury_imp.h"
#include "mercury_trail.h"
-#include "memory.h"
-#include "misc.h"
+#include "mercury_memory.h"
+#include "mercury_misc.h"
#ifdef MR_USE_TRAIL
Index: runtime/mercury_trail.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_trail.h,v
retrieving revision 1.12
diff -u -r1.12 mercury_trail.h
--- mercury_trail.h 1997/10/12 13:32:58 1.12
+++ mercury_trail.h 1997/11/22 05:28:50
@@ -14,7 +14,7 @@
#ifndef MERCURY_TRAIL_H
#define MERCURY_TRAIL_H
-#include "memory.h"
+#include "mercury_memory.h"
#ifdef MR_USE_TRAIL
#define MR_IF_USE_TRAIL(x) x
@@ -287,7 +287,7 @@
extern MemoryZone *MR_trail_zone;
/* Pointer to the current top of the Mercury trail */
-/* N.B. Use `MR_trail_ptr', defined in regorder.h, not `MR_trail_ptr_var'. */
+/* N.B. Use `MR_trail_ptr', defined in mercury_regorder.h, not `MR_trail_ptr_var'. */
extern MR_TrailEntry *MR_trail_ptr_var;
/*
@@ -295,7 +295,7 @@
** point (including semidet choice points, e.g. in an if-then-else)
** and decremented whenever we remove one.
**
-** N.B. Use `MR_ticket_counter', defined in regorder,h,
+** N.B. Use `MR_ticket_counter', defined in mercury_regorder.h,
** not `MR_ticket_counter_var'.
*/
extern Unsigned MR_ticket_counter_var;
Index: runtime/mercury_type_info.c
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_type_info.c,v
retrieving revision 1.1
diff -u -r1.1 mercury_type_info.c
--- mercury_type_info.c 1997/11/20 02:01:19 1.1
+++ mercury_type_info.c 1997/11/22 04:44:24
@@ -14,8 +14,8 @@
** type_functors tables needed by the Mercury runtime system..
*/
-#include "imp.h"
-#include "type_info.h"
+#include "mercury_imp.h"
+#include "mercury_type_info.h"
/*---------------------------------------------------------------------------*/
Index: runtime/mercury_type_info.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_type_info.h,v
retrieving revision 1.1
diff -u -r1.1 mercury_type_info.h
--- mercury_type_info.h 1997/11/20 02:01:22 1.1
+++ mercury_type_info.h 1997/11/22 05:29:12
@@ -5,15 +5,15 @@
*/
/*
-** type_info.h -
+** mercury_type_info.h -
** Definitions for accessing the type_infos, type_layouts, and
** type_functors tables generated by the Mercury compiler.
** Also contains definitions for accessing the Mercury `univ' type
** and the Mercury `array' type.
*/
-#ifndef TYPE_INFO_H
-#define TYPE_INFO_H
+#ifndef MERCURY_TYPE_INFO_H
+#define MERCURY_TYPE_INFO_H
#include "mercury_types.h" /* for `Word' */
@@ -785,4 +785,4 @@
#define MR_make_array(sz) ((MR_ArrayType *) make_many(Word, (sz) + 1))
/*---------------------------------------------------------------------------*/
-#endif /* not TYPEINFO_H */
+#endif /* not MERCURY_TYPEINFO_H */
Index: runtime/mercury_types.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_types.h,v
retrieving revision 1.6
diff -u -r1.6 mercury_types.h
--- mercury_types.h 1997/11/20 02:01:24 1.6
+++ mercury_types.h 1997/11/22 05:29:17
@@ -43,7 +43,7 @@
/* continuation function type, for --high-level-C option */
typedef void (*Cont) (void);
-/* spinlocks -- see spinlock.h */
+/* spinlocks -- see mercury_spinlock.h */
typedef Word SpinLock;
/*
Index: runtime/mercury_wrapper.c
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_wrapper.c,v
retrieving revision 1.2
diff -u -r1.2 mercury_wrapper.c
--- mercury_wrapper.c 1997/11/21 06:31:06 1.2
+++ mercury_wrapper.c 1997/11/22 05:05:35
@@ -27,16 +27,16 @@
** various cleanups that are needed to terminate cleanly.
*/
-#include "imp.h"
+#include "mercury_imp.h"
#include <stdio.h>
#include <ctype.h>
#include <string.h>
-#include "timing.h"
-#include "getopt.h"
-#include "init.h"
-#include "dummy.h"
+#include "mercury_timing.h"
+#include "mercury_getopt.h"
+#include "mercury_init.h"
+#include "mercury_dummy.h"
/* global variables concerned with testing (i.e. not with the engine) */
Index: runtime/mercury_wrapper.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_wrapper.h,v
retrieving revision 1.2
diff -u -r1.2 mercury_wrapper.h
--- mercury_wrapper.h 1997/11/21 06:31:07 1.2
+++ mercury_wrapper.h 1997/11/22 05:29:34
@@ -5,15 +5,15 @@
*/
/*
-** wrapper.h - defines the interface to wrapper.mod.
+** mercury_wrapper.h - defines the interface to wrapper.mod.
** See wrapper.mod for documentation.
*/
-#ifndef WRAPPER_H
-#define WRAPPER_H
+#ifndef MERCURY_WRAPPER_H
+#define MERCURY_WRAPPER_H
#include <stddef.h> /* for `size_t' */
-#include "std.h" /* for `bool' */
+#include "mercury_std.h" /* for `bool' */
/*
** mercury_runtime_init() does some stuff to initialize the garbage collector
@@ -95,4 +95,4 @@
extern enum MR_TimeProfileMethod
MR_time_profile_method;
-#endif /* not WRAPPER_H */
+#endif /* not MERCURY_WRAPPER_H */
--
Tyson Dowd #
# Linux versus Windows is a
trd at cs.mu.oz.au # Win lose situation.
http://www.cs.mu.oz.au/~trd #
More information about the developers
mailing list