[m-rev.] diff: fixes for naming changes in .NET backend

Tyson Dowd trd at cs.mu.OZ.AU
Mon May 14 22:47:31 AEST 2001


Hi,

This diff is enough to get hello world working again on the .NET backend.

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


Estimated hours taken: 3
Branches: main


Fix bugs with naming changes recently made to the .NET backend.

We are now generating modulename__cpp_code classes instead of
modulename__c_code, but not all parts of the .NET backend and the
runtime/library had been updated.

We are also generating simpler mangling for method names, but some of
the hard-coded references to method names needed to be updated. 

compiler/mlds_to_il.m:
compiler/mlds_to_mcpp.m:
	Use __cpp_code where required.
	Rename generate_method_m_code as generate_method_mcpp_code.

library/Mmakefile:
	Copy the runtime DLLs to the current directory, this is required
	so that you can install into the global assembly cache  using
	gacutil.

library/array.m:
library/builtin.m:
library/private_builtin.m:
library/std_util.m:
runtime/mercury_il.il:
	Use __cpp_code where required, update to use new mangling
	convention.


Index: compiler/mlds_to_il.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/mlds_to_il.m,v
retrieving revision 1.26
diff -u -r1.26 mlds_to_il.m
--- compiler/mlds_to_il.m	2001/05/10 15:07:59	1.26
+++ compiler/mlds_to_il.m	2001/05/14 12:23:22
@@ -2100,7 +2100,7 @@
 	% If an mlds__var is not an argument or a local, what is it?
 	% We assume the given variable is a handwritten RTTI reference or a
 	% reference to some hand-written code in the
-	% modulename__c_code class.  This is OK so long as the
+	% modulename__cpp_code class.  This is OK so long as the
 	% code generator uses real 'field' lvals to reference
 	% fields in the modulename class.
 
@@ -2178,7 +2178,7 @@
 			)
 		)		  
 	->
-		string__append(LibModuleName0, "__c_code",
+		string__append(LibModuleName0, "__cpp_code",
 			LibModuleName),
 		ModuleName = mercury_module_name_to_mlds(
 			qualified(unqualified("mercury"), LibModuleName))
@@ -2834,7 +2834,7 @@
 :- func runtime_init_module_name = ilds__class_name.
 runtime_init_module_name = 
 	structured_name("mercury",
-		["mercury", "private_builtin__c_code", "mercury_code"]).
+		["mercury", "private_builtin__cpp_code", "mercury_code"]).
 
 :- func runtime_init_method_name = ilds__member_name.
 runtime_init_method_name = id("init_runtime").
Index: compiler/mlds_to_mcpp.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/mlds_to_mcpp.m,v
retrieving revision 1.3
diff -u -r1.3 mlds_to_mcpp.m
--- compiler/mlds_to_mcpp.m	2001/05/08 17:38:03	1.3
+++ compiler/mlds_to_mcpp.m	2001/05/14 12:23:22
@@ -118,7 +118,7 @@
 
 	{ Namespace0 = get_class_namespace(ClassName) },
 	{ list__reverse(Namespace0) = [Head | Tail] ->
-		Namespace = list__reverse([Head ++ "__c_code" | Tail])
+		Namespace = list__reverse([Head ++ "__cpp_code" | Tail])
 	;
 		Namespace = Namespace0
 	},
@@ -143,7 +143,7 @@
 
 		% Output the contents of foreign_proc declarations. 
 		% Put each one inside a method.
-	list__foldl(generate_method_c_code(
+	list__foldl(generate_method_mcpp_code(
 		mercury_module_name_to_mlds(ModuleName)), Defns),
 
 	io__write_string("};\n"),
@@ -198,15 +198,15 @@
 			)					
 	)).
 
-:- pred generate_method_c_code(mlds_module_name, mlds__defn,
+:- pred generate_method_mcpp_code(mlds_module_name, mlds__defn,
 		io__state, io__state).
-:- mode generate_method_c_code(in, in, di, uo) is det.
+:- mode generate_method_mcpp_code(in, in, di, uo) is det.
 
 	% XXX we don't handle export
-generate_method_c_code(_, defn(export(_), _, _, _)) --> [].
-generate_method_c_code(_, defn(data(_), _, _, _)) --> [].
-generate_method_c_code(_, defn(type(_, _), _, _, _)) --> [].
-generate_method_c_code(ModuleName, 
+generate_method_mcpp_code(_, defn(export(_), _, _, _)) --> [].
+generate_method_mcpp_code(_, defn(data(_), _, _, _)) --> [].
+generate_method_mcpp_code(_, defn(type(_, _), _, _, _)) --> [].
+generate_method_mcpp_code(ModuleName, 
 		defn(function(PredLabel, ProcId, MaybeSeqNum, _PredId), 
 	_Context, _DeclFlags, Entity)) -->
 	( 
Index: library/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/library/Mmakefile,v
retrieving revision 1.63
diff -u -r1.63 Mmakefile
--- library/Mmakefile	2001/05/12 05:03:39	1.63
+++ library/Mmakefile	2001/05/14 12:23:08
@@ -260,6 +260,7 @@
 	cat $(library.ils) > mercury_all.il	
 
 mercury.dll: $(HACK_ALL_DLLS) mercury_all.dll library_strong_name.sn
+	cp $(RUNTIME_DLLS) .
 	$(MS_AL) -v:0.0.0.0 -keyf:library_strong_name.sn -out:mercury.dll $(HACK_ALL_DLLS)
 
 
Index: library/array.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/array.m,v
retrieving revision 1.90
diff -u -r1.90 array.m
--- library/array.m	2001/05/02 16:34:38	1.90
+++ library/array.m	2001/05/14 12:23:08
@@ -533,7 +533,7 @@
     static int
     do_unify__array_1_0(MR_Word type_info, MR_Box x, MR_Box y)
     {
-            return mercury::array__c_code::mercury_code::__Unify____array_1_0(
+            return mercury::array__cpp_code::mercury_code::__Unify____array_1_0(
                     type_info, 
                     dynamic_cast<MR_Array>(x),
                     dynamic_cast<MR_Array>(y));
@@ -543,7 +543,7 @@
     do_compare__array_1_0(
             MR_Word type_info, MR_Word_Ref result, MR_Box x, MR_Box y)
     {
-            mercury::array__c_code::mercury_code::__Compare____array_1_0(
+            mercury::array__cpp_code::mercury_code::__Compare____array_1_0(
                     type_info, result, 
                     dynamic_cast<MR_Array>(x),
                     dynamic_cast<MR_Array>(y));
Index: library/builtin.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/builtin.m,v
retrieving revision 1.53
diff -u -r1.53 builtin.m
--- library/builtin.m	2001/05/02 16:34:39	1.53
+++ library/builtin.m	2001/05/14 12:23:08
@@ -422,7 +422,7 @@
 
 :- pragma foreign_code("MC++", "
 
-static void compare_3_p_0(MR_TypeInfo TypeInfo_for_T, MR_Word_Ref Res, 
+static void compare_3(MR_TypeInfo TypeInfo_for_T, MR_Word_Ref Res, 
 		MR_Box X, MR_Box Y) 
 {
 
@@ -503,25 +503,25 @@
 	}
 }
 
-void compare_3_p_1(MR_TypeInfo TypeInfo_for_T, MR_Word_Ref Res, 
+void compare_3_m1(MR_TypeInfo TypeInfo_for_T, MR_Word_Ref Res, 
 		MR_Box X, MR_Box Y) 
 {
-	compare_3_p_0(TypeInfo_for_T, Res, X, Y);
+	compare_3(TypeInfo_for_T, Res, X, Y);
 }
 
-void compare_3_p_2(MR_TypeInfo TypeInfo_for_T, MR_Word_Ref Res, 
+void compare_3_m2(MR_TypeInfo TypeInfo_for_T, MR_Word_Ref Res, 
 		MR_Box X, MR_Box Y) 
 {
-	compare_3_p_0(TypeInfo_for_T, Res, X, Y);
+	compare_3(TypeInfo_for_T, Res, X, Y);
 }
 
-void compare_3_p_3(MR_TypeInfo TypeInfo_for_T, MR_Word_Ref Res, 
+void compare_3_m3(MR_TypeInfo TypeInfo_for_T, MR_Word_Ref Res, 
 		MR_Box X, MR_Box Y) 
 {
-	compare_3_p_0(TypeInfo_for_T, Res, X, Y);
+	compare_3(TypeInfo_for_T, Res, X, Y);
 }
 
-void copy_2_p_0(MR_TypeInfo TypeInfo_for_T,
+void copy_2(MR_TypeInfo TypeInfo_for_T,
 		MR_Box X, MR_Ref(MR_Box) Y) 
 {
 	// XXX this needs to be implemented -- just using Clone() won't work
@@ -529,10 +529,10 @@
 	mercury::runtime::Errors::SORRY(""foreign code for this function"");
 }
 
-void copy_2_p_1(MR_TypeInfo TypeInfo_for_T,
+void copy_2_m1(MR_TypeInfo TypeInfo_for_T,
 		MR_Box X, MR_Ref(MR_Box) Y) 
 {
-	copy_2_p_0(TypeInfo_for_T, X, Y);
+	copy_2(TypeInfo_for_T, X, Y);
 }
 
 ").
@@ -785,7 +785,7 @@
 static int
 do_unify__int_0_0(MR_Box x, MR_Box y)
 {
-	return mercury::builtin__c_code::mercury_code::__Unify____int_0_0(
+	return mercury::builtin__cpp_code::mercury_code::__Unify____int_0_0(
 		mercury::runtime::Convert::ToInt32(x), 
 		mercury::runtime::Convert::ToInt32(y)); 
 }
@@ -793,7 +793,7 @@
 static int
 do_unify__string_0_0(MR_Box x, MR_Box y)
 {
-	return mercury::builtin__c_code::mercury_code::__Unify____string_0_0(
+	return mercury::builtin__cpp_code::mercury_code::__Unify____string_0_0(
 		dynamic_cast<MR_String>(x), 
 		dynamic_cast<MR_String>(y));
 }
@@ -801,7 +801,7 @@
 static int
 do_unify__float_0_0(MR_Box x, MR_Box y)
 {
-	return mercury::builtin__c_code::mercury_code::__Unify____float_0_0(
+	return mercury::builtin__cpp_code::mercury_code::__Unify____float_0_0(
 		mercury::runtime::Convert::ToDouble(x),
 		mercury::runtime::Convert::ToDouble(y));
 }
@@ -809,7 +809,7 @@
 static int
 do_unify__character_0_0(MR_Box x, MR_Box y)
 {
-	return mercury::builtin__c_code::mercury_code::__Unify____character_0_0(
+	return mercury::builtin__cpp_code::mercury_code::__Unify____character_0_0(
 		mercury::runtime::Convert::ToChar(x),
 		mercury::runtime::Convert::ToChar(y));
 }
@@ -825,7 +825,7 @@
 static int
 do_unify__c_pointer_0_0(MR_Box x, MR_Box y)
 {
-	return mercury::builtin__c_code::mercury_code::__Unify____c_pointer_0_0(
+	return mercury::builtin__cpp_code::mercury_code::__Unify____c_pointer_0_0(
 		dynamic_cast<MR_Word>(x), 
 		dynamic_cast<MR_Word>(y)); 
 }
@@ -854,7 +854,7 @@
 static void
 do_compare__int_0_0(MR_Word_Ref result, MR_Box x, MR_Box y)
 {
-	mercury::builtin__c_code::mercury_code::__Compare____int_0_0(result,
+	mercury::builtin__cpp_code::mercury_code::__Compare____int_0_0(result,
 		mercury::runtime::Convert::ToInt32(x),
 		mercury::runtime::Convert::ToInt32(y));
 }
@@ -862,7 +862,7 @@
 static void
 do_compare__string_0_0(MR_Word_Ref result, MR_Box x, MR_Box y)
 {
-	mercury::builtin__c_code::mercury_code::__Compare____string_0_0(result,
+	mercury::builtin__cpp_code::mercury_code::__Compare____string_0_0(result,
 		dynamic_cast<MR_String>(x),
 		dynamic_cast<MR_String>(y));
 }
@@ -870,7 +870,7 @@
 static void
 do_compare__float_0_0(MR_Word_Ref result, MR_Box x, MR_Box y)
 {
-	mercury::builtin__c_code::mercury_code::__Compare____float_0_0(result,
+	mercury::builtin__cpp_code::mercury_code::__Compare____float_0_0(result,
 		mercury::runtime::Convert::ToDouble(x),
 		mercury::runtime::Convert::ToDouble(y));
 }
@@ -879,7 +879,7 @@
 do_compare__character_0_0(
 	MR_Word_Ref result, MR_Box x, MR_Box y)
 {
-	mercury::builtin__c_code::mercury_code::__Compare____character_0_0(
+	mercury::builtin__cpp_code::mercury_code::__Compare____character_0_0(
 		result, 
 		mercury::runtime::Convert::ToChar(x),
 		mercury::runtime::Convert::ToChar(y));
@@ -896,7 +896,7 @@
 do_compare__c_pointer_0_0(
 	MR_Word_Ref result, MR_Box x, MR_Box y)
 {
-	mercury::builtin__c_code::mercury_code::__Compare____c_pointer_0_0(
+	mercury::builtin__cpp_code::mercury_code::__Compare____c_pointer_0_0(
 		result, 
 		dynamic_cast<MR_Word>(x),
 		dynamic_cast<MR_Word>(y));
Index: library/private_builtin.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/private_builtin.m,v
retrieving revision 1.73
diff -u -r1.73 private_builtin.m
--- library/private_builtin.m	2001/05/02 16:34:40	1.73
+++ library/private_builtin.m	2001/05/14 12:23:08
@@ -643,7 +643,7 @@
 do_unify__type_ctor_info_1_0(
 	MR_Word type_info, MR_Box x, MR_Box y)
 {
-	return mercury::private_builtin__c_code::mercury_code::__Unify____type_ctor_info_1_0(
+	return mercury::private_builtin__cpp_code::mercury_code::__Unify____type_ctor_info_1_0(
 		type_info, 
 		dynamic_cast<MR_Word>(x),
 		dynamic_cast<MR_Word>(y));
@@ -653,7 +653,7 @@
 do_unify__type_info_1_0(
 	MR_Word type_info, MR_Box x, MR_Box y)
 {
-	return mercury::private_builtin__c_code::mercury_code::__Unify____type_info_1_0(
+	return mercury::private_builtin__cpp_code::mercury_code::__Unify____type_info_1_0(
 		type_info,
 		dynamic_cast<MR_Word>(x),
 		dynamic_cast<MR_Word>(y));
@@ -663,7 +663,7 @@
 do_unify__typeclass_info_1_0(
 	MR_Word type_info, MR_Box x, MR_Box y)
 {
-	return mercury::private_builtin__c_code::mercury_code::__Unify____typeclass_info_1_0(
+	return mercury::private_builtin__cpp_code::mercury_code::__Unify____typeclass_info_1_0(
 		type_info, 
 		dynamic_cast<MR_Word>(x),
 		dynamic_cast<MR_Word>(y));
@@ -674,7 +674,7 @@
 	MR_Word type_info, MR_Box x, MR_Box y)
 {
 	return
-	mercury::private_builtin__c_code::mercury_code::__Unify____base_typeclass_info_1_0(
+	mercury::private_builtin__cpp_code::mercury_code::__Unify____base_typeclass_info_1_0(
 		type_info,
 		dynamic_cast<MR_Word>(x),
 		dynamic_cast<MR_Word>(y));
@@ -684,7 +684,7 @@
 do_compare__type_ctor_info_1_0(
 	MR_Word type_info, MR_Word_Ref result, MR_Box x, MR_Box y)
 {
-	mercury::private_builtin__c_code::mercury_code::__Compare____type_ctor_info_1_0(
+	mercury::private_builtin__cpp_code::mercury_code::__Compare____type_ctor_info_1_0(
 		type_info, result, 
 		dynamic_cast<MR_Word>(x),
 		dynamic_cast<MR_Word>(y));
@@ -694,7 +694,7 @@
 do_compare__type_info_1_0(
 	MR_Word type_info, MR_Word_Ref result, MR_Box x, MR_Box y)
 {
-	mercury::private_builtin__c_code::mercury_code::__Compare____type_info_1_0(
+	mercury::private_builtin__cpp_code::mercury_code::__Compare____type_info_1_0(
 		type_info, result,
 		dynamic_cast<MR_Word>(x),
 		dynamic_cast<MR_Word>(y));
@@ -704,7 +704,7 @@
 do_compare__typeclass_info_1_0(
 	MR_Word type_info, MR_Word_Ref result, MR_Box x, MR_Box y)
 {
-	mercury::private_builtin__c_code::mercury_code::__Compare____typeclass_info_1_0(
+	mercury::private_builtin__cpp_code::mercury_code::__Compare____typeclass_info_1_0(
 		type_info, result,
 		dynamic_cast<MR_Word>(x),
 		dynamic_cast<MR_Word>(y));
@@ -714,7 +714,7 @@
 do_compare__base_typeclass_info_1_0(
 	MR_Word type_info, MR_Word_Ref result, MR_Box x, MR_Box y)
 {
-	mercury::private_builtin__c_code::mercury_code::__Compare____base_typeclass_info_1_0(
+	mercury::private_builtin__cpp_code::mercury_code::__Compare____base_typeclass_info_1_0(
 		type_info, result,
 		dynamic_cast<MR_Word>(x),
 		dynamic_cast<MR_Word>(y));
Index: library/std_util.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/std_util.m,v
retrieving revision 1.228
diff -u -r1.228 std_util.m
--- library/std_util.m	2001/05/02 16:34:41	1.228
+++ library/std_util.m	2001/05/14 12:23:08
@@ -1343,7 +1343,7 @@
 static int
 do_unify__type_desc_0_0(MR_Box x, MR_Box y)
 {
-    return mercury::std_util__c_code::mercury_code::__Unify____type_desc_0_0(
+    return mercury::std_util__cpp_code::mercury_code::__Unify____type_desc_0_0(
 	    dynamic_cast<MR_Word>(x),
 	    dynamic_cast<MR_Word>(y));
 }
@@ -1352,7 +1352,7 @@
 do_compare__type_desc_0_0(
     MR_Word_Ref result, MR_Box x, MR_Box y)
 {
-    mercury::std_util__c_code::mercury_code::__Compare____type_desc_0_0(
+    mercury::std_util__cpp_code::mercury_code::__Compare____type_desc_0_0(
 	    result,
 	    dynamic_cast<MR_Word>(x),
 	    dynamic_cast<MR_Word>(y));
Index: runtime/mercury_il.il
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_il.il,v
retrieving revision 1.7
diff -u -r1.7 mercury_il.il
--- runtime/mercury_il.il	2001/05/02 16:39:33	1.7
+++ runtime/mercury_il.il	2001/05/14 12:23:08
@@ -46,7 +46,7 @@
 
 .method static default int32 
 get_ftn_ptr_typeclass_info_compare() {
-	ldftn void ['mercury'] 'mercury'.'private_builtin__c_code'.'mercury_code'::
+	ldftn void ['mercury'] 'mercury'.'private_builtin__cpp_code'.'mercury_code'::
 	do_compare__typeclass_info_1_0(
 		class [mscorlib]System.Object[], class [mscorlib]System.Object[]&,
 		class [mscorlib]System.Object, class [mscorlib]System.Object)
@@ -55,7 +55,7 @@
 
 .method static default int32 
 get_ftn_ptr_typeclass_info_unify() {
-	ldftn int32 ['mercury'] 'mercury'.'private_builtin__c_code'.'mercury_code'::
+	ldftn int32 ['mercury'] 'mercury'.'private_builtin__cpp_code'.'mercury_code'::
 	do_unify__typeclass_info_1_0(
 		class [mscorlib]System.Object[], class [mscorlib]System.Object,
 		class [mscorlib]System.Object)
@@ -64,7 +64,7 @@
 
 .method static default int32 
 get_ftn_ptr_base_typeclass_info_compare() {
-	ldftn void ['mercury'] 'mercury'.'private_builtin__c_code'.'mercury_code'::
+	ldftn void ['mercury'] 'mercury'.'private_builtin__cpp_code'.'mercury_code'::
 	do_compare__base_typeclass_info_1_0(
 		class [mscorlib]System.Object[], class [mscorlib]System.Object[]&,
 		class [mscorlib]System.Object, class [mscorlib]System.Object)
@@ -73,7 +73,7 @@
 
 .method static default int32 
 get_ftn_ptr_base_typeclass_info_unify() {
-	ldftn int32 ['mercury'] 'mercury'.'private_builtin__c_code'.'mercury_code'::
+	ldftn int32 ['mercury'] 'mercury'.'private_builtin__cpp_code'.'mercury_code'::
 	do_unify__base_typeclass_info_1_0(
 		class [mscorlib]System.Object[], class [mscorlib]System.Object,
 		class [mscorlib]System.Object)
@@ -82,7 +82,7 @@
 
 .method static default int32 
 get_ftn_ptr_type_info_compare() {
-	ldftn void ['mercury'] 'mercury'.'private_builtin__c_code'.'mercury_code'::
+	ldftn void ['mercury'] 'mercury'.'private_builtin__cpp_code'.'mercury_code'::
 	do_compare__type_info_1_0(
 		class [mscorlib]System.Object[], class [mscorlib]System.Object[]&,
 		class [mscorlib]System.Object, class [mscorlib]System.Object)
@@ -91,7 +91,7 @@
 
 .method static default int32 
 get_ftn_ptr_type_info_unify() {
-	ldftn int32 ['mercury'] 'mercury'.'private_builtin__c_code'.'mercury_code'::
+	ldftn int32 ['mercury'] 'mercury'.'private_builtin__cpp_code'.'mercury_code'::
 	do_unify__type_info_1_0(
 		class [mscorlib]System.Object[], class [mscorlib]System.Object,
 		class [mscorlib]System.Object)
@@ -100,7 +100,7 @@
 
 .method static default int32 
 get_ftn_ptr_type_ctor_info_compare() {
-	ldftn void ['mercury'] 'mercury'.'private_builtin__c_code'.'mercury_code'::
+	ldftn void ['mercury'] 'mercury'.'private_builtin__cpp_code'.'mercury_code'::
 	do_compare__type_ctor_info_1_0(
 		class [mscorlib]System.Object[], class [mscorlib]System.Object[]&,
 		class [mscorlib]System.Object, class [mscorlib]System.Object)
@@ -109,7 +109,7 @@
 
 .method static default int32 
 get_ftn_ptr_type_ctor_info_unify() {
-	ldftn int32 ['mercury'] 'mercury'.'private_builtin__c_code'.'mercury_code'::
+	ldftn int32 ['mercury'] 'mercury'.'private_builtin__cpp_code'.'mercury_code'::
 	do_unify__type_ctor_info_1_0(
 		class [mscorlib]System.Object[], class [mscorlib]System.Object,
 		class [mscorlib]System.Object)
@@ -118,7 +118,7 @@
 
 .method static default int32 
 get_ftn_ptr_pred_compare() {
-	ldftn void ['mercury'] 'mercury'.'builtin__c_code'.'mercury_code'::
+	ldftn void ['mercury'] 'mercury'.'builtin__cpp_code'.'mercury_code'::
 	do_compare__pred_0_0(
 		class [mscorlib]System.Object[]&,
 		class [mscorlib]System.Object, class [mscorlib]System.Object)
@@ -127,7 +127,7 @@
 
 .method static default int32 
 get_ftn_ptr_pred_unify() {
-	ldftn int32 ['mercury'] 'mercury'.'builtin__c_code'.'mercury_code'::
+	ldftn int32 ['mercury'] 'mercury'.'builtin__cpp_code'.'mercury_code'::
 	do_unify__pred_0_0(
 		class [mscorlib]System.Object, class [mscorlib]System.Object)
 	ret
@@ -135,7 +135,7 @@
 
 .method static default int32 
 get_ftn_ptr_func_compare() {
-	ldftn void ['mercury'] 'mercury'.'builtin__c_code'.'mercury_code'::
+	ldftn void ['mercury'] 'mercury'.'builtin__cpp_code'.'mercury_code'::
 	do_compare__func_0_0(
 		class [mscorlib]System.Object[]&,
 		class [mscorlib]System.Object, class [mscorlib]System.Object)
@@ -144,7 +144,7 @@
 
 .method static default int32 
 get_ftn_ptr_func_unify() {
-	ldftn int32 ['mercury'] 'mercury'.'builtin__c_code'.'mercury_code'::
+	ldftn int32 ['mercury'] 'mercury'.'builtin__cpp_code'.'mercury_code'::
 	do_unify__func_0_0(
 		class [mscorlib]System.Object, class [mscorlib]System.Object)
 	ret
@@ -152,7 +152,7 @@
 
 .method static default int32 
 get_ftn_ptr_float_compare() {
-	ldftn void ['mercury'] 'mercury'.'builtin__c_code'.'mercury_code'::
+	ldftn void ['mercury'] 'mercury'.'builtin__cpp_code'.'mercury_code'::
 	do_compare__float_0_0(
 		class [mscorlib]System.Object[]&,
 		class [mscorlib]System.Object, class [mscorlib]System.Object)
@@ -160,7 +160,7 @@
 }
 .method static default int32 
 get_ftn_ptr_float_unify() {
-	ldftn int32 ['mercury'] 'mercury'.'builtin__c_code'.'mercury_code'::
+	ldftn int32 ['mercury'] 'mercury'.'builtin__cpp_code'.'mercury_code'::
 	do_unify__float_0_0(
 		class [mscorlib]System.Object, class [mscorlib]System.Object)
 	ret
@@ -168,7 +168,7 @@
 
 .method static default int32 
 get_ftn_ptr_void_compare() {
-	ldftn void ['mercury'] 'mercury'.'builtin__c_code'.'mercury_code'::
+	ldftn void ['mercury'] 'mercury'.'builtin__cpp_code'.'mercury_code'::
 	do_compare__void_0_0(
 		class [mscorlib]System.Object[]&,
 		class [mscorlib]System.Object, class [mscorlib]System.Object)
@@ -176,7 +176,7 @@
 }
 .method static default int32 
 get_ftn_ptr_void_unify() {
-	ldftn int32 ['mercury'] 'mercury'.'builtin__c_code'.'mercury_code'::
+	ldftn int32 ['mercury'] 'mercury'.'builtin__cpp_code'.'mercury_code'::
 	do_unify__void_0_0(
 		class [mscorlib]System.Object, class [mscorlib]System.Object)
 	ret
@@ -184,7 +184,7 @@
 
 .method static default int32 
 get_ftn_ptr_c_pointer_compare() {
-	ldftn void ['mercury'] 'mercury'.'builtin__c_code'.'mercury_code'::
+	ldftn void ['mercury'] 'mercury'.'builtin__cpp_code'.'mercury_code'::
 	do_compare__c_pointer_0_0(
 		class [mscorlib]System.Object[]&,
 		class [mscorlib]System.Object, class [mscorlib]System.Object)
@@ -193,7 +193,7 @@
 
 .method static default int32 
 get_ftn_ptr_c_pointer_unify() {
-	ldftn int32 ['mercury'] 'mercury'.'builtin__c_code'.'mercury_code'::
+	ldftn int32 ['mercury'] 'mercury'.'builtin__cpp_code'.'mercury_code'::
 	do_unify__c_pointer_0_0(
 		class [mscorlib]System.Object, class [mscorlib]System.Object)
 	ret
@@ -201,7 +201,7 @@
 
 .method static default int32 
 get_ftn_ptr_string_compare() {
-	ldftn void ['mercury'] 'mercury'.'builtin__c_code'.'mercury_code'::
+	ldftn void ['mercury'] 'mercury'.'builtin__cpp_code'.'mercury_code'::
 	do_compare__string_0_0(
 		class [mscorlib]System.Object[]&,
 		class [mscorlib]System.Object, class [mscorlib]System.Object)
@@ -210,7 +210,7 @@
 
 .method static default int32 
 get_ftn_ptr_string_unify() {
-	ldftn int32 ['mercury'] 'mercury'.'builtin__c_code'.'mercury_code'::
+	ldftn int32 ['mercury'] 'mercury'.'builtin__cpp_code'.'mercury_code'::
 	do_unify__string_0_0(
 		class [mscorlib]System.Object, class [mscorlib]System.Object)
 	ret
@@ -218,7 +218,7 @@
 
 .method static default int32 
 get_ftn_ptr_character_compare() {
-	ldftn void ['mercury'] 'mercury'.'builtin__c_code'.'mercury_code'::
+	ldftn void ['mercury'] 'mercury'.'builtin__cpp_code'.'mercury_code'::
 	do_compare__character_0_0(
 		class [mscorlib]System.Object[]&,
 		class [mscorlib]System.Object, class [mscorlib]System.Object)
@@ -227,7 +227,7 @@
 
 .method static default int32 
 get_ftn_ptr_character_unify() {
-	ldftn int32 ['mercury'] 'mercury'.'builtin__c_code'.'mercury_code'::
+	ldftn int32 ['mercury'] 'mercury'.'builtin__cpp_code'.'mercury_code'::
 	do_unify__character_0_0(
 		class [mscorlib]System.Object, class [mscorlib]System.Object)
 	ret
@@ -235,7 +235,7 @@
 
 .method static default int32 
 get_ftn_ptr_int_compare() {
-	ldftn void ['mercury'] 'mercury'.'builtin__c_code'.'mercury_code'::
+	ldftn void ['mercury'] 'mercury'.'builtin__cpp_code'.'mercury_code'::
 	do_compare__int_0_0(
 		class [mscorlib]System.Object[]&,
 		class [mscorlib]System.Object, class [mscorlib]System.Object)
@@ -244,7 +244,7 @@
 
 .method static default int32 
 get_ftn_ptr_int_unify() {
-	ldftn int32 ['mercury'] 'mercury'.'builtin__c_code'.'mercury_code'::
+	ldftn int32 ['mercury'] 'mercury'.'builtin__cpp_code'.'mercury_code'::
 	do_unify__int_0_0(
 		class [mscorlib]System.Object, class [mscorlib]System.Object)
 	ret
@@ -252,7 +252,7 @@
 
 .method static default int32 
 get_ftn_ptr_array_compare() {
-	ldftn void ['mercury'] 'mercury'.'array__c_code'.'mercury_code'::
+	ldftn void ['mercury'] 'mercury'.'array__cpp_code'.'mercury_code'::
 	do_compare__array_1_0(
 		class [mscorlib]System.Object[], class [mscorlib]System.Object[]&,
 		class [mscorlib]System.Object, class [mscorlib]System.Object)
@@ -261,7 +261,7 @@
 
 .method static default int32 
 get_ftn_ptr_array_unify() {
-	ldftn int32 ['mercury'] 'mercury'.'array__c_code'.'mercury_code'::
+	ldftn int32 ['mercury'] 'mercury'.'array__cpp_code'.'mercury_code'::
 	do_unify__array_1_0(
 		class [mscorlib]System.Object[], class [mscorlib]System.Object,
 		class [mscorlib]System.Object)
@@ -270,7 +270,7 @@
 
 .method static default int32 
 get_ftn_ptr_type_desc_compare() {
-	ldftn void ['mercury'] 'mercury'.'std_util__c_code'.'mercury_code'::
+	ldftn void ['mercury'] 'mercury'.'std_util__cpp_code'.'mercury_code'::
 	do_compare__type_desc_0_0(
 		class [mscorlib]System.Object[]&,
 		class [mscorlib]System.Object, class [mscorlib]System.Object)
@@ -279,7 +279,7 @@
 
 .method static default int32 
 get_ftn_ptr_type_desc_unify() {
-	ldftn int32 ['mercury'] 'mercury'.'std_util__c_code'.'mercury_code'::
+	ldftn int32 ['mercury'] 'mercury'.'std_util__cpp_code'.'mercury_code'::
 	do_unify__type_desc_0_0(
 		class [mscorlib]System.Object, class [mscorlib]System.Object)
 	ret
@@ -287,7 +287,7 @@
 
 .method static default int32 
 get_ftn_ptr_univ_compare() {
-	ldftn void ['mercury'] 'mercury'.'std_util__c_code'.'mercury_code'::
+	ldftn void ['mercury'] 'mercury'.'std_util__cpp_code'.'mercury_code'::
 	do_compare__univ_0_0(
 		class [mscorlib]System.Object[]&,
 		class [mscorlib]System.Object, class [mscorlib]System.Object)
@@ -296,7 +296,7 @@
 
 .method static default int32 
 get_ftn_ptr_univ_unify() {
-	ldftn int32 ['mercury'] 'mercury'.'std_util__c_code'.'mercury_code'::
+	ldftn int32 ['mercury'] 'mercury'.'std_util__cpp_code'.'mercury_code'::
 	do_unify__univ_0_0(
 		class [mscorlib]System.Object, class [mscorlib]System.Object)
 	ret
@@ -571,7 +571,7 @@
 
 .class public 'Init' {
     .method static default void init_runtime() {
-        call void ['mercury']mercury.io.mercury_code::init_state_2_p_0()
+        call void ['mercury']mercury.io.mercury_code::init_state_2()
 	ret
     }
 }


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



More information about the reviews mailing list