mercurylang/mercury
1
0
Fork 0
mirror of https://github.com/Mercury-Language/mercury.git synced 2025-12-17 14:57:03 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Estimated hours taken: 0.5
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.
This commit is contained in:
Fergus Henderson
2003-08-05 08:26:56 +00:00
parent 4cfa64dea3
commit 16fb0893c7
2 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
runtime/mercury_type_info.h
View File

@@ -220,27 +220,27 @@ MR_VAR_ARITY_PSEUDOTYPEINFO_STRUCT(MR_PseudoTypeInfo_Almost_Struct,
** for now... ** for now...
*/ */
MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY_ZERO; 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(1)
MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(2); 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(3)
MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(4); 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(5)
MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(6); 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(7)
MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(8); 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(9)
MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(10); 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(11)
MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(12); 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(13)
MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(14); 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(15)
MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(16); 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(17)
MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(18); 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(19)
MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(20); MR_DECLARE_ALL_TYPE_INFO_LIKE_STRUCTS_FOR_ARITY(20)
/* /*
** When converting a MR_PseudoTypeInfo to a MR_TypeInfo, we need the ** When converting a MR_PseudoTypeInfo to a MR_TypeInfo, we need the

12
trace/mercury_trace_declarative.c
View File

@@ -940,7 +940,7 @@ MR_decl_make_atom(const MR_Label_Layout *layout, MR_Word *saved_regs,
{ {
MR_PredFunc pred_or_func; MR_PredFunc pred_or_func;
MR_ConstString name; MR_ConstString name;
MR_Word arity; int arity;
MR_Word atom; MR_Word atom;
int hv; /* any head variable */ int hv; /* any head variable */
int num_added_args; int num_added_args;
@@ -1301,13 +1301,13 @@ MR_decl_diagnosis(MR_Trace_Node root, MR_Trace_Cmd_Info *cmd,
&MR_trace_front_end_state &MR_trace_front_end_state
); );
bug_found = MR_DD_diagnoser_bug_found(response, bug_found = MR_DD_diagnoser_bug_found(response,
(MR_Word *) &bug_event); (MR_Integer *) &bug_event);
symptom_found = MR_DD_diagnoser_symptom_found(response, 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); no_bug_found = MR_DD_diagnoser_no_bug_found(response);
require_subtree = MR_DD_diagnoser_require_subtree(response, require_subtree = MR_DD_diagnoser_require_subtree(response,
(MR_Word *) &final_event, (MR_Integer *) &final_event,
(MR_Word *) &topmost_seqno); (MR_Integer *) &topmost_seqno);
); );
MR_trace_call_seqno = event_details->MR_call_seqno; MR_trace_call_seqno = event_details->MR_call_seqno;
@@ -1430,7 +1430,7 @@ MR_trace_node_seqno(MR_Trace_Node node)
MR_TRACE_CALL_MERCURY( MR_TRACE_CALL_MERCURY(
if (!MR_DD_trace_node_seqno(MR_trace_node_store, if (!MR_DD_trace_node_seqno(MR_trace_node_store,
(MR_Word) node, (MR_Word) node,
(MR_Word *) &seqno)) (MR_Integer *) &seqno))
{ {
MR_fatal_error("MR_trace_node_seqno: " MR_fatal_error("MR_trace_node_seqno: "
"not an interface event"); "not an interface event");