[MLton-commit] r7046

[Matthew Fluet]

Cleaner handling of ML-Yacc library dependencies with mlton-stubs.cm
----------------------------------------------------------------------

D   mlton/trunk/mlton/front-end/import.cm
U   mlton/trunk/mlton/front-end/sources.cm
U   mlton/trunk/mlton/mlton-stubs.cm
U   mlton/trunk/mlton/mlton.cm

----------------------------------------------------------------------

Deleted: mlton/trunk/mlton/front-end/import.cm
===================================================================
--- mlton/trunk/mlton/front-end/import.cm	2009-04-08 12:31:05 UTC (rev 7045)
+++ mlton/trunk/mlton/front-end/import.cm	2009-04-08 12:31:07 UTC (rev 7046)
@@ -1,42 +0,0 @@
-(* Copyright (C) 1999-2005 Henry Cejtin, Matthew Fluet, Suresh
- *    Jagannathan, and Stephen Weeks.
- * Copyright (C) 1997-2000 NEC Research Institute.
- *
- * MLton is released under a BSD-style license.
- * See the file MLton-LICENSE for details.
- *)
-
-Group
-
-structure Array
-structure Buffer
-structure Char
-structure CharVector
-structure Error
-structure Exn
-structure Dir
-structure File
-structure HashSet
-structure In
-structure Int
-signature INTEGER
-structure IntInf
-structure Layout
-structure List
-structure MLton
-structure Option
-structure OS
-structure Out
-structure Pervasive
-structure Promise
-structure Ref
-structure String
-structure StringCvt
-structure Trace
-structure Unsafe
-structure Vector
-structure Word32
-
-is
-
-../../lib/mlton/sources.cm

Modified: mlton/trunk/mlton/front-end/sources.cm
===================================================================
--- mlton/trunk/mlton/front-end/sources.cm	2009-04-08 12:31:05 UTC (rev 7045)
+++ mlton/trunk/mlton/front-end/sources.cm	2009-04-08 12:31:07 UTC (rev 7046)
@@ -1,4 +1,5 @@
-(* Copyright (C) 1999-2006 Henry Cejtin, Matthew Fluet, Suresh
+(* Copyright (C) 2009 Matthew Fluet.
+ * Copyright (C) 1999-2006 Henry Cejtin, Matthew Fluet, Suresh
  *    Jagannathan, and Stephen Weeks.
  * Copyright (C) 1997-2000 NEC Research Institute.
  *
@@ -13,10 +14,7 @@
 
 is
 
-import.cm (* Have to do this because code generated by mlyacc relies on the
-           * basis library being available, and lib/mlton overrides a lot of
-           * basis library structures.
-           *)
+../../lib/mlton/sources.cm
 ../../lib/mlyacc/sources.cm
 ../ast/sources.cm
 ../control/sources.cm

Modified: mlton/trunk/mlton/mlton-stubs.cm
===================================================================
--- mlton/trunk/mlton/mlton-stubs.cm	2009-04-08 12:31:05 UTC (rev 7045)
+++ mlton/trunk/mlton/mlton-stubs.cm	2009-04-08 12:31:07 UTC (rev 7046)
@@ -1,4 +1,5 @@
-(* Copyright (C) 2004-2005 Henry Cejtin, Matthew Fluet, Suresh
+(* Copyright (C) 2009 Matthew Fluet.
+ * Copyright (C) 2004-2005 Henry Cejtin, Matthew Fluet, Suresh
  *    Jagannathan, and Stephen Weeks.
  *
  * MLton is released under a BSD-style license.

Modified: mlton/trunk/mlton/mlton.cm
===================================================================
--- mlton/trunk/mlton/mlton.cm	2009-04-08 12:31:05 UTC (rev 7045)
+++ mlton/trunk/mlton/mlton.cm	2009-04-08 12:31:07 UTC (rev 7046)
@@ -1,4 +1,5 @@
-(* Copyright (C) 2004-2005 Henry Cejtin, Matthew Fluet, Suresh
+(* Copyright (C) 2009 Matthew Fluet.
+ * Copyright (C) 2004-2005 Henry Cejtin, Matthew Fluet, Suresh
  *    Jagannathan, and Stephen Weeks.
  *
  * MLton is released under a BSD-style license.
@@ -8,5 +9,7 @@
 Group is
 
 upgrade-basis.sml
+(* Need to elaborate ML-Yacc library in Basis Library, not MLton library. *)
+../lib/mlyacc/sources.cm
 sources.cm
 call-main.sml