[m-rev.] diff: fixes for lcc

[Fergus Henderson]

Estimated hours taken: 0.75
Branches: main, release

Fix some C conformance problems that showed up when bootstrapping with lcc.

runtime/mercury_type_info.h:
	Delete extraneous semicolons that are not allowed by standard C.

trace/mercury_trace_declarative.c:
	Fix type errors.

Workspace: /mnt/mars/home/mars/fjh/ws4/mercury
Index: runtime/mercury_type_info.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_type_info.h,v
retrieving revision 1.105
diff -u -d -r1.105 mercury_type_info.h
--- runtime/mercury_type_info.h	24 Jun 2003 01:21:22 -0000	1.105
+++ runtime/mercury_type_info.h	1 Aug 2003 10:40:01 -0000
@@ -220,27 +220,27 @@
 ** for now...
 */
 
-MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY_ZERO;
-MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(1);
-MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(2);
-MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(3);
-MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(4);
-MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(5);
-MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(6);
-MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(7);
-MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(8);
-MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(9);
-MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(10);
-MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(11);
-MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(12);
-MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(13);
-MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(14);
-MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(15);
-MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(16);
-MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(17);
-MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(18);
-MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(19);
-MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(20);
+MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY_ZERO
+MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(1)
+MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(2)
+MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(3)
+MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(4)
+MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(5)
+MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(6)
+MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(7)
+MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(8)
+MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(9)
+MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(10)
+MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(11)
+MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(12)
+MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(13)
+MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(14)
+MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(15)
+MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(16)
+MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(17)
+MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(18)
+MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(19)
+MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(20)
 
 /*
 ** When converting a MR_PseudoTypeInfo to a MR_TypeInfo, we need the
Index: trace/mercury_trace_declarative.c
===================================================================
RCS file: /home/mercury1/repository/mercury/trace/mercury_trace_declarative.c,v
retrieving revision 1.62
diff -u -d -r1.62 mercury_trace_declarative.c
--- trace/mercury_trace_declarative.c	2 Apr 2003 23:01:45 -0000	1.62
+++ trace/mercury_trace_declarative.c	1 Aug 2003 10:18:26 -0000
@@ -940,7 +940,7 @@
 {
 	MR_PredFunc			pred_or_func;
 	MR_ConstString			name;
-	MR_Word				arity;
+	int				arity;
 	MR_Word				atom;
 	int				hv;   /* any head variable */
 	int				num_added_args;
@@ -1301,13 +1301,13 @@
 				&MR_trace_front_end_state
 			);
 		bug_found = MR_DD_diagnoser_bug_found(response,
-				(MR_Word *) &bug_event);
+				(MR_Integer *) &bug_event);
 		symptom_found = MR_DD_diagnoser_symptom_found(response,
-				(MR_Word *) &symptom_event);
+				(MR_Integer *) &symptom_event);
 		no_bug_found = MR_DD_diagnoser_no_bug_found(response);
 		require_subtree = MR_DD_diagnoser_require_subtree(response,
-				(MR_Word *) &final_event,
-				(MR_Word *) &topmost_seqno);
+				(MR_Integer *) &final_event,
+				(MR_Integer *) &topmost_seqno);
 	);
 
 	MR_trace_call_seqno = event_details->MR_call_seqno;
@@ -1430,7 +1430,7 @@
 	MR_TRACE_CALL_MERCURY(
 		if (!MR_DD_trace_node_seqno(MR_trace_node_store,
 					(MR_Word) node,
-					(MR_Word *) &seqno))
+					(MR_Integer *) &seqno))
 		{
 			MR_fatal_error("MR_trace_node_seqno: "
 				"not an interface event");

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