diff options
Diffstat (limited to '')
| -rw-r--r-- | lang/sml-nj-devel/files/optional-patch-flint-access | 54 |
1 files changed, 52 insertions, 2 deletions
diff --git a/lang/sml-nj-devel/files/optional-patch-flint-access b/lang/sml-nj-devel/files/optional-patch-flint-access index 6ac420fe7406..3119f7e09729 100644 --- a/lang/sml-nj-devel/files/optional-patch-flint-access +++ b/lang/sml-nj-devel/files/optional-patch-flint-access @@ -1,5 +1,27 @@ ---- src/compiler/core.cm.orig Fri Aug 24 19:48:52 2001 -+++ src/compiler/core.cm Thu Aug 30 11:51:20 2001 +--- src/cm/cm-lib.cm.orig Fri Feb 8 21:02:55 2002 ++++ src/cm/cm-lib.cm Thu Feb 28 02:38:24 2002 +@@ -14,6 +14,8 @@ + structure Sharing + signature TOOLS + structure Subst ++ (* required by Backend.Compile.elaborate: *) ++ structure UniquePid + is + $/basis.cm + $/smlnj-lib.cm +--- src/cm/compile/uniquepid.sml.orig Fri Feb 8 21:02:55 2002 ++++ src/cm/compile/uniquepid.sml Thu Feb 28 03:07:33 2002 +@@ -17,7 +17,7 @@ + type triplet = { staticPid: pid, fingerprint: pid, pepper: string } + in + structure UniquePid :> sig +- type info ++ type info = triplet option + val reset : unit -> unit + val getInfo : GeneralParams.info -> SrcPath.file -> info + val uniquepid : info -> pid -> pid * string +--- src/compiler/core.cm.orig Fri Dec 14 22:01:23 2001 ++++ src/compiler/core.cm Thu Feb 28 02:43:48 2002 @@ -81,6 +81,26 @@ signature PICKMOD signature UNPICKMOD @@ -27,3 +49,31 @@ is TopLevel/environ/environ.sig +--- src/system/smlnj/internal/intsys.cm.orig Thu Sep 13 17:19:18 2001 ++++ src/system/smlnj/internal/intsys.cm Thu Feb 28 05:54:57 2002 +@@ -32,7 +32,7 @@ + $smlnj/init/init.cmi : cm + + $/basis.cm +- $smlnj/viscomp/core.cm ++ $smlnj/viscomp/core_flint.cm + + (* need access to CM's "init" function *) + $smlnj/internal/cm0.cm +--- src/system/smlnj/viscomp/core_flint.cm.orig Thu Feb 28 03:06:08 2002 ++++ src/system/smlnj/viscomp/core_flint.cm Thu Feb 28 03:46:52 2002 +@@ -0,0 +1,14 @@ ++(* ++ * Just a quick hack to avoid a cyclic dependency between ++ * cm/cm-lib.cm and compiler/core.cm. This happens because ++ * Compiler.elaborate requires cm's structure UniquePid, ++ * and we need Compiler.elaborate to generate FLINT terms. ++ * -5- 20020228 ++ *) ++ ++Library ++ library($smlnj/viscomp/core.cm) ++ structure UniquePid ++is ++ $smlnj/viscomp/core.cm ++ $smlnj/internal/cm-lib.cm |