From 2a893a110add9fa4ddd383273426e2a2db2b7ec1 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Mon, 15 Dec 2014 13:10:59 -0800 Subject: [PATCH] compiler.cfg.linear-scan.allocation.state: don't use slot.syntax. --- .../linear-scan/allocation/state/state.factor | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/basis/compiler/cfg/linear-scan/allocation/state/state.factor b/basis/compiler/cfg/linear-scan/allocation/state/state.factor index 6b09bb6317..d0694ecb6f 100644 --- a/basis/compiler/cfg/linear-scan/allocation/state/state.factor +++ b/basis/compiler/cfg/linear-scan/allocation/state/state.factor @@ -1,10 +1,10 @@ ! Copyright (C) 2009, 2010 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: arrays accessors assocs combinators cpu.architecture fry -heaps kernel math math.order namespaces layouts sequences vectors - compiler.cfg compiler.cfg.registers +USING: accessors arrays assocs combinators compiler.cfg compiler.cfg.instructions -compiler.cfg.linear-scan.live-intervals linked-assocs slots.syntax ; +compiler.cfg.linear-scan.live-intervals compiler.cfg.registers +cpu.architecture fry heaps kernel layouts linked-assocs math +math.order namespaces sequences ; FROM: assocs => change-at ; IN: compiler.cfg.linear-scan.allocation.state @@ -25,13 +25,13 @@ SYMBOL: progress SYMBOL: unhandled-min-heap : live-interval-key ( live-interval -- key ) - get{ start end } ; + [ start>> ] [ end>> ] bi 2array ; : sync-point-key ( sync-point -- key ) - n>> 1/0.0 2array ; + n>> 1/0. 2array ; -: zip-keyed ( seq quot: ( elt -- key ) -- assoc ) - dupd map swap zip ; inline +: zip-keyed ( seq quot: ( elt -- key ) -- alist ) + [ keep ] curry { } map>assoc ; inline : >unhandled-min-heap ( live-intervals sync-points -- min-heap ) [ [ live-interval-key ] zip-keyed ]