[MLton-commit] r6387

Vesa Karvonen vesak at mlton.org
Wed Feb 6 08:02:29 PST 2008


Dropped the implicitly added prefix, "default-", and suffix, ".sml", from
the path variables corresponding to default type control flags.
Correspondingly, and trivially, changed the MLB files, where the variables
were being used, to include the necessary prefixes and suffices.  The
intention behind this change is to make it more convenient (resulting in
shorter and more conventional file names) to use the path variables in
user defined MLB files to specialize code depending on the default types.

Although the variables corresponding to objptr, header and seqindex types
are unlikely to be useful in user-defined MLB files, the prefixes and
suffices on those variables were similarly dropped for consistency.

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

U   mlton/trunk/basis-library/build/sources.mlb
U   mlton/trunk/basis-library/primitive/primitive.mlb
U   mlton/trunk/mlton/control/control-flags.sml

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

Modified: mlton/trunk/basis-library/build/sources.mlb
===================================================================
--- mlton/trunk/basis-library/build/sources.mlb	2008-02-05 15:42:56 UTC (rev 6386)
+++ mlton/trunk/basis-library/build/sources.mlb	2008-02-06 16:02:28 UTC (rev 6387)
@@ -26,9 +26,9 @@
       ../config/bind/real-prim.sml 
       ../config/bind/word-prim.sml 
    in ann "forceUsed" in
-      ../config/objptr/$(OBJPTR_REP)
-      ../config/header/$(HEADER_WORD)
-      ../config/seqindex/$(SEQINDEX_INT)
+      ../config/objptr/objptr-$(OBJPTR_REP).sml
+      ../config/header/header-$(HEADER_WORD).sml
+      ../config/seqindex/seqindex-$(SEQINDEX_INT).sml
       ../config/c/$(TARGET_ARCH)-$(TARGET_OS)/c-types.sml
    end end
    ../integer/int-inf0.sml
@@ -38,8 +38,8 @@
          ../config/bind/int-inf-prim.sml 
          ../config/bind/word-prim.sml 
       in ann "forceUsed" in
-         ../config/default/$(DEFAULT_INT)
-         ../config/default/$(DEFAULT_WORD)
+         ../config/default/default-$(DEFAULT_INT).sml
+         ../config/default/default-$(DEFAULT_WORD).sml
          ../config/default/fixed-int.sml
          ../config/default/large-int.sml
          ../config/default/large-word.sml
@@ -58,11 +58,11 @@
       ../config/bind/string-prim.sml 
       ../config/bind/word-prim.sml 
    in ann "forceUsed" in
-      ../config/default/$(DEFAULT_CHAR)
-      ../config/default/$(DEFAULT_WIDECHAR)
-      ../config/default/$(DEFAULT_INT)
-      ../config/default/$(DEFAULT_REAL)
-      ../config/default/$(DEFAULT_WORD)
+      ../config/default/default-$(DEFAULT_CHAR).sml
+      ../config/default/default-$(DEFAULT_WIDECHAR).sml
+      ../config/default/default-$(DEFAULT_INT).sml
+      ../config/default/default-$(DEFAULT_REAL).sml
+      ../config/default/default-$(DEFAULT_WORD).sml
       ../config/default/fixed-int.sml
       ../config/default/large-int.sml
       ../config/default/large-real.sml
@@ -80,7 +80,7 @@
    local 
       ../config/bind/int-prim.sml 
    in ann "forceUsed" in
-      ../config/seqindex/$(SEQINDEX_INT)
+      ../config/seqindex/seqindex-$(SEQINDEX_INT).sml
    end end
    ../arrays-and-vectors/slice.sig
    ../arrays-and-vectors/sequence.sig
@@ -121,8 +121,8 @@
       ../config/bind/real-prim.sml 
       ../config/bind/word-top.sml 
    in ann "forceUsed" in
-      ../config/header/$(HEADER_WORD)
-      ../config/objptr/$(OBJPTR_REP)
+      ../config/header/header-$(HEADER_WORD).sml
+      ../config/objptr/objptr-$(OBJPTR_REP).sml
       ../config/c/$(TARGET_ARCH)-$(TARGET_OS)/c-types.sml
       ../config/c/position.sml
       ../config/c/sys-word.sml
@@ -134,8 +134,8 @@
       ../config/bind/int-inf-top.sml 
       ../config/bind/word-top.sml 
    in ann "forceUsed" in
-      ../config/default/$(DEFAULT_INT)
-      ../config/default/$(DEFAULT_WORD)
+      ../config/default/default-$(DEFAULT_INT).sml
+      ../config/default/default-$(DEFAULT_WORD).sml
       ../config/default/fixed-int.sml
       ../config/default/large-int.sml
       ../config/default/large-word.sml
@@ -154,8 +154,8 @@
       ../config/bind/real-prim.sml 
       ../config/bind/word-top.sml 
    in ann "forceUsed" in
-      ../config/header/$(HEADER_WORD)
-      ../config/objptr/$(OBJPTR_REP)
+      ../config/header/header-$(HEADER_WORD).sml
+      ../config/objptr/objptr-$(OBJPTR_REP).sml
       ../config/c/$(TARGET_ARCH)-$(TARGET_OS)/c-types.sml
       ../config/c/position.sml
       ../config/c/sys-word.sml
@@ -189,7 +189,7 @@
    local 
       ../config/bind/real-top.sml 
    in ann "forceUsed" in
-      ../config/default/$(DEFAULT_REAL)
+      ../config/default/default-$(DEFAULT_REAL).sml
       ../config/default/large-real.sml
    end end
    ../real/real-global.sml
@@ -201,8 +201,8 @@
       ../config/bind/real-top.sml 
       ../config/bind/word-top.sml 
    in ann "forceUsed" in
-      ../config/header/$(HEADER_WORD)
-      ../config/objptr/$(OBJPTR_REP)
+      ../config/header/header-$(HEADER_WORD).sml
+      ../config/objptr/objptr-$(OBJPTR_REP).sml
       ../config/c/$(TARGET_ARCH)-$(TARGET_OS)/c-types.sml
       ../config/c/position.sml
       ../config/c/sys-word.sml

Modified: mlton/trunk/basis-library/primitive/primitive.mlb
===================================================================
--- mlton/trunk/basis-library/primitive/primitive.mlb	2008-02-05 15:42:56 UTC (rev 6386)
+++ mlton/trunk/basis-library/primitive/primitive.mlb	2008-02-06 16:02:28 UTC (rev 6387)
@@ -48,9 +48,9 @@
       ../config/bind/real-prim.sml 
       ../config/bind/word-prim.sml 
    in ann "forceUsed" in
-      ../config/objptr/$(OBJPTR_REP)
-      ../config/header/$(HEADER_WORD)
-      ../config/seqindex/$(SEQINDEX_INT)
+      ../config/objptr/objptr-$(OBJPTR_REP).sml
+      ../config/header/header-$(HEADER_WORD).sml
+      ../config/seqindex/seqindex-$(SEQINDEX_INT).sml
       ../config/c/$(TARGET_ARCH)-$(TARGET_OS)/c-types.sml
       ../config/c/errno.sml
       ../config/c/position.sml

Modified: mlton/trunk/mlton/control/control-flags.sml
===================================================================
--- mlton/trunk/mlton/control/control-flags.sml	2008-02-05 15:42:56 UTC (rev 6386)
+++ mlton/trunk/mlton/control/control-flags.sml	2008-02-06 16:02:28 UTC (rev 6387)
@@ -1031,29 +1031,29 @@
                                     (!Target.os))},
             {var = "OBJPTR_REP",
              path = (case Bits.toInt (Target.Size.objptr ()) of
-                        32 => "objptr-rep32.sml"
-                      | 64 => "objptr-rep64.sml"
+                        32 => "rep32"
+                      | 64 => "rep64"
                       | _ => Error.bug "Control.mlbPathMap")},
             {var = "HEADER_WORD",
              path = (case Bits.toInt (Target.Size.header ()) of
-                        32 => "header-word32.sml"
-                      | 64 => "header-word64.sml"
+                        32 => "word32"
+                      | 64 => "word64"
                       | _ => Error.bug "Control.mlbPathMap")},
             {var = "SEQINDEX_INT",
              path = (case Bits.toInt (Target.Size.seqIndex ()) of
-                        32 => "seqindex-int32.sml"
-                      | 64 => "seqindex-int64.sml"
+                        32 => "int32"
+                      | 64 => "int64"
                       | _ => Error.bug "Control.mlbPathMap")},
             {var = "DEFAULT_CHAR",
-             path = concat ["default-", !defaultChar, ".sml"]},
+             path = !defaultChar},
             {var = "DEFAULT_WIDECHAR",
-             path = concat ["default-", !defaultWideChar, ".sml"]},
+             path = !defaultWideChar},
             {var = "DEFAULT_INT",
-             path = concat ["default-", !defaultInt, ".sml"]},
+             path = !defaultInt},
             {var = "DEFAULT_REAL",
-             path = concat ["default-", !defaultReal, ".sml"]},
+             path = !defaultReal},
             {var = "DEFAULT_WORD",
-             path = concat ["default-", !defaultWord, ".sml"]}],
+             path = !defaultWord}],
            !mlbPathVars])
 
 val typeCheck = control {name = "type check",




More information about the MLton-commit mailing list