From f0834e7b36816dfa0ff6f6217dc66c5471262eaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Lindqvist?= <bjourne@gmail.com>
Date: Sat, 13 Aug 2016 16:36:57 +0200
Subject: [PATCH] compiler.prettyprint: new vocab for prettyprinting compiler
 types

The require-when ensures that the prettyprint methods are loaded when
both the compiler and prettyprint is loaded.
---
 basis/compiler/cfg/debugger/debugger.factor         | 7 -------
 basis/compiler/cfg/registers/registers-tests.factor | 8 ++++++++
 basis/compiler/cfg/stacks/local/local-docs.factor   | 4 ++--
 basis/compiler/compiler.factor                      | 4 +---
 basis/compiler/prettyprint/prettyprint.factor       | 9 +++++++++
 5 files changed, 20 insertions(+), 12 deletions(-)
 create mode 100644 basis/compiler/cfg/registers/registers-tests.factor
 create mode 100644 basis/compiler/prettyprint/prettyprint.factor

diff --git a/basis/compiler/cfg/debugger/debugger.factor b/basis/compiler/cfg/debugger/debugger.factor
index f59860f213..b4f7d983ef 100644
--- a/basis/compiler/cfg/debugger/debugger.factor
+++ b/basis/compiler/cfg/debugger/debugger.factor
@@ -81,10 +81,3 @@ M: insn insn. tuple>array but-last [
 : ssa. ( quot/word -- ) test-ssa cfgs. ;
 : flat. ( quot/word -- ) test-flat cfgs. ;
 : regs. ( quot/word -- ) test-regs cfgs. ;
-
-! Prettyprinting
-: pprint-loc ( loc word -- ) <block pprint-word n>> pprint* block> ;
-
-M: ds-loc pprint* \ D: pprint-loc ;
-
-M: rs-loc pprint* \ R: pprint-loc ;
diff --git a/basis/compiler/cfg/registers/registers-tests.factor b/basis/compiler/cfg/registers/registers-tests.factor
new file mode 100644
index 0000000000..2d8ce16eae
--- /dev/null
+++ b/basis/compiler/cfg/registers/registers-tests.factor
@@ -0,0 +1,8 @@
+USING: compiler.cfg.registers io.streams.string prettyprint tools.test ;
+IN: compiler.cfg.registers.tests
+
+! Ensure prettyprinting of ds/rs-loc is right
+
+{ "D: 3\nR: -1\n" } [
+    [ D: 3 . R: -1 . ] with-string-writer
+] unit-test
diff --git a/basis/compiler/cfg/stacks/local/local-docs.factor b/basis/compiler/cfg/stacks/local/local-docs.factor
index 7d0565b987..5d25915440 100644
--- a/basis/compiler/cfg/stacks/local/local-docs.factor
+++ b/basis/compiler/cfg/stacks/local/local-docs.factor
@@ -20,7 +20,7 @@ HELP: height-state>insns
 { $examples
   "In this example the datastacks height is increased by 4 and the retainstacks decreased by 2."
   { $example
-    "USING: compiler.cfg.debugger compiler.cfg.stacks.local prettyprint ;"
+    "USING: compiler.cfg.stacks.local prettyprint ;"
     "{ { 0 4 } { 0 -2 } } height-state>insns ."
     "{ T{ ##inc { loc D: 4 } } T{ ##inc { loc R: -2 } } }"
   }
@@ -71,7 +71,7 @@ HELP: translate-local-loc
 { $description "Translates an absolute stack location to one that is relative to the given height state." }
 { $examples
   { $example
-    "USING: compiler.cfg.stacks.local compiler.cfg.registers compiler.cfg.debugger namespaces prettyprint ;"
+    "USING: compiler.cfg.stacks.local compiler.cfg.registers namespaces prettyprint ;"
     "D: 7 { { 3 0 } { 0 0 } } translate-local-loc ."
     "D: 4"
   }
diff --git a/basis/compiler/compiler.factor b/basis/compiler/compiler.factor
index afb6580430..be4994bf80 100644
--- a/basis/compiler/compiler.factor
+++ b/basis/compiler/compiler.factor
@@ -170,13 +170,11 @@ M: optimizing-compiler to-recompile ( -- words )
 M: optimizing-compiler process-forgotten-words
     [ delete-compiled-xref ] each ;
 
-: with-optimizer ( quot -- )
-    [ optimizing-compiler compiler-impl ] dip with-variable ; inline
-
 : enable-optimizer ( -- )
     optimizing-compiler compiler-impl set-global ;
 
 : disable-optimizer ( -- )
     f compiler-impl set-global ;
 
+{ "prettyprint" "compiler" } "compiler.prettyprint" require-when
 { "threads" "compiler" } "compiler.threads" require-when
diff --git a/basis/compiler/prettyprint/prettyprint.factor b/basis/compiler/prettyprint/prettyprint.factor
new file mode 100644
index 0000000000..305c751f41
--- /dev/null
+++ b/basis/compiler/prettyprint/prettyprint.factor
@@ -0,0 +1,9 @@
+USING: accessors compiler.cfg.registers prettyprint.backend
+prettyprint.custom prettyprint.sections ;
+IN: compiler.prettyprint
+
+: pprint-loc ( loc word -- ) <block pprint-word n>> pprint* block> ;
+
+M: ds-loc pprint* \ D: pprint-loc ;
+
+M: rs-loc pprint* \ R: pprint-loc ;