diff --git a/basis/bootstrap/stage2.factor b/basis/bootstrap/stage2.factor index 7d59403328..e3badc4580 100644 --- a/basis/bootstrap/stage2.factor +++ b/basis/bootstrap/stage2.factor @@ -84,6 +84,17 @@ CONSTANT: default-components { [ os unix? ] [ "alien.libraries.unix" ] } } cond require + { "typed" "prettyprint" } "typed.prettyprint" require-when + { "typed" "compiler.cfg.debugger" } "typed.debugger" require-when + + { "hashtables.identity" "prettyprint" } "hashtables.identity.prettyprint" require-when + { "hashtables.identity" "mirrors" } "hashtables.identity.mirrors" require-when + { "hashtables.wrapped" "prettyprint" } "hashtables.wrapped.prettyprint" require-when + "command-line.startup" require + { "locals" "prettyprint" } "locals.prettyprint" require-when + { "typed" "prettyprint" } "typed.prettyprint" require-when + { "typed" "compiler.cfg.debugger" } "typed.debugger" require-when + ! Set dll paths os windows? [ "windows" require ] when diff --git a/basis/hashtables/wrapped/prettyprint.factor b/basis/hashtables/wrapped/prettyprint/prettyprint.factor similarity index 100% rename from basis/hashtables/wrapped/prettyprint.factor rename to basis/hashtables/wrapped/prettyprint/prettyprint.factor diff --git a/basis/locals/prettyprint.factor b/basis/locals/prettyprint/prettyprint.factor similarity index 74% rename from basis/locals/prettyprint.factor rename to basis/locals/prettyprint/prettyprint.factor index ac72801d91..dbdb599d71 100644 --- a/basis/locals/prettyprint.factor +++ b/basis/locals/prettyprint/prettyprint.factor @@ -1,7 +1,8 @@ ! Copyright (C) 2007, 2008 Slava Pestov, Eduardo Cavazos. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors kernel locals locals.types prettyprint.backend -prettyprint.custom prettyprint.sections sequences words ; +USING: accessors effects kernel locals locals.definitions +locals.types prettyprint.backend prettyprint.custom +prettyprint.sections see sequences words ; IN: locals.prettyprint : pprint-var ( var -- ) @@ -38,3 +39,9 @@ M: multi-def pprint* dup locals>> [ word? ] all? [ pprint-word "(" text locals>> [ pprint-var ] each ")" text block> ] [ pprint-tuple ] if ; + +M: lambda-method synopsis* + dup dup dup definer. + "method-class" word-prop pprint-word + "method-generic" word-prop pprint-word + method-stack-effect effect>string comment. ; diff --git a/basis/typed/prettyprint.factor b/basis/typed/prettyprint/prettyprint.factor similarity index 100% rename from basis/typed/prettyprint.factor rename to basis/typed/prettyprint/prettyprint.factor diff --git a/core/bootstrap/stage1.factor b/core/bootstrap/stage1.factor index 00335206da..5b57d2de17 100644 --- a/core/bootstrap/stage1.factor +++ b/core/bootstrap/stage1.factor @@ -40,8 +40,7 @@ load-help? off "bootstrap.layouts" require ! need this - "locals.macros" require - "locals.fry" require + "locals" load "alien.libraries" require "alien.c-types" require "delegate" require diff --git a/core/hashtables/identity/identity.factor b/core/hashtables/identity/identity.factor index 5cf9613d86..61cff61fe0 100644 --- a/core/hashtables/identity/identity.factor +++ b/core/hashtables/identity/identity.factor @@ -35,6 +35,3 @@ M: identity-hashtable assoc-like drop dup identity-hashtable? [ >identity-hashtable ] unless ; inline M: identity-hashtable new-assoc drop ; - -{ "hashtables.identity" "prettyprint" } "hashtables.identity.prettyprint" require-when -{ "hashtables.identity" "mirrors" } "hashtables.identity.mirrors" require-when diff --git a/core/hashtables/wrapped/wrapped.factor b/core/hashtables/wrapped/wrapped.factor index 90fb286560..de31850261 100644 --- a/core/hashtables/wrapped/wrapped.factor +++ b/core/hashtables/wrapped/wrapped.factor @@ -50,5 +50,3 @@ M: wrapped-hashtable equal? over wrapped-hashtable? [ [ underlying>> ] same? ] [ 2drop f ] if ; INSTANCE: wrapped-hashtable assoc - -{ "hashtables.wrapped" "prettyprint" } "hashtables.wrapped.prettyprint" require-when diff --git a/core/locals/definitions/definitions.factor b/core/locals/definitions/definitions.factor index 64f5368c1f..5a91a11cf3 100644 --- a/core/locals/definitions/definitions.factor +++ b/core/locals/definitions/definitions.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2007, 2008 Slava Pestov, Eduardo Cavazos. ! See http://factorcode.org/license.txt for BSD license. USING: accessors definitions effects generic kernel locals -macros memoize prettyprint prettyprint.backend see words +macros memoize words locals.types sequences make quotations ; IN: locals.definitions @@ -18,6 +18,7 @@ M: lambda lambda-subwords [ vars>> % ] [ body>> [ lambda-subwords ] each ] bi ; M: def lambda-subwords local>> , ; M: callable lambda-subwords [ lambda-subwords ] each ; +M: sequence lambda-subwords [ lambda-subwords ] each ; M: lambda-word subwords @@ -70,9 +71,3 @@ M: lambda-memoized reset-word swap "method-generic" word-prop stack-effect dup [ out>> ] when ; - -M: lambda-method synopsis* - dup dup dup definer. - "method-class" word-prop pprint-word - "method-generic" word-prop pprint-word - method-stack-effect effect>string comment. ; diff --git a/core/locals/locals.factor b/core/locals/locals.factor index 1be9af6a60..56c40a5008 100644 --- a/core/locals/locals.factor +++ b/core/locals/locals.factor @@ -5,10 +5,4 @@ vocabs.loader words kernel namespaces locals.parser locals.types locals.errors ; IN: locals -{ - "locals.macros" - "locals.fry" -} [ require ] each - -{ "locals" "prettyprint" } "locals.definitions" require-when -{ "locals" "prettyprint" } "locals.prettyprint" require-when +! Empty on purpose for now. diff --git a/core/typed/typed.factor b/core/typed/typed.factor index 442fcbb624..895038a952 100644 --- a/core/typed/typed.factor +++ b/core/typed/typed.factor @@ -159,8 +159,3 @@ PRIVATE> [ [ 2drop ] [ typed-def ] [ 2nip ] 3tri define-inline ] [ drop "typed-def" set-word-prop ] [ 2drop "typed-word" word-prop set-last-word ] 3tri ; - -USE: vocabs.loader - -{ "typed" "prettyprint" } "typed.prettyprint" require-when -{ "typed" "compiler.cfg.debugger" } "typed.debugger" require-when