Add strings to type system and parser/lexer

[snipe.git] / codegen / colororder.sml

diff --git a/codegen/colororder.sml b/codegen/colororder.sml
index 16dd163067d0c600a8d8c0e544e3c27ee097c01d..f1a724b82915c1a54216cd5483759db7466c43dd 100644 (file)
--- a/codegen/colororder.sml
+++ b/codegen/colororder.sml
@@ -7,7 +7,7 @@
 signature COLORORDER =
 sig
   structure OperSet : ORD_SET
-    where type Key.ord_key = x86.basicop
+    where type Key.ord_key = Blarg.oper
   structure LiveMap : ORD_MAP
     where type Key.ord_key = int
   structure TempMap : ORD_MAP
@@ -22,7 +22,7 @@ end
 structure ColorOrder :> COLORORDER =
 struct
   structure T = Temp
-  structure X = x86
+  structure X = Blarg
   
   structure OperSet = Igraph.OperSet
   structure LiveMap = Igraph.LiveMap
@@ -44,7 +44,7 @@ struct
                 if (w2 > w1)
                 then (t2, w2)
                 else (t1, w1))
-              (Temp.new "emarnus" Temp.Word, ~9999)
+              (Temp.new "emarnus", ~9999)
               weights
               
           fun ditchOne f nil = nil     (* Special case of filter, which bails out after it removes one. *)