core: last changes for bootstrap to work.
parent
6219cd195b
commit
55431044f9
|
@ -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
|
||||
|
||||
|
|
|
@ -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?
|
||||
[ <block \ :> 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. ;
|
|
@ -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
|
||||
|
|
|
@ -35,6 +35,3 @@ M: identity-hashtable assoc-like
|
|||
drop dup identity-hashtable? [ >identity-hashtable ] unless ; inline
|
||||
|
||||
M: identity-hashtable new-assoc drop <identity-hashtable> ;
|
||||
|
||||
{ "hashtables.identity" "prettyprint" } "hashtables.identity.prettyprint" require-when
|
||||
{ "hashtables.identity" "mirrors" } "hashtables.identity.mirrors" require-when
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
<effect> ;
|
||||
|
||||
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. ;
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue