From 48fa2e2d0e876039cc578feb27146823d72e038c Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Tue, 12 Aug 2008 03:31:48 -0500 Subject: [PATCH] Updating some code --- basis/bootstrap/compiler/compiler.factor | 12 +++++--- basis/cocoa/messages/messages.factor | 4 +-- .../short-circuit/smart/smart.factor | 2 +- basis/compiler/compiler-docs.factor | 2 +- basis/compiler/compiler.factor | 9 +++--- basis/compiler/tests/insane.factor | 2 +- basis/compiler/tests/templates-early.factor | 2 +- .../cpu/ppc/architecture/architecture.factor | 8 ++--- basis/cpu/ppc/assembler/assembler.factor | 4 +-- .../cpu/ppc/assembler/backend/backend.factor | 2 +- basis/cpu/ppc/bootstrap.factor | 2 +- basis/cpu/ppc/intrinsics/intrinsics.factor | 8 ++--- basis/cpu/x86/32/32.factor | 7 +++-- basis/cpu/x86/64/64.factor | 6 ++-- basis/cpu/x86/allot/allot.factor | 8 ++--- .../cpu/x86/architecture/architecture.factor | 10 +++---- basis/cpu/x86/assembler/assembler.factor | 2 +- basis/cpu/x86/bootstrap.factor | 6 ++-- basis/cpu/x86/intrinsics/intrinsics.factor | 7 +++-- basis/cpu/x86/sse2/sse2.factor | 6 ++-- basis/locals/backend/backend.factor | 29 +------------------ basis/locals/locals.factor | 10 +++---- basis/macros/macros-tests.factor | 2 +- basis/macros/macros.factor | 4 +-- basis/math/bitfields/bitfields.factor | 2 +- .../partial-dispatch-tests.factor | 2 +- basis/prettyprint/prettyprint.factor | 8 ++--- .../stack-checker/stack-checker-tests.factor | 10 ------- basis/tools/disassembler/disassembler.factor | 4 +-- basis/tools/test/test.factor | 2 +- basis/ui/tools/operations/operations.factor | 12 ++++---- basis/unix/unix.factor | 2 +- 32 files changed, 80 insertions(+), 116 deletions(-) diff --git a/basis/bootstrap/compiler/compiler.factor b/basis/bootstrap/compiler/compiler.factor index f25eafeb17..2ee4cf0644 100755 --- a/basis/bootstrap/compiler/compiler.factor +++ b/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 -classes.tuple.private growable namespaces.private assocs words -generator command-line vocabs io io.encodings.string -prettyprint libc compiler.units math.order ; +hashtables.private sequences.private math classes.tuple.private +growable namespaces.private assocs words command-line vocabs io +io.encodings.string 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 diff --git a/basis/cocoa/messages/messages.factor b/basis/cocoa/messages/messages.factor index 624a6d802b..5cc2b727df 100755 --- a/basis/cocoa/messages/messages.factor +++ b/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 -arrays assocs combinators compiler inference.transforms kernel +USING: alien alien.c-types alien.strings +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 ; diff --git a/basis/combinators/short-circuit/smart/smart.factor b/basis/combinators/short-circuit/smart/smart.factor index 2cef957a6f..141077ea3a 100644 --- a/basis/combinators/short-circuit/smart/smart.factor +++ b/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 diff --git a/basis/compiler/compiler-docs.factor b/basis/compiler/compiler-docs.factor index 870e4dbb2e..418aac6560 100755 --- a/basis/compiler/compiler-docs.factor +++ b/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 diff --git a/basis/compiler/compiler.factor b/basis/compiler/compiler.factor index 093b215013..9c0e9e1d82 100755 --- a/basis/compiler/compiler.factor +++ b/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 -inference.state generator debugger words compiler.units -continuations vocabs assocs alien.compiler dlists optimizer -definitions math compiler.errors threads graphs generic -inference combinators dequeues search-dequeues ; +USING: kernel namespaces arrays sequences io debugger words +compiler.units continuations vocabs assocs dlists definitions +math compiler.errors threads graphs generic combinators dequeues +search-dequeues ; IN: compiler SYMBOL: +failed+ diff --git a/basis/compiler/tests/insane.factor b/basis/compiler/tests/insane.factor index 79e17f7343..4c87f73722 100644 --- a/basis/compiler/tests/insane.factor +++ b/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 diff --git a/basis/compiler/tests/templates-early.factor b/basis/compiler/tests/templates-early.factor index 5a08ed0b5b..1c8c1dd839 100755 --- a/basis/compiler/tests/templates-early.factor +++ b/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 ; diff --git a/basis/cpu/ppc/architecture/architecture.factor b/basis/cpu/ppc/architecture/architecture.factor index 70345b1e96..0b570907ab 100755 --- a/basis/cpu/ppc/architecture/architecture.factor +++ b/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 -layouts classes words.private alien combinators -compiler.constants math.order ; +assocs compiler.generator compiler.generator.registers +compiler.generator.fixup system layouts classes words.private +alien combinators compiler.constants math.order ; IN: cpu.ppc.architecture ! PowerPC register assignments diff --git a/basis/cpu/ppc/assembler/assembler.factor b/basis/cpu/ppc/assembler/assembler.factor index fdd6e746c0..d7e71f6058 100755 --- a/basis/cpu/ppc/assembler/assembler.factor +++ b/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 -math.order cpu.ppc.assembler.backend ; +USING: compiler.generator.fixup kernel namespaces words +io.binary math math.order cpu.ppc.assembler.backend ; IN: cpu.ppc.assembler ! See the Motorola or IBM documentation for details. The opcode diff --git a/basis/cpu/ppc/assembler/backend/backend.factor b/basis/cpu/ppc/assembler/backend/backend.factor index 344b28a336..072f50520c 100644 --- a/basis/cpu/ppc/assembler/backend/backend.factor +++ b/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 diff --git a/basis/cpu/ppc/bootstrap.factor b/basis/cpu/ppc/bootstrap.factor index 49955d9f38..a0a13c989e 100755 --- a/basis/cpu/ppc/bootstrap.factor +++ b/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 diff --git a/basis/cpu/ppc/intrinsics/intrinsics.factor b/basis/cpu/ppc/intrinsics/intrinsics.factor index 4e1c3512af..bf990e1447 100755 --- a/basis/cpu/ppc/intrinsics/intrinsics.factor +++ b/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 -generator.fixup sequences.private sbufs vectors system layouts -math.floats.private classes slots.private combinators -compiler.constants optimizer.allot ; +hashtables hashtables.private compiler.generator +compiler.generator.registers generator.fixup sequences.private +sbufs vectors system layouts math.floats.private classes +slots.private combinators compiler.constants ; IN: cpu.ppc.intrinsics : %slot-literal-known-tag diff --git a/basis/cpu/x86/32/32.factor b/basis/cpu/x86/32/32.factor index c03d74c9a4..8a7413cfef 100755 --- a/basis/cpu/x86/32/32.factor +++ b/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 -alien.compiler combinators command-line -compiler compiler.units io vocabs.loader accessors init ; +compiler.generator.registers compiler.generator.fixup +compiler.generator system layouts alien.compiler combinators +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. diff --git a/basis/cpu/x86/64/64.factor b/basis/cpu/x86/64/64.factor index bdd452f83d..4528eb3edc 100755 --- a/basis/cpu/x86/64/64.factor +++ b/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 -layouts alien alien.accessors alien.compiler alien.structs slots -splitting assocs ; +namespaces sequences compiler.generator.registers +compiler.generator.fixup system layouts alien alien.accessors +alien.structs slots splitting assocs ; IN: cpu.x86.64 M: x86.64 ds-reg R14 ; diff --git a/basis/cpu/x86/allot/allot.factor b/basis/cpu/x86/allot/allot.factor index 144a9560d7..611531785e 100755 --- a/basis/cpu/x86/allot/allot.factor +++ b/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 -sequences generic arrays generator generator.fixup -generator.registers system layouts alien ; +cpu.x86.architecture kernel.private namespaces math sequences +generic arrays compiler.generator compiler.generator.fixup +compiler.generator.registers system layouts alien ; IN: cpu.x86.allot : allot-reg ( -- reg ) diff --git a/basis/cpu/x86/architecture/architecture.factor b/basis/cpu/x86/architecture/architecture.factor index 2a3d16694e..3aa9b22695 100755 --- a/basis/cpu/x86/architecture/architecture.factor +++ b/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 -cpu.x86.assembler cpu.x86.assembler.private cpu.architecture -kernel kernel.private math memory namespaces sequences words -generator generator.registers generator.fixup system layouts -combinators compiler.constants math.order ; +USING: alien alien.c-types arrays cpu.x86.assembler +cpu.x86.assembler.private cpu.architecture kernel kernel.private +math memory namespaces sequences words generator +compiler.generator.registers compiler.generator.fixup system +layouts combinators compiler.constants math.order ; IN: cpu.x86.architecture HOOK: ds-reg cpu ( -- reg ) diff --git a/basis/cpu/x86/assembler/assembler.factor b/basis/cpu/x86/assembler/assembler.factor index f8e0b0abb0..d9c25d8492 100755 --- a/basis/cpu/x86/assembler/assembler.factor +++ b/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 ; diff --git a/basis/cpu/x86/bootstrap.factor b/basis/cpu/x86/bootstrap.factor index 76a42b3f2d..026578b377 100755 --- a/basis/cpu/x86/bootstrap.factor +++ b/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 -generator.fixup compiler.constants vocabs slots.private words -words.private ; +system cpu.x86.assembler layouts compiler.units math +math.private compiler.generator.fixup compiler.constants vocabs +slots.private words words.private ; IN: bootstrap.x86 big-endian off diff --git a/basis/cpu/x86/intrinsics/intrinsics.factor b/basis/cpu/x86/intrinsics/intrinsics.factor index 3cf131087e..f69be2edfd 100755 --- a/basis/cpu/x86/intrinsics/intrinsics.factor +++ b/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 -sbufs sbufs.private vectors vectors.private layouts system -strings.private slots.private compiler.constants optimizer.allot ; +compiler.generator compiler.generator.registers +compiler.generator.fixup sequences.private sbufs sbufs.private +vectors vectors.private layouts system strings.private +slots.private compiler.constants ; IN: cpu.x86.intrinsics ! Type checks diff --git a/basis/cpu/x86/sse2/sse2.factor b/basis/cpu/x86/sse2/sse2.factor index fb96649753..59a9a83ab3 100755 --- a/basis/cpu/x86/sse2/sse2.factor +++ b/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 -math.floats.private layouts quotations ; +words compiler.generator compiler.generator.registers +cpu.architecture math.floats.private layouts quotations ; IN: cpu.x86.sse2 : define-float-op ( word op -- ) diff --git a/basis/locals/backend/backend.factor b/basis/locals/backend/backend.factor index fd24631171..27772d19d0 100644 --- a/basis/locals/backend/backend.factor +++ b/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 -inference.backend sequences effects words ; +USING: math kernel slots.private 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 infer-shuffle ] - [ infer->r ] - bi -] "infer" set-word-prop - -\ get-local [ - pop-literal nip - [ infer-r> ] - [ dup 0 prefix infer-shuffle ] - [ infer->r ] - tri -] "infer" set-word-prop - -\ drop-locals [ - pop-literal nip - [ infer-r> ] - [ { } infer-shuffle ] bi -] "infer" set-word-prop - -<< -{ load-locals get-local drop-locals } -[ t "no-compile" set-word-prop ] each ->> diff --git a/basis/locals/locals.factor b/basis/locals/locals.factor index f80af233d7..1858be11a8 100755 --- a/basis/locals/locals.factor +++ b/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 -arrays macros splitting combinators prettyprint.backend -definitions prettyprint hashtables prettyprint.sections sets -sequences.private effects effects.parser generic generic.parser -compiler.units accessors locals.backend memoize lexer ; +parser words quotations debugger macros arrays macros splitting +combinators prettyprint.backend definitions prettyprint +hashtables prettyprint.sections sets sequences.private effects +effects.parser generic generic.parser compiler.units accessors +locals.backend memoize lexer ; IN: locals ! Inspired by diff --git a/basis/macros/macros-tests.factor b/basis/macros/macros-tests.factor index 150fd9eeaa..7b061ab2f5 100644 --- a/basis/macros/macros-tests.factor +++ b/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 diff --git a/basis/macros/macros.factor b/basis/macros/macros.factor index 17610f016a..7e85b0b194 100755 --- a/basis/macros/macros.factor +++ b/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 -namespaces memoize ; +stack-checker.transforms combinators assocs definitions +quotations namespaces memoize ; IN: macros : real-macro-effect ( word -- effect' ) diff --git a/basis/math/bitfields/bitfields.factor b/basis/math/bitfields/bitfields.factor index 64ae60d5b3..6e859eb205 100644 --- a/basis/math/bitfields/bitfields.factor +++ b/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 ) diff --git a/basis/math/partial-dispatch/partial-dispatch-tests.factor b/basis/math/partial-dispatch/partial-dispatch-tests.factor index 92a5b849a4..64605b1818 100644 --- a/basis/math/partial-dispatch/partial-dispatch-tests.factor +++ b/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 diff --git a/basis/prettyprint/prettyprint.factor b/basis/prettyprint/prettyprint.factor index f78d12a310..49881f2e9f 100755 --- a/basis/prettyprint/prettyprint.factor +++ b/basis/prettyprint/prettyprint.factor @@ -58,11 +58,7 @@ IN: prettyprint : pprint ( obj -- ) [ pprint* ] with-pprint ; -: . ( obj -- ) - H{ - { length-limit 1000 } - { nesting-limit 10 } - } clone [ pprint ] bind nl ; +: . ( obj -- ) pprint nl ; : pprint-use ( obj -- ) [ pprint* ] with-use ; @@ -128,7 +124,7 @@ PRIVATE> : callstack. ( callstack -- ) callstack>array 2 [ remove-breakpoints - 2 nesting-limit [ . ] with-variable + 3 nesting-limit [ . ] with-variable ] assoc-each ; : .c ( -- ) callstack callstack. ; diff --git a/basis/stack-checker/stack-checker-tests.factor b/basis/stack-checker/stack-checker-tests.factor index 3c7ae101e3..5d0ac42919 100755 --- a/basis/stack-checker/stack-checker-tests.factor +++ b/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 diff --git a/basis/tools/disassembler/disassembler.factor b/basis/tools/disassembler/disassembler.factor index 4a345e2345..887fd1b6d7 100755 --- a/basis/tools/disassembler/disassembler.factor +++ b/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 -generic tr ; +system math compiler.generator.fixup io.encodings.ascii +accessors generic tr ; IN: tools.disassembler : in-file ( -- path ) "gdb-in.txt" temp-file ; diff --git a/basis/tools/test/test.factor b/basis/tools/test/test.factor index 025ee9d696..b2b13a82a8 100755 --- a/basis/tools/test/test.factor +++ b/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 diff --git a/basis/ui/tools/operations/operations.factor b/basis/ui/tools/operations/operations.factor index 672320ff17..e3c3d46904 100755 --- a/basis/ui/tools/operations/operations.factor +++ b/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 -namespaces parser prettyprint quotations tools.annotations -editors tools.profiler tools.test tools.time tools.walker -ui.commands ui.gadgets.editors ui.gestures ui.operations -ui.tools.deploy vocabs vocabs.loader words sequences -tools.vocabs classes compiler.units accessors ; +help.topics stack-checker summary inspector io.files io.styles +kernel namespaces parser prettyprint quotations +tools.annotations editors tools.profiler tools.test tools.time +tools.walker ui.commands ui.gadgets.editors ui.gestures +ui.operations ui.tools.deploy vocabs vocabs.loader words +sequences tools.vocabs classes compiler.units accessors ; IN: ui.tools.operations V{ } clone operations set-global diff --git a/basis/unix/unix.factor b/basis/unix/unix.factor index 083700493d..8842687671 100755 --- a/basis/unix/unix.factor +++ b/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