[m-rev.] diff: use MR_Bool instead of bool.

[Tyson Dowd]

Hi,


===================================================================


Estimated hours taken: 1
Branches: main, dotnet-foreign

compiler/ml_code_gen.m:
	Generate foreign language code using MR_Bool instead of bool.
	MC++ doesn't like us using "bool" (not if we want to use the
	namespace "bool" as well, anyway).  And we should use the
	typedef in mercury_types.h instead anyway.



Index: compiler/ml_code_gen.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/ml_code_gen.m,v
retrieving revision 1.84
diff -u -r1.84 ml_code_gen.m
--- compiler/ml_code_gen.m	2001/05/02 15:16:06	1.84
+++ compiler/ml_code_gen.m	2001/05/08 13:16:58
@@ -2076,8 +2076,8 @@
 	%		struct {
 	%			<user's local_vars decls>
 	%		} MR_locals;
-	%		bool MR_done = FALSE;
-	%		bool MR_succeeded = FALSE;
+	%		MR_Bool MR_done = FALSE;
+	%		MR_Bool MR_succeeded = FALSE;
 	%
 	%		#define FAIL		(MR_done = TRUE)
 	%		#define SUCCEED		(MR_succeeded = TRUE)
@@ -2191,8 +2191,8 @@
 			user_target_code(LocalVarsDecls, LocalVarsContext),
 			raw_target_code("\n"),
 			raw_target_code("\t} MR_locals;\n"),
-			raw_target_code("\tbool MR_succeeded = FALSE;\n"),
-			raw_target_code("\tbool MR_done = FALSE;\n"),
+			raw_target_code("\tMR_Bool MR_succeeded = FALSE;\n"),
+			raw_target_code("\tMR_Bool MR_done = FALSE;\n"),
 			raw_target_code("\n"),
 			raw_target_code(HashDefines),
 			raw_target_code("\n")],
@@ -2351,7 +2351,7 @@
 	% 	<declaration of locals needed for boxing/unboxing>
 	%	{
 	% 		<declaration of one local variable for each arg>
-	%		bool SUCCESS_INDICATOR;
+	%		MR_Bool SUCCESS_INDICATOR;
 	%
 	%		<assign input args>
 	%		<obtain global lock>
@@ -2446,7 +2446,7 @@
 			[raw_target_code("{\n")],
 			HashDefine,
 			ArgDeclsList,
-			[raw_target_code("\tbool SUCCESS_INDICATOR;\n"),
+			[raw_target_code("\tMR_Bool SUCCESS_INDICATOR;\n"),
 			raw_target_code("\n")],
 			AssignInputsList,
 			[raw_target_code(ObtainLock),


-- 
       Tyson Dowd           # 
                            #  Surreal humour isn't everyone's cup of fur.
     trd at cs.mu.oz.au        # 
http://www.cs.mu.oz.au/~trd #
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------