Updating some code

basis/bootstrap/compiler/compiler.factor

@@ -3,10 +3,10 @@
 USING: accessors compiler cpu.architecture vocabs.loader system
 sequences namespaces parser kernel kernel.private classes
 classes.private arrays hashtables vectors classes.tuple sbufs
-inference.dataflow hashtables.private sequences.private math
+hashtables.private sequences.private math classes.tuple.private
-classes.tuple.private growable namespaces.private assocs words
+growable namespaces.private assocs words command-line vocabs io
-generator command-line vocabs io io.encodings.string
+io.encodings.string prettyprint libc compiler.units math.order
-prettyprint libc compiler.units math.order ;
+compiler.tree.builder compiler.tree.optimizer ;
 IN: bootstrap.compiler
 
 ! Don't bring this in when deploying, since it will store a
@@ -80,6 +80,10 @@ nl
     malloc calloc free memcpy
 } compile-uncompiled
 
+{
+    build-tree optimize-tree
+} compile-uncompiled
+
 vocabs [ words compile-uncompiled "." write flush ] each
 
 " done" print flush

basis/cocoa/messages/messages.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2006, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien alien.c-types alien.strings alien.compiler
+USING: alien alien.c-types alien.strings
-arrays assocs combinators compiler inference.transforms kernel
+arrays assocs combinators compiler kernel
 math namespaces parser prettyprint prettyprint.sections
 quotations sequences strings words cocoa.runtime io macros
 memoize debugger io.encodings.ascii effects ;

basis/combinators/short-circuit/smart/smart.factor

@@ -1,5 +1,5 @@
 
-USING: kernel sequences math inference accessors macros
+USING: kernel sequences math stack-checker accessors macros
        combinators.short-circuit ;
 
 IN: combinators.short-circuit.smart

basis/compiler/compiler-docs.factor

@@ -1,4 +1,4 @@
-USING: generator help.markup help.syntax words io parser
+USING: compiler.generator help.markup help.syntax words io parser
 assocs words.private sequences compiler.units ;
 IN: compiler
 

basis/compiler/compiler.factor

@@ -1,10 +1,9 @@
 ! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel namespaces arrays sequences io inference.backend
+USING: kernel namespaces arrays sequences io debugger words
-inference.state generator debugger words compiler.units
+compiler.units continuations vocabs assocs dlists definitions
-continuations vocabs assocs alien.compiler dlists optimizer
+math compiler.errors threads graphs generic combinators dequeues
-definitions math compiler.errors threads graphs generic
+search-dequeues ;
-inference combinators dequeues search-dequeues ;
 IN: compiler
 
 SYMBOL: +failed+

basis/compiler/tests/insane.factor

@@ -1,4 +1,4 @@
 IN: compiler.tests
-USING: words kernel inference alien.strings tools.test ;
+USING: words kernel stack-checker alien.strings tools.test ;
 
 [ ] [ \ if redefined [ string>alien ] infer. ] unit-test

basis/compiler/tests/templates-early.factor

@@ -1,6 +1,6 @@
 ! Testing templates machinery without compiling anything
 IN: compiler.tests
-USING: compiler generator generator.registers
+USING: compiler compiler.generator compiler.generator.registers
 generator.registers.private tools.test namespaces sequences
 words kernel math effects definitions compiler.units accessors
 cpu.architecture ;

basis/cpu/ppc/architecture/architecture.factor

@@ -1,10 +1,10 @@
-! Copyright (C) 2005, 2007 Slava Pestov.
+! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien.c-types cpu.ppc.assembler cpu.architecture generic
 kernel kernel.private math memory namespaces sequences words
-assocs generator generator.registers generator.fixup system
+assocs compiler.generator compiler.generator.registers
-layouts classes words.private alien combinators
+compiler.generator.fixup system layouts classes words.private
-compiler.constants math.order ;
+alien combinators compiler.constants math.order ;
 IN: cpu.ppc.architecture
 
 ! PowerPC register assignments

basis/cpu/ppc/assembler/assembler.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: generator.fixup kernel namespaces words io.binary math
+USING: compiler.generator.fixup kernel namespaces words
-math.order cpu.ppc.assembler.backend ;
+io.binary math math.order cpu.ppc.assembler.backend ;
 IN: cpu.ppc.assembler
 
 ! See the Motorola or IBM documentation for details. The opcode

basis/cpu/ppc/assembler/backend/backend.factor

@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: generator.fixup kernel namespaces sequences
+USING: compiler.generator.fixup kernel namespaces sequences
 words math math.bitfields io.binary parser lexer ;
 IN: cpu.ppc.assembler.backend
 

basis/cpu/ppc/bootstrap.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: bootstrap.image.private kernel kernel.private namespaces
-system cpu.ppc.assembler generator.fixup compiler.units
+system cpu.ppc.assembler compiler.generator.fixup compiler.units
 compiler.constants math math.private layouts words words.private
 vocabs slots.private ;
 IN: bootstrap.ppc

basis/cpu/ppc/intrinsics/intrinsics.factor

@@ -4,10 +4,10 @@ USING: accessors alien alien.accessors alien.c-types arrays
 cpu.ppc.assembler cpu.ppc.architecture cpu.ppc.allot
 cpu.architecture kernel kernel.private math math.private
 namespaces sequences words generic quotations byte-arrays
-hashtables hashtables.private generator generator.registers
+hashtables hashtables.private compiler.generator
-generator.fixup sequences.private sbufs vectors system layouts
+compiler.generator.registers generator.fixup sequences.private
-math.floats.private classes slots.private combinators
+sbufs vectors system layouts math.floats.private classes
-compiler.constants optimizer.allot ;
+slots.private combinators compiler.constants ;
 IN: cpu.ppc.intrinsics
 
 : %slot-literal-known-tag

basis/cpu/x86/32/32.factor

@@ -3,9 +3,10 @@
 USING: alien.c-types arrays cpu.x86.assembler
 cpu.x86.architecture cpu.x86.intrinsics cpu.x86.allot
 cpu.architecture kernel kernel.private math namespaces sequences
-generator.registers generator.fixup generator system layouts
+compiler.generator.registers compiler.generator.fixup
-alien.compiler combinators command-line
+compiler.generator system layouts alien.compiler combinators
-compiler compiler.units io vocabs.loader accessors init ;
+command-line compiler compiler.units io vocabs.loader accessors
+init ;
 IN: cpu.x86.32
 
 ! We implement the FFI for Linux, OS X and Windows all at once.

basis/cpu/x86/64/64.factor

@@ -3,9 +3,9 @@
 USING: accessors alien.c-types arrays cpu.x86.assembler
 cpu.x86.architecture cpu.x86.intrinsics cpu.x86.sse2
 cpu.x86.allot cpu.architecture kernel kernel.private math
-namespaces sequences generator.registers generator.fixup system
+namespaces sequences compiler.generator.registers
-layouts alien alien.accessors alien.compiler alien.structs slots
+compiler.generator.fixup system layouts alien alien.accessors
-splitting assocs ;
+alien.structs slots splitting assocs ;
 IN: cpu.x86.64
 
 M: x86.64 ds-reg R14 ;

basis/cpu/x86/allot/allot.factor

@@ -1,9 +1,9 @@
-! Copyright (C) 2006, 2007 Slava Pestov.
+! Copyright (C) 2006, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel cpu.architecture cpu.x86.assembler
-cpu.x86.architecture kernel.private namespaces math
+cpu.x86.architecture kernel.private namespaces math sequences
-sequences generic arrays generator generator.fixup
+generic arrays compiler.generator compiler.generator.fixup
-generator.registers system layouts alien ;
+compiler.generator.registers system layouts alien ;
 IN: cpu.x86.allot
 
 : allot-reg ( -- reg )

basis/cpu/x86/architecture/architecture.factor

@@ -1,10 +1,10 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien alien.c-types alien.compiler arrays
+USING: alien alien.c-types arrays cpu.x86.assembler
-cpu.x86.assembler cpu.x86.assembler.private cpu.architecture
+cpu.x86.assembler.private cpu.architecture kernel kernel.private
-kernel kernel.private math memory namespaces sequences words
+math memory namespaces sequences words generator
-generator generator.registers generator.fixup system layouts
+compiler.generator.registers compiler.generator.fixup system
-combinators compiler.constants math.order ;
+layouts combinators compiler.constants math.order ;
 IN: cpu.x86.architecture
 
 HOOK: ds-reg cpu ( -- reg )

basis/cpu/x86/assembler/assembler.factor

@@ -1,6 +1,6 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays generator.fixup io.binary kernel
+USING: arrays compiler.generator.fixup io.binary kernel
 combinators kernel.private math namespaces sequences
 words system layouts math.order accessors
 cpu.x86.assembler.syntax ;

basis/cpu/x86/bootstrap.factor

@@ -1,9 +1,9 @@
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: bootstrap.image.private kernel kernel.private namespaces
-system cpu.x86.assembler layouts compiler.units math math.private
+system cpu.x86.assembler layouts compiler.units math
-generator.fixup compiler.constants vocabs slots.private words
+math.private compiler.generator.fixup compiler.constants vocabs
-words.private ;
+slots.private words words.private ;
 IN: bootstrap.x86
 
 big-endian off

basis/cpu/x86/intrinsics/intrinsics.factor

@@ -4,9 +4,10 @@ USING: accessors alien alien.accessors arrays cpu.x86.assembler
 cpu.x86.allot cpu.x86.architecture cpu.architecture kernel
 kernel.private math math.private namespaces quotations sequences
 words generic byte-arrays hashtables hashtables.private
-generator generator.registers generator.fixup sequences.private
+compiler.generator compiler.generator.registers
-sbufs sbufs.private vectors vectors.private layouts system
+compiler.generator.fixup sequences.private sbufs sbufs.private
-strings.private slots.private compiler.constants optimizer.allot ;
+vectors vectors.private layouts system strings.private
+slots.private compiler.constants ;
 IN: cpu.x86.intrinsics
 
 ! Type checks

basis/cpu/x86/sse2/sse2.factor

@@ -1,10 +1,10 @@
-! Copyright (C) 2005, 2007 Slava Pestov.
+! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.accessors arrays cpu.x86.assembler
 cpu.x86.architecture cpu.x86.intrinsics generic kernel
 kernel.private math math.private memory namespaces sequences
-words generator generator.registers cpu.architecture
+words compiler.generator compiler.generator.registers
-math.floats.private layouts quotations ;
+cpu.architecture math.floats.private layouts quotations ;
 IN: cpu.x86.sse2
 
 : define-float-op ( word op -- )

basis/locals/backend/backend.factor

@@ -1,7 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: math kernel slots.private inference.known-words
+USING: math kernel slots.private sequences effects words ;
-inference.backend sequences effects words ;
 IN: locals.backend
 
 : load-locals ( n -- )
@@ -16,29 +15,3 @@ IN: locals.backend
 
 : drop-locals ( n -- )
     dup zero? [ drop ] [ r> drop 1- drop-locals ] if ;
-
-\ load-locals [
-    pop-literal nip
-    [ dup reverse <effect> infer-shuffle ]
-    [ infer->r ]
-    bi
-] "infer" set-word-prop
-
-\ get-local [
-    pop-literal nip
-    [ infer-r> ]
-    [ dup 0 prefix <effect> infer-shuffle ]
-    [ infer->r ]
-    tri
-] "infer" set-word-prop
-
-\ drop-locals [
-    pop-literal nip
-    [ infer-r> ]
-    [ { } <effect> infer-shuffle ] bi
-] "infer" set-word-prop
-
-<<
-{ load-locals get-local drop-locals }
-[ t "no-compile" set-word-prop ] each
->>

basis/locals/locals.factor

@@ -1,11 +1,11 @@
 ! Copyright (C) 2007, 2008 Slava Pestov, Eduardo Cavazos.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel namespaces sequences sequences.private assocs math
-inference.transforms parser words quotations debugger macros
+parser words quotations debugger macros arrays macros splitting
-arrays macros splitting combinators prettyprint.backend
+combinators prettyprint.backend definitions prettyprint
-definitions prettyprint hashtables prettyprint.sections sets
+hashtables prettyprint.sections sets sequences.private effects
-sequences.private effects effects.parser generic generic.parser
+effects.parser generic generic.parser compiler.units accessors
-compiler.units accessors locals.backend memoize lexer ;
+locals.backend memoize lexer ;
 IN: locals
 
 ! Inspired by

basis/macros/macros-tests.factor

@@ -13,5 +13,5 @@ unit-test
     [ \ see-test see ] with-string-writer =
 ] unit-test
 
-[ ] [ "USING: macros inference kernel ; IN: hanging-macro MACRO: c ( quot -- ) infer drop [ ] ; : a ( -- ) [ a ] c ;" eval ] unit-test
+[ ] [ "USING: macros stack-checker kernel ; IN: hanging-macro MACRO: c ( quot -- ) infer drop [ ] ; : a ( -- ) [ a ] c ;" eval ] unit-test
 

basis/macros/macros.factor

@@ -1,8 +1,8 @@
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: parser kernel sequences words effects
-inference.transforms combinators assocs definitions quotations
+stack-checker.transforms combinators assocs definitions
-namespaces memoize ;
+quotations namespaces memoize ;
 IN: macros
 
 : real-macro-effect ( word -- effect' )

basis/math/bitfields/bitfields.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays kernel math sequences words
-namespaces inference.transforms ;
+namespaces stack-checker.transforms ;
 IN: math.bitfields
 
 GENERIC: (bitfield) ( value accum shift -- newaccum )

basis/math/partial-dispatch/partial-dispatch-tests.factor

@@ -1,4 +1,4 @@
-IN: optimizer.math.partial.tests
+IN: math.partial-dispatch.tests
 USING: math.partial-dispatch tools.test math kernel sequences ;
 
 [ t ] [ \ + integer fixnum math-both-known? ] unit-test

basis/prettyprint/prettyprint.factor

@@ -58,11 +58,7 @@ IN: prettyprint
 
 : pprint ( obj -- ) [ pprint* ] with-pprint ;
 
-: . ( obj -- )
+: . ( obj -- ) pprint nl ;
-    H{
-       { length-limit 1000 }
-       { nesting-limit 10 }
-    } clone [ pprint ] bind nl ;
 
 : pprint-use ( obj -- ) [ pprint* ] with-use ;
 
@@ -128,7 +124,7 @@ PRIVATE>
 : callstack. ( callstack -- )
     callstack>array 2 <groups> [
         remove-breakpoints
-        2 nesting-limit [ . ] with-variable
+        3 nesting-limit [ . ] with-variable
     ] assoc-each ;
 
 : .c ( -- ) callstack callstack. ;

basis/stack-checker/stack-checker-tests.factor

@@ -9,16 +9,6 @@ threads.private io.streams.string io.timeouts io.thread
 sequences.private destructors combinators eval ;
 IN: stack-checker.tests
 
-: short-effect ( effect -- pair )
-    [ in>> length ] [ out>> length ] bi 2array ;
-
-: must-infer-as ( effect quot -- )
-    >r 1quotation r> [ infer short-effect ] curry unit-test ;
-
-: must-infer ( word/quot -- )
-    dup word? [ 1quotation ] when
-    [ infer drop ] curry [ ] swap unit-test ;
-
 \ infer. must-infer
 
 { 0 2 } [ 2 "Hello" ] must-infer-as

basis/tools/disassembler/disassembler.factor

@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io.files io words alien kernel math.parser alien.syntax
 io.launcher system assocs arrays sequences namespaces qualified
-system math generator.fixup io.encodings.ascii accessors
+system math compiler.generator.fixup io.encodings.ascii
-generic tr ;
+accessors generic tr ;
 IN: tools.disassembler
 
 : in-file ( -- path ) "gdb-in.txt" temp-file ;

basis/tools/test/test.factor

@@ -3,7 +3,7 @@
 USING: accessors namespaces arrays prettyprint sequences kernel
 vectors quotations words parser assocs combinators continuations
 debugger io io.styles io.files vocabs vocabs.loader source-files
-compiler.units summary inference effects tools.vocabs ;
+compiler.units summary stack-checker effects tools.vocabs ;
 IN: tools.test
 
 SYMBOL: failures

basis/ui/tools/operations/operations.factor

@@ -3,12 +3,12 @@
 USING: continuations definitions ui.tools.browser
 ui.tools.interactor ui.tools.listener ui.tools.profiler
 ui.tools.search ui.tools.traceback ui.tools.workspace generic
-help.topics inference summary inspector io.files io.styles kernel
+help.topics stack-checker summary inspector io.files io.styles
-namespaces parser prettyprint quotations tools.annotations
+kernel namespaces parser prettyprint quotations
-editors tools.profiler tools.test tools.time tools.walker
+tools.annotations editors tools.profiler tools.test tools.time
-ui.commands ui.gadgets.editors ui.gestures ui.operations
+tools.walker ui.commands ui.gadgets.editors ui.gestures
-ui.tools.deploy vocabs vocabs.loader words sequences
+ui.operations ui.tools.deploy vocabs vocabs.loader words
-tools.vocabs classes compiler.units accessors ;
+sequences tools.vocabs classes compiler.units accessors ;
 IN: ui.tools.operations
 
 V{ } clone operations set-global

basis/unix/unix.factor

@@ -4,7 +4,7 @@
 USING: alien alien.c-types alien.syntax kernel libc structs sequences
        continuations byte-arrays strings
        math namespaces system combinators vocabs.loader qualified
-       accessors inference macros locals generalizations 
+       accessors stack-checker macros locals generalizations 
        unix.types debugger io prettyprint ;
 
 IN: unix