[m-dev.] trivial diff: rename mlds__*_type as mlds__native_*_type

[Fergus Henderson]

Estimated hours taken: 0.25

compiler/mlds.m:
compiler/mlds_to_c.m:
compiler/ml_unify_gen.m:
compiler/ml_code_util.m:
	Rename mlds__int_type, mlds__float_type, etc.
	to mlds__native_int_type, mlds__native_float_type, etc.,
	to make it clearer that these types are for the native
	MLDS types, which may be different from the MLDS types
	used to represent the correspondingly-named Mercury types.

Workspace: /d-drive/home/hg/fjh/mercury
Index: compiler/ml_code_util.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/ml_code_util.m,v
retrieving revision 1.2
diff -u -d -r1.2 ml_code_util.m
--- compiler/ml_code_util.m	1999/12/30 17:00:30	1.2
+++ compiler/ml_code_util.m	2000/02/23 04:22:11
@@ -617,7 +617,7 @@
 ml_gen_params(ModuleInfo, HeadVarNames, HeadTypes, HeadModes, CodeModel) =
 		FuncParams :-
 	( CodeModel = model_semi ->
-		RetTypes = [mlds__bool_type]
+		RetTypes = [mlds__native_bool_type]
 	;
 		RetTypes = []
 	),
@@ -949,7 +949,7 @@
 	% Generate the declaration for the built-in `succeeded' variable.
 	%
 ml_gen_succeeded_var_decl(Context) =
-	ml_gen_mlds_var_decl(var("succeeded"), mlds__bool_type, Context).
+	ml_gen_mlds_var_decl(var("succeeded"), mlds__native_bool_type, Context).
 
 	% Return the lval for the `succeeded' flag.
 	% (`succeeded' is a boolean variable used to record
Index: compiler/ml_unify_gen.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/ml_unify_gen.m,v
retrieving revision 1.2
diff -u -d -r1.2 ml_unify_gen.m
--- compiler/ml_unify_gen.m	1999/12/30 17:00:31	1.2
+++ compiler/ml_unify_gen.m	2000/02/23 04:24:07
@@ -362,7 +362,7 @@
 	% Compute the rval which holds the number of arguments
 	%
 	{ NumArgsRval = const(int_const(NumArgs)) },
-	{ NumArgsType = mlds__int_type },
+	{ NumArgsType = mlds__native_int_type },
 
 	%
 	% the pointer will not be tagged (i.e. the tag will be zero)
@@ -744,7 +744,7 @@
 	%
 	{ MaybeSecondaryTag = yes(SecondaryTag) ->
 		SecondaryTagRval = const(int_const(SecondaryTag)),
-		SecondaryTagType = mlds__int_type,
+		SecondaryTagType = mlds__native_int_type,
 		ArgRvals = [SecondaryTagRval | ArgRvals0],
 		MLDS_ArgTypes = [SecondaryTagType | MLDS_ArgTypes0]
 	;
Index: compiler/mlds.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/mlds.m,v
retrieving revision 1.15
diff -u -d -r1.15 mlds.m
--- compiler/mlds.m	1999/12/03 20:22:45	1.15
+++ compiler/mlds.m	2000/02/23 04:06:29
@@ -469,10 +469,10 @@
 		% These are the builtin types of the MLDS target language,
 		% whatever that may be.
 		% Currently we don't actually use many of these.
-	;	mlds__bool_type
-	;	mlds__int_type
-	;	mlds__float_type
-	;	mlds__char_type
+	;	mlds__native_bool_type
+	;	mlds__native_int_type
+	;	mlds__native_float_type
+	;	mlds__native_char_type
 
 		% MLDS types defined using mlds__class_defn
 	;	mlds__class_type(mlds__class, arity)	% name, arity
Index: compiler/mlds_to_c.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/mlds_to_c.m,v
retrieving revision 1.21
diff -u -d -r1.21 mlds_to_c.m
--- compiler/mlds_to_c.m	1999/12/30 17:00:32	1.21
+++ compiler/mlds_to_c.m	2000/02/23 04:24:49
@@ -783,10 +783,10 @@
 		% so that distinct Mercury types map to distinct C types
 		io__write_string("Word")
 	).
-mlds_output_type(mlds__int_type)   --> io__write_string("int").
-mlds_output_type(mlds__float_type) --> io__write_string("float").
-mlds_output_type(mlds__bool_type)  --> io__write_string("bool").
-mlds_output_type(mlds__char_type)  --> io__write_string("char").
+mlds_output_type(mlds__native_int_type)   --> io__write_string("int").
+mlds_output_type(mlds__native_float_type) --> io__write_string("float").
+mlds_output_type(mlds__native_bool_type)  --> io__write_string("bool").
+mlds_output_type(mlds__native_char_type)  --> io__write_string("char").
 mlds_output_type(mlds__class_type(Name, Arity)) -->
 	io__write_string("struct "),
 	mlds_output_fully_qualified(Name, io__write_string),
@@ -1617,7 +1617,7 @@
 	(
 		{ Type = mlds__mercury_type(term__functor(term__atom("float"),
 				[], _))
-		; Type = mlds__float_type
+		; Type = mlds__native_float_type
 		}
 	->
 		io__write_string("MR_box_float("),
@@ -1636,7 +1636,7 @@
 	(
 		{ Type = mlds__mercury_type(term__functor(term__atom("float"),
 				[], _))
-		; Type = mlds__float_type
+		; Type = mlds__native_float_type
 		}
 	->
 		io__write_string("MR_unbox_float("),
-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>  |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3        |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------