[MLton-commit] r6734

[Matthew Fluet]

Rename SsaTree2.Type.array to SsaTree2.Type.array1 to match SsaTree2.Type.vector1.
----------------------------------------------------------------------

U   mlton/trunk/mlton/ssa/ssa-to-ssa2.fun
U   mlton/trunk/mlton/ssa/ssa-tree2.fun
U   mlton/trunk/mlton/ssa/ssa-tree2.sig

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

Modified: mlton/trunk/mlton/ssa/ssa-to-ssa2.fun
===================================================================
--- mlton/trunk/mlton/ssa/ssa-to-ssa2.fun	2008-08-19 22:12:13 UTC (rev 6733)
+++ mlton/trunk/mlton/ssa/ssa-to-ssa2.fun	2008-08-19 22:12:19 UTC (rev 6734)
@@ -1,4 +1,4 @@
-(* Copyright (C) 2004-2007 Henry Cejtin, Matthew Fluet, Suresh
+(* Copyright (C) 2004-2008 Henry Cejtin, Matthew Fluet, Suresh
  *    Jagannathan, and Stephen Weeks.
  *
  * MLton is released under a BSD-style license.
@@ -37,7 +37,7 @@
           Property.initRec
           (fn (t, convertType)  =>
            case S.Type.dest t of
-              S.Type.Array t => S2.Type.array (convertType t)
+              S.Type.Array t => S2.Type.array1 (convertType t)
             | S.Type.CPointer => S2.Type.cpointer
             | S.Type.Datatype tycon => S2.Type.datatypee tycon
             | S.Type.IntInf => S2.Type.intInf

Modified: mlton/trunk/mlton/ssa/ssa-tree2.fun
===================================================================
--- mlton/trunk/mlton/ssa/ssa-tree2.fun	2008-08-19 22:12:13 UTC (rev 6733)
+++ mlton/trunk/mlton/ssa/ssa-tree2.fun	2008-08-19 22:12:19 UTC (rev 6734)
@@ -244,7 +244,7 @@
          fun make isMutable t =
             vector (Prod.make (Vector.new1 {elt = t, isMutable = isMutable}))
       in
-         val array = make true
+         val array1 = make true
          val vector1 = make false
       end
 
@@ -352,7 +352,7 @@
             fun intInfShift () = done ([intInf, shiftArg, csize], intInf)
             fun intInfUnary () = done ([intInf, csize], intInf)
             fun realTernary s = done ([real s, real s, real s], real s)
-            val word8Array = array word8
+            val word8Array = array1 word8
             fun wordShift s = done ([word s, shiftArg], word s)
             fun arg i = Vector.sub (args, i)
             fun noArgs () = 0 = Vector.length args

Modified: mlton/trunk/mlton/ssa/ssa-tree2.sig
===================================================================
--- mlton/trunk/mlton/ssa/ssa-tree2.sig	2008-08-19 22:12:13 UTC (rev 6733)
+++ mlton/trunk/mlton/ssa/ssa-tree2.sig	2008-08-19 22:12:19 UTC (rev 6734)
@@ -1,4 +1,4 @@
-(* Copyright (C) 1999-2007 Henry Cejtin, Matthew Fluet, Suresh
+(* Copyright (C) 1999-2008 Henry Cejtin, Matthew Fluet, Suresh
  *    Jagannathan, and Stephen Weeks.
  * Copyright (C) 1997-2000 NEC Research Institute.
  *
@@ -62,7 +62,7 @@
              | Weak of t
              | Word of WordSize.t
 
-            val array: t -> t
+            val array1: t -> t
             val bool: t
             val conApp: Con.t * t Prod.t -> t
             val checkPrimApp: {args: t vector,