basis: Move signal word and fix tests.

diff --git a/basis/bootstrap/stage2.factor b/basis/bootstrap/stage2.factor
index b0fab89b45ec631dec4ab7647423fde5faa1efe7..3ec202482745c14525492288846fa7382dff574e 100644 (file)
--- a/basis/bootstrap/stage2.factor
+++ b/basis/bootstrap/stage2.factor
@@ -82,7 +82,6 @@ CONSTANT: default-components
         "stage2: deployment mode" print
     ] [
         "debugger" require
-        os unix? [ "debugger.unix" require ] when
         "listener" require
     ] if
 

diff --git a/basis/debugger/debugger.factor b/basis/debugger/debugger.factor
index 0630bc11f8c0ae3d548bfc991536951e6e68ec66..433941496c98a67c412489ab84811d814d1eea99 100644 (file)
--- a/basis/debugger/debugger.factor
+++ b/basis/debugger/debugger.factor
@@ -2,13 +2,15 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.strings arrays assocs classes
 classes.builtin classes.mixin classes.tuple classes.tuple.parser
-combinators combinators.short-circuit compiler.errors compiler.units
-continuations definitions destructors effects.parser fry generic
-generic.math generic.parser generic.single grouping io io.encodings
-io.styles kernel kernel.private lexer libc make math math.order
-math.parser math.ratios namespaces parser prettyprint sequences
-sequences.private slots source-files.errors strings strings.parser
-summary system vocabs vocabs.loader vocabs.parser words ;
+combinators combinators.short-circuit compiler.errors
+compiler.units continuations definitions destructors
+effects.parser fry generic generic.math generic.parser
+generic.single grouping io io.encodings io.styles kernel
+kernel.private lexer libc make math math.order math.parser
+math.ratios namespaces parser prettyprint sequences
+sequences.private slots source-files.errors strings
+strings.parser summary system vocabs vocabs.loader vocabs.parser
+words ;
 IN: debugger
 
 GENERIC: error-help ( error -- topic )
@@ -383,3 +385,5 @@ M: callsite-not-compiled summary
     drop "Caller not compiled with the optimizing compiler" ;
 
 { "threads" "debugger" } "debugger.threads" require-when
+
+os unix? [ "debugger.unix" require ] when

diff --git a/basis/debugger/unix/unix.factor b/basis/debugger/unix/unix.factor
index 1f27bc1dbb1dbe11f8c45cb7f3861c3a5d936d2a..62b2969c5ac5c3fe7748c38ddb4caf4d9b36a9ab 100644 (file)
--- a/basis/debugger/unix/unix.factor
+++ b/basis/debugger/unix/unix.factor
@@ -1,12 +1,9 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors debugger io kernel math prettyprint sequences
-system unix.signals ;
+USING: debugger io kernel prettyprint sequences system
+unix.signals ;
 IN: debugger.unix
 
-: signal-name. ( n -- )
-    signal-name [ " (" ")" surround write ] when* ;
-
 M: unix signal-error. ( obj -- )
     "Unix signal #" write
     third [ pprint ] [ signal-name. ] bi nl ;

diff --git a/basis/unix/signals/signals.factor b/basis/unix/signals/signals.factor
index ec94cb2245e81941d7345d94776c8699256868d3..25abdfba0797f5affa59b2df6807e11e65029665 100644 (file)
--- a/basis/unix/signals/signals.factor
+++ b/basis/unix/signals/signals.factor
@@ -1,6 +1,7 @@
 ! Copyright (C) 2011 Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs kernel math namespaces sequences threads ;
+USING: accessors assocs io kernel math namespaces sequences
+system threads ;
 IN: unix.signals
 
 CONSTANT: signal-names
@@ -21,6 +22,9 @@ M: signal signal-name n>> signal-name ;
 
 M: integer signal-name ( n -- str/f ) 1 - signal-names ?nth ;
 
+: signal-name. ( n -- )
+    signal-name [ " (" ")" surround write ] when* ;
+
 SYMBOL: dispatch-signal-hook
 
 dispatch-signal-hook [ [ drop ] ] initialize