From f4a6e10818906dfa20f28412de6eafca48ed6fcd Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Wed, 19 Oct 2011 11:00:07 -0700
Subject: [PATCH] More cleanup of unused stuff.

---
 basis/compiler/cfg/debugger/debugger.factor   | 3 ---
 core/io/encodings/encodings.factor            | 8 --------
 extra/compiler/graphviz/graphviz.factor       | 4 ++--
 extra/game/models/collada/collada-docs.factor | 4 ----
 extra/game/models/collada/collada.factor      | 7 ++-----
 5 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/basis/compiler/cfg/debugger/debugger.factor b/basis/compiler/cfg/debugger/debugger.factor
index cc190131e8..58d782aad3 100644
--- a/basis/compiler/cfg/debugger/debugger.factor
+++ b/basis/compiler/cfg/debugger/debugger.factor
@@ -27,9 +27,6 @@ M: word test-builder
     0 vreg-counter set-global
     [ build-tree optimize-tree ] keep build-cfg ;
 
-: test-optimizer ( quot -- cfgs )
-    test-builder [ [ optimize-cfg ] with-cfg ] map ;
-
 : test-ssa ( quot -- cfgs )
     test-builder [
         [
diff --git a/core/io/encodings/encodings.factor b/core/io/encodings/encodings.factor
index 8afda8ed60..1a6df8898e 100644
--- a/core/io/encodings/encodings.factor
+++ b/core/io/encodings/encodings.factor
@@ -50,14 +50,6 @@ M: object <decoder> f decoder boa ; inline
 : >decoder< ( decoder -- stream encoding )
     [ stream>> ] [ code>> ] bi ; inline
 
-: fix-read1 ( stream char -- char )
-    over cr>> [
-        over cr-
-        dup CHAR: \n = [
-            drop dup stream-read1
-        ] when
-    ] when nip ; inline
-
 M: decoder stream-element-type
     drop +character+ ; inline
 
diff --git a/extra/compiler/graphviz/graphviz.factor b/extra/compiler/graphviz/graphviz.factor
index 0288e1d0ab..f0b7c85494 100644
--- a/extra/compiler/graphviz/graphviz.factor
+++ b/extra/compiler/graphviz/graphviz.factor
@@ -79,8 +79,8 @@ IN: compiler.graphviz
 : optimized-cfg ( quot -- cfgs )
     {
         { [ dup cfg? ] [ 1array ] }
-        { [ dup quotation? ] [ test-optimizer ] }
-        { [ dup word? ] [ test-optimizer ] }
+        { [ dup quotation? ] [ test-ssa ] }
+        { [ dup word? ] [ test-ssa ] }
         [ ]
     } cond ;
 
diff --git a/extra/game/models/collada/collada-docs.factor b/extra/game/models/collada/collada-docs.factor
index b8dad530a4..ac286cae24 100644
--- a/extra/game/models/collada/collada-docs.factor
+++ b/extra/game/models/collada/collada-docs.factor
@@ -24,10 +24,6 @@ HELP: string>numbers ( string -- number-seq )
 { $values { "string" string } { "number-seq" sequence } }
 { $description "Splits a string on whitespace and converts the elements to a number sequence." } ;
 
-HELP: string>floats ( string -- float-seq )
-{ $values { "string" string } { "float-seq" sequence } }
-{ $description "Splits a string on whitespace and converts the elements to a float sequence." } ;
-
 HELP: x-up { $class-description "Right-handed 3D coordinate system where X is up." } ;
 HELP: y-up { $class-description "Right-handed 3D coordinate system where Y is up." } ;
 HELP: z-up { $class-description "Right-handed 3D coordinate system where Z is up." } ;
diff --git a/extra/game/models/collada/collada.factor b/extra/game/models/collada/collada.factor
index 45a47d814c..407718e91c 100644
--- a/extra/game/models/collada/collada.factor
+++ b/extra/game/models/collada/collada.factor
@@ -22,9 +22,6 @@ SYMBOLS: up-axis unit-ratio ;
 : string>numbers ( string -- number-seq )
     " \t\n" split harvest [ string>number ] map ;
 
-: string>floats ( string -- float-seq )
-    " \t\n" split harvest [ string>number ] map ;
-
 : x/ ( tag child-name -- child-tag )
     [ tag-named ]
     [ rot dup [ drop missing-child ] unless 2nip ]
@@ -72,7 +69,7 @@ M: z-up >y-up-axis!
 
 : source>seq ( source-tag up-axis scale -- sequence )
     rot
-    [ "float_array" x/ xt string>floats [ * ] with map ]
+    [ "float_array" x/ xt string>numbers [ * ] with map ]
     [ nip "technique_common" x/ "accessor" x/ "stride" x@ string>number ] 2bi
     group
     [ swap over length 2 > [ >y-up-axis! ] [ drop ] if ] with map ;
@@ -142,7 +139,7 @@ VERTEX-FORMAT: collada-vertex-format
 
 : triangles>model ( sources vertices triangles-tag -- model )
     [ "input" tags-named collect-sources ] keep swap
-    
+
     [
         largest-offset+1 swap
         [ "count" x@ string>number ] [ triangles>numbers ] bi