[MLton-commit] r4464

[Matthew Fluet]

Naming schemes
----------------------------------------------------------------------

U   mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/Makefile
U   mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/build/sources.mlb
D   mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/config/default/default-int-inf.sml
A   mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/config/default/default-intinf.sml
D   mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/maps/default-int-inf.map
A   mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/maps/default-intinf.map
U   mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/maps/seqindex-int32.map
U   mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/maps/seqindex-int64.map
U   mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/primitive/primitive.mlb

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

Modified: mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/Makefile
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/Makefile	2006-05-06 16:28:46 UTC (rev 4463)
+++ mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/Makefile	2006-05-06 17:25:08 UTC (rev 4464)
@@ -25,7 +25,7 @@
 SEQINDEX_MAPS = seqindex-int32.map seqindex-int64.map 
 CTYPES_MAPS = c-types.test-amd64-m32-linux.map c-types.test-amd64-m64-linux.map c-types.test-weird-weird.map c-types.amd64-linux.map c-types.x86-linux.map 
 DEFAULT_CHAR_MAPS = default-char8.map
-DEFAULT_INT_MAPS = default-int32.map default-int64.map default-int-inf.map 
+DEFAULT_INT_MAPS = default-int32.map default-int64.map default-intinf.map 
 DEFAULT_REAL_MAPS = default-real32.map default-real64.map
 DEFAULT_WORD_MAPS = default-word32.map default-word64.map
 

Modified: mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/build/sources.mlb
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/build/sources.mlb	2006-05-06 16:28:46 UTC (rev 4463)
+++ mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/build/sources.mlb	2006-05-06 17:25:08 UTC (rev 4464)
@@ -27,7 +27,7 @@
    in ann "forceUsed" in
       ../config/objptr/$(OBJPTR_REP)
       ../config/header/$(HEADER_WORD)
-      ../config/seqindex/$(SEQ_INDEX)
+      ../config/seqindex/$(SEQINDEX_INT)
       ../config/c/$(TARGET_ARCH)-$(TARGET_OS)/c-types.sml
       ../config/c/position.sml
       ../config/c/sys-word.sml
@@ -77,7 +77,7 @@
    local 
       ../config/bind/int-prim.sml 
    in ann "forceUsed" in
-      ../config/seqindex/$(SEQ_INDEX)
+      ../config/seqindex/$(SEQINDEX_INT)
    end end
    ../arrays-and-vectors/slice.sig
    ../arrays-and-vectors/sequence.sig

Deleted: mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/config/default/default-int-inf.sml
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/config/default/default-int-inf.sml	2006-05-06 16:28:46 UTC (rev 4463)
+++ mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/config/default/default-int-inf.sml	2006-05-06 17:25:08 UTC (rev 4464)
@@ -1,13 +0,0 @@
-(* Copyright (C) 1999-2006 Henry Cejtin, Matthew Fluet, Suresh
- *    Jagannathan, and Stephen Weeks.
- *
- * MLton is released under a BSD-style license.
- * See the file MLton-LICENSE for details.
- *)
-
-structure Int = IntInf
-type int = Int.int
-
-functor Int_ChooseInt (A: CHOOSE_INT_ARG) :
-   sig val f : Int.int A.t end =
-   ChooseInt_IntInf (A)

Copied: mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/config/default/default-intinf.sml (from rev 4448, mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/config/default/default-int-inf.sml)

Deleted: mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/maps/default-int-inf.map
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/maps/default-int-inf.map	2006-05-06 16:28:46 UTC (rev 4463)
+++ mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/maps/default-int-inf.map	2006-05-06 17:25:08 UTC (rev 4464)
@@ -1 +0,0 @@
-DEFAULT_INT default-int-inf.sml

Copied: mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/maps/default-intinf.map (from rev 4448, mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/maps/default-int-inf.map)
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/maps/default-int-inf.map	2006-05-04 15:26:50 UTC (rev 4448)
+++ mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/maps/default-intinf.map	2006-05-06 17:25:08 UTC (rev 4464)
@@ -0,0 +1 @@
+DEFAULT_INT default-intinf.sml

Modified: mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/maps/seqindex-int32.map
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/maps/seqindex-int32.map	2006-05-06 16:28:46 UTC (rev 4463)
+++ mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/maps/seqindex-int32.map	2006-05-06 17:25:08 UTC (rev 4464)
@@ -1 +1 @@
-SEQ_INDEX seqindex-int32.sml
+SEQINDEX_INT seqindex-int32.sml

Modified: mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/maps/seqindex-int64.map
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/maps/seqindex-int64.map	2006-05-06 16:28:46 UTC (rev 4463)
+++ mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/maps/seqindex-int64.map	2006-05-06 17:25:08 UTC (rev 4464)
@@ -1 +1 @@
-SEQ_INDEX seqindex-int64.sml
+SEQINDEX_INT seqindex-int64.sml

Modified: mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/primitive/primitive.mlb
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/primitive/primitive.mlb	2006-05-06 16:28:46 UTC (rev 4463)
+++ mlton/branches/on-20050822-x86_64-branch/basis-library.refactor/primitive/primitive.mlb	2006-05-06 17:25:08 UTC (rev 4464)
@@ -44,7 +44,7 @@
    in ann "forceUsed" in
       ../config/objptr/$(OBJPTR_REP)
       ../config/header/$(HEADER_WORD)
-      ../config/seqindex/$(SEQ_INDEX)
+      ../config/seqindex/$(SEQINDEX_INT)
       ../config/c/$(TARGET_ARCH)-$(TARGET_OS)/c-types.sml
       ../config/c/errno.sml
       ../config/c/position.sml