debugger: Untangle some dodgy dependencies that were loading locals before prettyprin...

diff --git a/basis/alien/debugger/authors.txt b/basis/alien/debugger/authors.txt
new file mode 100644 (file)
index 0000000..f13c9c1
--- /dev/null
+++ b/basis/alien/debugger/authors.txt
@@ -0,0 +1 @@
+Joe Groff

diff --git a/basis/alien/debugger/debugger.factor b/basis/alien/debugger/debugger.factor
new file mode 100644 (file)
index 0000000..4ac3174
--- /dev/null
+++ b/basis/alien/debugger/debugger.factor
@@ -0,0 +1,9 @@
+! Copyright (C) 2010 Joe Groff.
+! See http://factorcode.org/license.txt for BSD license.
+USING: ;
+IN: alien.debugger
+
+M: no-c-type summary name>> unparse "“" "” is not a C type" surround ;
+
+M: *-in-c-type-name summary
+    name>> "Cannot define a C type “" "” that ends with an asterisk (*)" surround ;

diff --git a/basis/alien/parser/authors.txt b/basis/alien/parser/authors.txt
new file mode 100644 (file)
index 0000000..c299e0a
--- /dev/null
+++ b/basis/alien/parser/authors.txt
@@ -0,0 +1,3 @@
+Slava Pestov
+Doug Coleman
+Joe Groff

diff --git a/basis/alien/parser/parser.factor b/basis/alien/parser/parser.factor
index c9ec2c38898191e6aa7797cb4986f9e2352dac72..4c5f5dbd6aa0f189d6dd0f8aed5e379f35cc3c68 100644 (file)
--- a/basis/alien/parser/parser.factor
+++ b/basis/alien/parser/parser.factor
@@ -1,10 +1,10 @@
-! Copyright (C) 2008, 2010 Slava Pestov, Doug Coleman.
+! Copyright (C) 2008, 2010 Slava Pestov, Doug Coleman, Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien alien.c-types alien.parser
-alien.libraries arrays assocs classes combinators
-combinators.short-circuit compiler.units effects grouping
-kernel parser sequences splitting words fry locals lexer
-namespaces summary math vocabs.parser ;
+USING: accessors alien alien.c-types alien.libraries arrays
+assocs classes combinators combinators.short-circuit
+compiler.units effects grouping kernel parser sequences
+splitting words fry locals lexer namespaces summary math
+vocabs.parser ;
 IN: alien.parser
 
 : parse-c-type-name ( name -- word )

diff --git a/basis/bootstrap/compiler/compiler.factor b/basis/bootstrap/compiler/compiler.factor
index edb0bdf2ae13dae698386e561b3b33770a7cd6b0..0bdb2494f88957bfa5031cef2bf4d8351c0ec6ec 100644 (file)
--- a/basis/bootstrap/compiler/compiler.factor
+++ b/basis/bootstrap/compiler/compiler.factor
@@ -23,6 +23,7 @@ IN: bootstrap.compiler
 "prettyprint" vocab [
     "stack-checker.errors.prettyprint" require
     "alien.prettyprint" require
+    "alien.debugger" require
 ] when
 
 "cpu." cpu name>> append require

diff --git a/basis/debugger/debugger.factor b/basis/debugger/debugger.factor
index b7ecc5acec83c2b8ab0df0689e7b3ecb2c991cca..c34a50190f8d4a0d84c19fe620d8d51eb3a6a0b3 100644 (file)
--- a/basis/debugger/debugger.factor
+++ b/basis/debugger/debugger.factor
@@ -1,15 +1,15 @@
 ! Copyright (C) 2004, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: slots alien.c-types alien.parser arrays definitions generic
-hashtables summary io kernel math namespaces make prettyprint
-prettyprint.config sequences assocs sequences.private strings
-io.styles io.pathnames vectors words system splitting math.parser
+USING: slots arrays definitions generic hashtables summary io
+kernel math namespaces make prettyprint prettyprint.config
+sequences assocs sequences.private strings io.styles
+io.pathnames vectors words system splitting math.parser
 classes.mixin classes.tuple continuations continuations.private
 combinators generic.math classes.builtin classes compiler.units
 generic.standard generic.single vocabs init kernel.private
-io.encodings accessors math.order destructors source-files parser
-classes.tuple.parser effects.parser lexer generic.parser strings.parser
-vocabs.loader vocabs.parser source-files.errors ;
+io.encodings accessors math.order destructors source-files
+parser classes.tuple.parser effects.parser lexer generic.parser
+strings.parser vocabs.loader vocabs.parser source-files.errors ;
 IN: debugger
 
 GENERIC: error-help ( error -- topic )
@@ -328,8 +328,10 @@ M: lexer-error error-help
 
 M: bad-effect summary
     drop "Bad stack effect declaration" ;
+
 M: invalid-row-variable summary
     drop "Stack effect row variables can only occur as the first input or output" ;
+
 M: row-variable-can't-have-type summary
     drop "Stack effect row variables cannot have a declared type" ;
 
@@ -347,11 +349,6 @@ M: wrong-values summary drop "Quotation's stack effect does not match call site"
 
 M: stack-effect-omits-dashes summary drop "Stack effect must contain “--”" ;
 
-M: no-c-type summary name>> unparse "“" "” is not a C type" surround ;
-
-M: *-in-c-type-name summary
-    name>> "Cannot define a C type “" "” that ends with an asterisk (*)" surround ;
-
 {
     { [ os windows? ] [ "debugger.windows" require ] }
     { [ os unix? ] [ "debugger.unix" require ] }