[m-rev.] Diff (needs committing): Make the IL backend compile
Jonathan Morgan
jonmmorgan at gmail.com
Mon May 1 20:19:32 AEST 2006
With this patch (and no inlining in injection) the IL backend compiles
correctly.
Jon
Estimated hours taken: 0.5
Branches: main, release.
Make the IL backend compile successfully.
library/private_builtin.m:
Revert incorrect s/__/. in C# and Java foreign code.
library/rtti_implementation.m:
s/NULL/null in C# foreign code.
Index: library/private_builtin.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/private_builtin.m,v
retrieving revision 1.155
diff -u -u -r1.155 private_builtin.m
--- library/private_builtin.m 19 Apr 2006 05:17:54 -0000 1.155
+++ library/private_builtin.m 1 May 2006 09:53:43 -0000
@@ -488,7 +488,7 @@
public static int MR_FUNCTION = 1;
public static bool
-special.Unify..type_info_1_0(
+special__Unify____type_info_1_0(
object[] type_info, object[] x, object[] y)
{
mercury.runtime.Errors.SORRY(""unify for type_info"");
@@ -496,7 +496,7 @@
}
public static bool
-special.Unify..typeclass_info_1_0(
+special__Unify____typeclass_info_1_0(
object[] type_info, object[] x, object[] y)
{
mercury.runtime.Errors.SORRY(""unify for typeclass_info"");
@@ -504,7 +504,7 @@
}
public static bool
-special.Unify..base_typeclass_info_1_0(
+special__Unify____base_typeclass_info_1_0(
object[] type_info, object[] x, object[] y)
{
mercury.runtime.Errors.SORRY(""unify for base_typeclass_info"");
@@ -512,7 +512,7 @@
}
public static bool
-special.Unify..type_ctor_info_1_0(
+special__Unify____type_ctor_info_1_0(
object[] type_info, object[] x, object[] y)
{
mercury.runtime.Errors.SORRY(""unify for type_ctor_info"");
@@ -520,28 +520,28 @@
}
public static void
-special.Compare..type_ctor_info_1_0(
+special__Compare____type_ctor_info_1_0(
object[] type_info, ref object[] result, object[] x, object[] y)
{
mercury.runtime.Errors.SORRY(""compare for type_ctor_info"");
}
public static void
-special.Compare..type_info_1_0(
+special__Compare____type_info_1_0(
object[] type_info, ref object[] result, object[] x, object[] y)
{
mercury.runtime.Errors.SORRY(""compare for type_info"");
}
public static void
-special.Compare..typeclass_info_1_0(
+special__Compare____typeclass_info_1_0(
object[] type_info, ref object[] result, object[] x, object[] y)
{
mercury.runtime.Errors.SORRY(""compare for typeclass_info"");
}
public static void
-special.Compare..base_typeclass_info_1_0(
+special__Compare____base_typeclass_info_1_0(
object[] type_info, ref object[] result, object[] x, object[] y)
{
mercury.runtime.Errors.SORRY(""compare for base_typeclass_info"");
@@ -1098,7 +1098,7 @@
:- pragma foreign_code("C#", "
public static bool
-special.Unify.private_builtin.heap_pointer_0_0(object[] x, object[] y)
+special__Unify__private_builtin__heap_pointer_0_0(object[] x, object[] y)
{
mercury.runtime.Errors.fatal_error(
""called unify for type `private_builtin:heap_pointer'"");
@@ -1106,7 +1106,7 @@
}
public static void
-special.Compare.private_builtin.heap_pointer_0_0(
+special__Compare__private_builtin__heap_pointer_0_0(
ref object[] result, object[] x, object[] y)
{
mercury.runtime.Errors.fatal_error(
@@ -1114,14 +1114,14 @@
}
public static bool
-special.Unify.private_builtin.ref_1_0(
+special__Unify__private_builtin__ref_1_0(
object[] type_info, object[] x, object[] y)
{
return x == y;
}
public static void
-special.Compare.private_builtin.ref_1_0(
+special__Compare__private_builtin__ref_1_0(
object[] type_info, ref object[] result, object[] x, object[] y)
{
mercury.runtime.Errors.fatal_error(
@@ -1423,7 +1423,7 @@
//
public static boolean
- .Unify..ref_1_0(mercury.runtime.TypeInfo_Struct ti,
+ __Unify____ref_1_0(mercury.runtime.TypeInfo_Struct ti,
mercury.private_builtin.Ref_1 x,
mercury.private_builtin.Ref_1 y)
{
@@ -1433,7 +1433,7 @@
}
public static boolean
- .Unify..heap_pointer_0_0 (mercury.private_builtin.Heap_pointer_0 x,
+ __Unify____heap_pointer_0_0 (mercury.private_builtin.Heap_pointer_0 x,
mercury.private_builtin.Heap_pointer_0 y)
{
// stub only
@@ -1441,7 +1441,7 @@
}
public static boolean
- .Unify..type_ctor_info_1_0(mercury.runtime.TypeInfo_Struct ti,
+ __Unify____type_ctor_info_1_0(mercury.runtime.TypeInfo_Struct ti,
mercury.runtime.TypeCtorInfo_Struct x,
mercury.runtime.TypeCtorInfo_Struct y)
{
@@ -1451,7 +1451,7 @@
}
public static boolean
- .Unify..type_info_1_0(mercury.runtime.TypeInfo_Struct ti,
+ __Unify____type_info_1_0(mercury.runtime.TypeInfo_Struct ti,
mercury.runtime.TypeInfo_Struct x,
mercury.runtime.TypeInfo_Struct y)
{
@@ -1461,7 +1461,7 @@
}
public static boolean
- .Unify..base_typeclass_info_1_0(mercury.runtime.TypeInfo_Struct ti,
+ __Unify____base_typeclass_info_1_0(mercury.runtime.TypeInfo_Struct ti,
java.lang.Object[] x, java.lang.Object[] y)
{
// stub only
@@ -1469,7 +1469,7 @@
}
public static boolean
- .Unify..typeclass_info_1_0(mercury.runtime.TypeInfo_Struct ti,
+ __Unify____typeclass_info_1_0(mercury.runtime.TypeInfo_Struct ti,
java.lang.Object[] x, java.lang.Object[] y)
{
// stub only
@@ -1478,7 +1478,7 @@
}
public static mercury.builtin.Comparison_result_0
- .Compare..ref_1_0(mercury.runtime.TypeInfo_Struct ti,
+ __Compare____ref_1_0(mercury.runtime.TypeInfo_Struct ti,
mercury.private_builtin.Ref_1 x,
mercury.private_builtin.Ref_1 y)
{
@@ -1488,7 +1488,7 @@
}
public static mercury.builtin.Comparison_result_0
- .Compare..heap_pointer_0_0 (mercury.private_builtin.Heap_pointer_0 x,
+ __Compare____heap_pointer_0_0 (mercury.private_builtin.Heap_pointer_0 x,
mercury.private_builtin.Heap_pointer_0 y)
{
// stub only
@@ -1496,7 +1496,7 @@
}
public static mercury.builtin.Comparison_result_0
- .Compare..type_ctor_info_1_0(mercury.runtime.TypeInfo_Struct ti,
+ __Compare____type_ctor_info_1_0(mercury.runtime.TypeInfo_Struct ti,
mercury.runtime.TypeCtorInfo_Struct x,
mercury.runtime.TypeCtorInfo_Struct y)
{
@@ -1506,7 +1506,7 @@
}
public static mercury.builtin.Comparison_result_0
- .Compare..type_info_1_0(mercury.runtime.TypeInfo_Struct ti,
+ __Compare____type_info_1_0(mercury.runtime.TypeInfo_Struct ti,
mercury.runtime.TypeInfo_Struct x,
mercury.runtime.TypeInfo_Struct y)
{
@@ -1516,7 +1516,7 @@
}
public static mercury.builtin.Comparison_result_0
- .Compare..base_typeclass_info_1_0(mercury.runtime.TypeInfo_Struct ti,
+ __Compare____base_typeclass_info_1_0(mercury.runtime.TypeInfo_Struct ti,
java.lang.Object[] x, java.lang.Object[] y)
{
// stub only
@@ -1524,7 +1524,7 @@
}
public static mercury.builtin.Comparison_result_0
- .Compare..typeclass_info_1_0(mercury.runtime.TypeInfo_Struct ti,
+ __Compare____typeclass_info_1_0(mercury.runtime.TypeInfo_Struct ti,
java.lang.Object[] x, java.lang.Object[] y)
{
// stub only
Index: library/rtti_implementation.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/rtti_implementation.m,v
retrieving revision 1.68
diff -u -u -r1.68 rtti_implementation.m
--- library/rtti_implementation.m 19 Apr 2006 05:17:55 -0000 1.68
+++ library/rtti_implementation.m 1 May 2006 09:53:44 -0000
@@ -2246,7 +2246,7 @@
[will_not_call_mercury, promise_pure, thread_safe],
"
// XXX This should be something else.
- TypeInfo_for_P = NULL;
+ TypeInfo_for_P = null;
UnifyPred = TypeCtorInfo[
(int) type_ctor_info_field_nums.type_ctor_compare_pred];
--------------------------------------------------------------------------
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