Add string pasting support to the gramamr.

[snipe.git] / trans / temp.sml

diff --git a/trans/temp.sml b/trans/temp.sml
index 13411f1ab76e16c38a986059439f3a45802009a7..68de49ca392630b8259d892fa5d374aff3a7a0ff 100644 (file)
--- a/trans/temp.sml
+++ b/trans/temp.sml
@@ -1,4 +1,4 @@
-(* L2 Compiler
+(* L3 Compiler

  * Temporaries
  * Author: Kaustuv Chaudhuri <kaustuv+@cs.cmu.edu>
  * Modified: Alex Vaynberg <alv@andrew.cmu.edu>
  * Temporaries
  * Author: Kaustuv Chaudhuri <kaustuv+@cs.cmu.edu>
  * Modified: Alex Vaynberg <alv@andrew.cmu.edu>


@@ -9,25 +9,27 @@ signature TEMP =
 sig
   type temp
 
 sig
   type temp
 

-  val reset : unit -> unit     (* resets temp numbering *)
-  val new : unit -> temp       (* returns a unique new temp *)
-  val name : temp -> string    (* returns the name of a temp *)
+  val reset : unit -> unit           (* resets temp numbering *)
+  val new : string -> temp           (* returns a unique new temp *)
+  val name : temp -> string          (* returns the name of a temp *)

   val compare : temp * temp -> order (* comparison function *)
   val compare : temp * temp -> order (* comparison function *)

+  val eq : temp * temp -> bool

 end
 
 structure Temp :> TEMP = 
 struct
 end
 
 structure Temp :> TEMP = 
 struct

-  type temp = int
+  type temp = int * string

 
   local
     val counter = ref 1
   in
     (* warning: calling reset() may jeopardize uniqueness of temps! *)
     fun reset () = ( counter := 1 )
 
   local
     val counter = ref 1
   in
     (* warning: calling reset() may jeopardize uniqueness of temps! *)
     fun reset () = ( counter := 1 )

-    fun new () = !counter before ( counter := !counter + 1 )
+    fun new str = (!counter, str) before ( counter := !counter + 1 )

   end
 
   end
 

-  fun name t = "+t" ^ Int.toString t
-                     
-  fun compare (t1,t2) = Int.compare (t1,t2)
+  fun name (t,s) = "+t" ^ Int.toString t ^ "[" ^ s ^ "]"
+  fun compare ((t1,_),(t2,_)) = Int.compare (t1,t2)
+
+  fun eq ((t1,_), (t2,_)) = t1 = t2

 end
 end