compiler: Rename value-info, live-interval

diff --git a/basis/compiler/cfg/linear-scan/allocation/allocation.factor b/basis/compiler/cfg/linear-scan/allocation/allocation.factor
index 89c03b34f3860d8b052b1fd14746f7712117f6aa..73feeb898fc7c05d3322056930b3967c66f8edb8 100644 (file)
--- a/basis/compiler/cfg/linear-scan/allocation/allocation.factor
+++ b/basis/compiler/cfg/linear-scan/allocation/allocation.factor
@@ -50,7 +50,7 @@ IN: compiler.cfg.linear-scan.allocation
 
 GENERIC: handle ( obj -- )
 
-M: live-interval handle
+M: live-interval-state handle
     [ start>> deactivate-intervals ]
     [ start>> activate-intervals ]
     [ assign-register ]

diff --git a/basis/compiler/cfg/linear-scan/live-intervals/live-intervals.factor b/basis/compiler/cfg/linear-scan/live-intervals/live-intervals.factor
index c240463a6abe7db29600515e46890a801606002c..5a9da37d03797d10145eeb6f4373edc16e6314e2 100644 (file)
--- a/basis/compiler/cfg/linear-scan/live-intervals/live-intervals.factor
+++ b/basis/compiler/cfg/linear-scan/live-intervals/live-intervals.factor
@@ -20,7 +20,7 @@ TUPLE: vreg-use n def-rep use-rep spill-slot? ;
 
 : <vreg-use> ( n -- vreg-use ) vreg-use new swap >>n ;
 
-TUPLE: live-interval
+TUPLE: live-interval-state
 vreg
 reg spill-to spill-rep reload-from reload-rep
 start end ranges uses
@@ -47,7 +47,7 @@ M: f covers? 2drop f ;
 
 M: live-range covers? [ from>> ] [ to>> ] bi between? ;
 
-M: live-interval covers? ( insn# live-interval -- ? )
+M: live-interval-state covers? ( insn# live-interval -- ? )
     ranges>>
     dup length 4 <= [
         [ covers? ] with any?
@@ -84,7 +84,7 @@ M: live-interval covers? ( insn# live-interval -- ? )
     [ extend-range ] [ add-new-range ] if ;
 
 : <live-interval> ( vreg reg-class -- live-interval )
-    \ live-interval new
+    \ live-interval-state new
         V{ } clone >>uses
         V{ } clone >>ranges
         swap >>reg-class

diff --git a/basis/compiler/tree/propagation/info/info.factor b/basis/compiler/tree/propagation/info/info.factor
index 9de2cbaba150d01fdfb5345d337abdc5a8267397..35adc61662d8247fb873db665a00cf5554143f4e 100644 (file)
--- a/basis/compiler/tree/propagation/info/info.factor
+++ b/basis/compiler/tree/propagation/info/info.factor
@@ -26,16 +26,16 @@ M: complex eql? over complex? [ = ] [ 2drop f ] if ;
 ! you receive, always construct new ones. We don't declare the
 ! slots read-only to allow cloning followed by writing, and to
 ! simplify constructors.
-TUPLE: value-info
+TUPLE: value-info-state
 class
 interval
 literal
 literal?
 slots ;
 
-CONSTANT: null-info T{ value-info f null empty-interval }
+CONSTANT: null-info T{ value-info-state f null empty-interval }
 
-CONSTANT: object-info T{ value-info f object full-interval }
+CONSTANT: object-info T{ value-info-state f object full-interval }
 
 : interval>literal ( class interval -- literal literal? )
     #! If interval has zero length and the class is sufficiently
@@ -52,7 +52,7 @@ CONSTANT: object-info T{ value-info f object full-interval }
         } cond
     ] if ;
 
-: <value-info> ( -- info ) \ value-info new ; inline
+: <value-info> ( -- info ) \ value-info-state new ; inline
 
 DEFER: <literal-info>