From 9afa39aa3a642ddb0213514d5b20e1d359d35db4 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@shill.local>
Date: Tue, 28 Jul 2009 12:56:33 -0500
Subject: [PATCH 1/2] compiler.cfg.ssa.destruction: rename coalesce word to
destruct-ssa
---
basis/compiler/cfg/optimizer/optimizer.factor | 2 +-
basis/compiler/cfg/ssa/destruction/destruction.factor | 2 +-
basis/compiler/cfg/value-numbering/value-numbering-tests.factor | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/basis/compiler/cfg/optimizer/optimizer.factor b/basis/compiler/cfg/optimizer/optimizer.factor
index 52c4c40c09..8e2df04cca 100644
--- a/basis/compiler/cfg/optimizer/optimizer.factor
+++ b/basis/compiler/cfg/optimizer/optimizer.factor
@@ -42,7 +42,7 @@ SYMBOL: check-optimizer?
copy-propagation
eliminate-dead-code
eliminate-write-barriers
- coalesce
+ destruct-ssa
delete-empty-blocks
?check
] with-scope ;
diff --git a/basis/compiler/cfg/ssa/destruction/destruction.factor b/basis/compiler/cfg/ssa/destruction/destruction.factor
index 00f461d6f2..c650782582 100644
--- a/basis/compiler/cfg/ssa/destruction/destruction.factor
+++ b/basis/compiler/cfg/ssa/destruction/destruction.factor
@@ -47,7 +47,7 @@ SYMBOL: seen
: remove-phis ( cfg -- )
[ [ remove-phis-from-block ] if-has-phis ] each-basic-block ;
-: coalesce ( cfg -- cfg' )
+: destruct-ssa ( cfg -- cfg' )
dup cfg-has-phis? [
init-coalescing
compute-ssa-live-sets
diff --git a/basis/compiler/cfg/value-numbering/value-numbering-tests.factor b/basis/compiler/cfg/value-numbering/value-numbering-tests.factor
index c5b064b2d3..087b73e2c0 100644
--- a/basis/compiler/cfg/value-numbering/value-numbering-tests.factor
+++ b/basis/compiler/cfg/value-numbering/value-numbering-tests.factor
@@ -1191,7 +1191,7 @@ test-diamond
cfg new 0 get >>entry
value-numbering
compute-predecessors
- coalesce drop
+ destruct-ssa drop
] unit-test
[ 1 ] [ 1 get successors>> length ] unit-test
From 7f1abec19e6dc9cbda0ff94ca1ae124d256ce604 Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Tue, 28 Jul 2009 14:38:10 -0500
Subject: [PATCH 2/2] i just cut and pasted
---
basis/byte-arrays/hex/authors.txt | 3 ++-
basis/byte-arrays/hex/hex-docs.factor | 2 ++
basis/byte-arrays/hex/hex.factor | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/basis/byte-arrays/hex/authors.txt b/basis/byte-arrays/hex/authors.txt
index f13c9c1e77..8f20b8c31e 100644
--- a/basis/byte-arrays/hex/authors.txt
+++ b/basis/byte-arrays/hex/authors.txt
@@ -1 +1,2 @@
-Joe Groff
+Maxim Savchenko
+Slava Pestov
diff --git a/basis/byte-arrays/hex/hex-docs.factor b/basis/byte-arrays/hex/hex-docs.factor
index 8c60dc2646..8a2b842fc9 100644
--- a/basis/byte-arrays/hex/hex-docs.factor
+++ b/basis/byte-arrays/hex/hex-docs.factor
@@ -1,3 +1,5 @@
+! Copyright (C) 2009 Maxim Savchenko, Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
IN: byte-arrays.hex
USING: byte-arrays help.markup help.syntax ;
diff --git a/basis/byte-arrays/hex/hex.factor b/basis/byte-arrays/hex/hex.factor
index 054c35dcfa..f1b9a52303 100644
--- a/basis/byte-arrays/hex/hex.factor
+++ b/basis/byte-arrays/hex/hex.factor
@@ -1,4 +1,4 @@
-! Copyright (C) 2009 Joe Groff.
+! Copyright (C) 2009 Maxim Savchenko, Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
USING: grouping lexer ascii parser sequences kernel math.parser ;
IN: byte-arrays.hex