From 701d1823b51a00623552983572cf5792f2317d4e Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Wed, 22 Jun 2016 09:13:54 -0700 Subject: [PATCH] factor: in: -> IN: --- collections/specialized-arrays/specialized-arrays-docs.factor | 2 +- .../specialized-arrays/specialized-arrays-tests.factor | 2 +- collections/specialized-arrays/specialized-arrays.factor | 2 +- .../specialized-vectors/specialized-vectors-docs.factor | 2 +- .../specialized-vectors/specialized-vectors-tests.factor | 2 +- collections/specialized-vectors/specialized-vectors.factor | 2 +- core/bootstrap/primitives-docs.factor | 2 +- core/bootstrap/primitives.factor | 2 +- core/bootstrap/stage1.factor | 2 +- core/io/test/no-trailing-eol.factor | 2 +- core/modern/paths/paths.factor | 2 +- language/bootstrap/assembler/ppc.32.linux.factor | 2 +- language/bootstrap/assembler/ppc.64.linux.factor | 2 +- language/bootstrap/assembler/ppc.factor | 2 +- language/bootstrap/assembler/x86.32.factor | 2 +- language/bootstrap/assembler/x86.32.unix.factor | 2 +- language/bootstrap/assembler/x86.32.windows.factor | 2 +- language/bootstrap/assembler/x86.64.factor | 2 +- language/bootstrap/assembler/x86.64.unix.factor | 2 +- language/bootstrap/assembler/x86.64.windows.factor | 2 +- language/bootstrap/assembler/x86.factor | 2 +- language/bootstrap/assembler/x86.unix.factor | 2 +- language/bootstrap/assembler/x86.windows.factor | 2 +- language/bootstrap/stage2.factor | 2 +- .../cfg/value-numbering/comparisons/comarisons-docs.factor | 2 +- language/compiler/tests/alien.factor | 2 +- language/compiler/tests/call-effect.factor | 2 +- language/compiler/tests/callback-error.factor | 2 +- language/compiler/tests/callstack-overflow.factor | 2 +- language/compiler/tests/codegen.factor | 2 +- language/compiler/tests/curry.factor | 2 +- language/compiler/tests/dead-code.factor | 2 +- language/compiler/tests/float.factor | 2 +- language/compiler/tests/folding.factor | 2 +- language/compiler/tests/intrinsics.factor | 2 +- language/compiler/tests/linkage-errors.factor | 2 +- language/compiler/tests/low-level-ir.factor | 2 +- language/compiler/tests/optimizer.factor | 2 +- language/compiler/tests/peg-regression-2.factor | 2 +- language/compiler/tests/peg-regression.factor | 2 +- language/compiler/tests/pic-problem-1.factor | 2 +- language/compiler/tests/redefine0.factor | 2 +- language/compiler/tests/redefine1.factor | 2 +- language/compiler/tests/redefine10.factor | 2 +- language/compiler/tests/redefine11.factor | 2 +- language/compiler/tests/redefine12.factor | 2 +- language/compiler/tests/redefine13.factor | 2 +- language/compiler/tests/redefine14.factor | 2 +- language/compiler/tests/redefine15.factor | 2 +- language/compiler/tests/redefine16.factor | 2 +- language/compiler/tests/redefine17.factor | 2 +- language/compiler/tests/redefine19.factor | 2 +- language/compiler/tests/redefine20.factor | 2 +- language/compiler/tests/redefine21.factor | 2 +- language/compiler/tests/redefine22.factor | 2 +- language/compiler/tests/redefine23.factor | 2 +- language/compiler/tests/redefine24.factor | 2 +- language/compiler/tests/redefine25.factor | 2 +- language/compiler/tests/redefine26.factor | 2 +- language/compiler/tests/redefine4.factor | 2 +- language/compiler/tests/redefine5.factor | 2 +- language/compiler/tests/redefine6.factor | 2 +- language/compiler/tests/redefine7.factor | 2 +- language/compiler/tests/redefine8.factor | 2 +- language/compiler/tests/redefine9.factor | 2 +- language/compiler/tests/reload.factor | 2 +- language/compiler/tests/simple.factor | 2 +- language/compiler/tests/spilling.factor | 2 +- language/compiler/tests/stack-trace.factor | 2 +- language/compiler/tests/tuples.factor | 2 +- language/compiler/tests/x87-regression.factor | 2 +- language/io/pipes/unix/pipes-tests.factor | 2 +- language/multi-methods/tests/canonicalize.factor | 2 +- language/multi-methods/tests/definitions.factor | 2 +- language/multi-methods/tests/legacy.factor | 2 +- language/multi-methods/tests/syntax.factor | 2 +- language/multi-methods/tests/topological-sort.factor | 2 +- libs/fjsc/resources/bootstrap.factor | 2 +- libs/math/blas/matrices/matrices-docs.factor | 2 +- libs/math/blas/matrices/matrices-tests.factor | 2 +- libs/math/blas/matrices/matrices.factor | 2 +- libs/math/blas/vectors/vectors-docs.factor | 2 +- libs/math/blas/vectors/vectors-tests.factor | 2 +- libs/math/blas/vectors/vectors.factor | 2 +- libs/math/vectors/simd/cords/cords-tests.factor | 2 +- libs/math/vectors/simd/cords/cords.factor | 2 +- libs/math/vectors/simd/simd-docs.factor | 2 +- libs/math/vectors/simd/simd-tests.factor | 2 +- libs/math/vectors/simd/simd.factor | 2 +- libs/xml/tests/cdata.factor | 2 +- libs/xml/tests/funny-dtd.factor | 2 +- libs/xml/tests/soap.factor | 2 +- libs/xml/tests/state-parser-tests.factor | 2 +- libs/xml/tests/templating.factor | 2 +- libs/xml/tests/test.factor | 2 +- libs/xml/tests/xmltest.factor | 2 +- libs/xml/tests/xmode-dtd.factor | 2 +- libs/zeromq/examples/echo-client.factor | 2 +- libs/zeromq/examples/echo-server.factor | 2 +- libs/zeromq/examples/hwclient.factor | 2 +- libs/zeromq/examples/hwserver.factor | 2 +- libs/zeromq/examples/tasksink.factor | 2 +- libs/zeromq/examples/taskvent.factor | 2 +- libs/zeromq/examples/taskwork.factor | 2 +- libs/zeromq/examples/wuclient.factor | 2 +- libs/zeromq/examples/wuserver.factor | 2 +- tools/graphviz/builder/builder-docs.factor | 2 +- tools/tools/deploy/shaker/next-methods.factor | 2 +- tools/tools/deploy/shaker/strip-call.factor | 4 ++-- tools/tools/deploy/shaker/strip-cocoa.factor | 2 +- tools/tools/deploy/shaker/strip-debugger.factor | 2 +- tools/tools/deploy/shaker/strip-destructors.factor | 2 +- tools/tools/deploy/shaker/strip-gtk-icon.factor | 2 +- tools/tools/deploy/shaker/strip-libc.factor | 2 +- tools/tools/deploy/shaker/strip-specialized-arrays.factor | 2 +- 115 files changed, 116 insertions(+), 116 deletions(-) diff --git a/collections/specialized-arrays/specialized-arrays-docs.factor b/collections/specialized-arrays/specialized-arrays-docs.factor index efe3ab63ac..3c6230af96 100644 --- a/collections/specialized-arrays/specialized-arrays-docs.factor +++ b/collections/specialized-arrays/specialized-arrays-docs.factor @@ -1,5 +1,5 @@ USING: help.markup help.syntax byte-arrays alien math sequences ; -in: specialized-arrays +IN: specialized-arrays HELP: \ specialized-array: { $syntax "specialized-array: type" } diff --git a/collections/specialized-arrays/specialized-arrays-tests.factor b/collections/specialized-arrays/specialized-arrays-tests.factor index 2dc90166d7..190ed77177 100644 --- a/collections/specialized-arrays/specialized-arrays-tests.factor +++ b/collections/specialized-arrays/specialized-arrays-tests.factor @@ -8,7 +8,7 @@ FROM: specialized-arrays.private => specialized-array-vocab ; FROM: alien.c-types => int float bool uchar char float ulonglong ushort uint heap-size ; FROM: alien.data => little-endian? ; -in: specialized-arrays.tests +IN: specialized-arrays.tests specialized-array: int SPECIALIZED-ARRAYS: bool uchar ushort char uint float ulonglong ; diff --git a/collections/specialized-arrays/specialized-arrays.factor b/collections/specialized-arrays/specialized-arrays.factor index 811a0a841b..d17b9a3e18 100644 --- a/collections/specialized-arrays/specialized-arrays.factor +++ b/collections/specialized-arrays/specialized-arrays.factor @@ -5,7 +5,7 @@ byte-arrays classes combinators fry functors kernel lexer locals make math math.vectors parser prettyprint.custom sequences sequences.private vocabs.generated vocabs.loader vocabs.parser words ; -in: specialized-arrays +IN: specialized-arrays mixin: specialized-array diff --git a/collections/specialized-vectors/specialized-vectors-docs.factor b/collections/specialized-vectors/specialized-vectors-docs.factor index 77aa1fe9ad..170a02e1ef 100644 --- a/collections/specialized-vectors/specialized-vectors-docs.factor +++ b/collections/specialized-vectors/specialized-vectors-docs.factor @@ -1,5 +1,5 @@ USING: help.markup help.syntax byte-vectors alien byte-arrays classes.struct ; -in: specialized-vectors +IN: specialized-vectors HELP: \ specialized-vector: { $syntax "specialized-vector: type" } diff --git a/collections/specialized-vectors/specialized-vectors-tests.factor b/collections/specialized-vectors/specialized-vectors-tests.factor index 7f010cbe4a..532f822e7f 100644 --- a/collections/specialized-vectors/specialized-vectors-tests.factor +++ b/collections/specialized-vectors/specialized-vectors-tests.factor @@ -1,4 +1,4 @@ -in: specialized-vectors.tests +IN: specialized-vectors.tests USING: specialized-arrays specialized-vectors tools.test kernel sequences alien.c-types ; specialized-array: float diff --git a/collections/specialized-vectors/specialized-vectors.factor b/collections/specialized-vectors/specialized-vectors.factor index 5baf1f7d3a..b1e6ee3270 100644 --- a/collections/specialized-vectors/specialized-vectors.factor +++ b/collections/specialized-vectors/specialized-vectors.factor @@ -7,7 +7,7 @@ vocabs.loader vocabs.parser ; FROM: sequences.private => nth-unsafe ; FROM: specialized-arrays.private => nth-c-ptr direct-like ; qualified: vectors.functor -in: specialized-vectors +IN: specialized-vectors mixin: specialized-vector diff --git a/core/bootstrap/primitives-docs.factor b/core/bootstrap/primitives-docs.factor index 624bfd4642..4cf3413666 100644 --- a/core/bootstrap/primitives-docs.factor +++ b/core/bootstrap/primitives-docs.factor @@ -1,5 +1,5 @@ USING: bootstrap.image.private effects help.markup help.syntax strings ; -in: bootstrap.primitives +IN: bootstrap.primitives ARTICLE: "bootstrap.primitives" "Bootstrap primitives" "A script file run to create the bootstrap image. Also see the vocab " { $link "bootstrap.image.primitives" } "." ; diff --git a/core/bootstrap/primitives.factor b/core/bootstrap/primitives.factor index 2bb4922bb9..4ba2cf5079 100755 --- a/core/bootstrap/primitives.factor +++ b/core/bootstrap/primitives.factor @@ -7,7 +7,7 @@ classes.tuple.private classes.union combinators compiler.units io kernel kernel.private layouts make math math.private namespaces parser quotations sequences slots source-files splitting vocabs vocabs.loader words ; -in: bootstrap.primitives +IN: bootstrap.primitives "* Creating primitives and basic runtime structures..." print flush diff --git a/core/bootstrap/stage1.factor b/core/bootstrap/stage1.factor index cdbbc0de76..5f19341d6d 100644 --- a/core/bootstrap/stage1.factor +++ b/core/bootstrap/stage1.factor @@ -5,7 +5,7 @@ hashtables.wrapped init io io.files kernel kernel.private make memory namespaces parser parser.notes sequences system vocabs vocabs.loader vocabs.hierarchy ; qualified: bootstrap.image.private -in: bootstrap.stage1 +IN: bootstrap.stage1 "Bootstrap stage 1..." print flush diff --git a/core/io/test/no-trailing-eol.factor b/core/io/test/no-trailing-eol.factor index 7005181525..63d91d9ebb 100644 --- a/core/io/test/no-trailing-eol.factor +++ b/core/io/test/no-trailing-eol.factor @@ -1,4 +1,4 @@ -in: io.tests +IN: io.tests use: math : foo ( -- x ) 2 2 + ; forget: foo diff --git a/core/modern/paths/paths.factor b/core/modern/paths/paths.factor index 87d9927d56..82f5bbf19a 100644 --- a/core/modern/paths/paths.factor +++ b/core/modern/paths/paths.factor @@ -3,7 +3,7 @@ USING: accessors combinators.smart io.directories.search io.files kernel namespaces sequences sets splitting vocabs.files vocabs.hierarchy vocabs.loader vocabs.metadata ; -in: modern.paths +IN: modern.paths : vocabs-from ( root -- vocabs ) "" disk-vocabs-in-root/prefix diff --git a/language/bootstrap/assembler/ppc.32.linux.factor b/language/bootstrap/assembler/ppc.32.linux.factor index 340222a822..e09f3625da 100644 --- a/language/bootstrap/assembler/ppc.32.linux.factor +++ b/language/bootstrap/assembler/ppc.32.linux.factor @@ -3,7 +3,7 @@ USING: parser system kernel sequences math math.ranges cpu.ppc.assembler combinators compiler.constants bootstrap.image.private layouts namespaces ; -in: bootstrap.ppc +IN: bootstrap.ppc 4 \ cell set big-endian on diff --git a/language/bootstrap/assembler/ppc.64.linux.factor b/language/bootstrap/assembler/ppc.64.linux.factor index 2dec2908c5..a3653dd697 100644 --- a/language/bootstrap/assembler/ppc.64.linux.factor +++ b/language/bootstrap/assembler/ppc.64.linux.factor @@ -3,7 +3,7 @@ USING: parser system kernel sequences math math.ranges cpu.ppc.assembler combinators compiler.constants bootstrap.image.private layouts namespaces ; -in: bootstrap.ppc +IN: bootstrap.ppc 8 \ cell set big-endian on diff --git a/language/bootstrap/assembler/ppc.factor b/language/bootstrap/assembler/ppc.factor index b5db7c1c16..09bbe19d57 100644 --- a/language/bootstrap/assembler/ppc.factor +++ b/language/bootstrap/assembler/ppc.factor @@ -6,7 +6,7 @@ math.private math.ranges layouts words vocabs slots.private locals locals.backend generic.single.private fry sequences threads.private strings.private ; FROM: cpu.ppc.assembler => B ; -in: bootstrap.ppc +IN: bootstrap.ppc : jit-call ( string -- ) dup diff --git a/language/bootstrap/assembler/x86.32.factor b/language/bootstrap/assembler/x86.32.factor index c8cc306441..3926645359 100644 --- a/language/bootstrap/assembler/x86.32.factor +++ b/language/bootstrap/assembler/x86.32.factor @@ -4,7 +4,7 @@ USING: bootstrap.image.private compiler.codegen.relocation compiler.constants cpu.x86.assembler cpu.x86.assembler.operands generic.single.private kernel kernel.private layouts locals math math.private namespaces threads.private ; -in: bootstrap.x86 +IN: bootstrap.x86 4 \ cell set diff --git a/language/bootstrap/assembler/x86.32.unix.factor b/language/bootstrap/assembler/x86.32.unix.factor index 84d1c943b1..e5206dbed2 100644 --- a/language/bootstrap/assembler/x86.32.unix.factor +++ b/language/bootstrap/assembler/x86.32.unix.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2010 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: kernel parser sequences ; -in: bootstrap.x86 +IN: bootstrap.x86 COMPILE< "vocab:bootstrap/assembler/x86.unix.factor" parse-file suffix! COMPILE> call COMPILE< "vocab:bootstrap/assembler/x86.32.factor" parse-file suffix! COMPILE> call diff --git a/language/bootstrap/assembler/x86.32.windows.factor b/language/bootstrap/assembler/x86.32.windows.factor index 88193d4c4c..563109b893 100644 --- a/language/bootstrap/assembler/x86.32.windows.factor +++ b/language/bootstrap/assembler/x86.32.windows.factor @@ -3,7 +3,7 @@ USING: compiler.codegen.relocation compiler.constants cpu.x86.assembler cpu.x86.assembler.operands kernel kernel.private layouts locals parser sequences ; -in: bootstrap.x86 +IN: bootstrap.x86 : tib-segment ( -- ) FS ; : tib-temp ( -- reg ) EAX ; diff --git a/language/bootstrap/assembler/x86.64.factor b/language/bootstrap/assembler/x86.64.factor index 312bd4f29e..5fb01a89da 100644 --- a/language/bootstrap/assembler/x86.64.factor +++ b/language/bootstrap/assembler/x86.64.factor @@ -4,7 +4,7 @@ USING: bootstrap.image.private compiler.codegen.relocation compiler.constants cpu.x86.assembler cpu.x86.assembler.operands generic.single.private kernel kernel.private layouts locals math math.private namespaces threads.private ; -in: bootstrap.x86 +IN: bootstrap.x86 8 \ cell set diff --git a/language/bootstrap/assembler/x86.64.unix.factor b/language/bootstrap/assembler/x86.64.unix.factor index f6d99a8c43..6d42712c96 100644 --- a/language/bootstrap/assembler/x86.64.unix.factor +++ b/language/bootstrap/assembler/x86.64.unix.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: cpu.x86.assembler.operands kernel layouts parser sequences ; -in: bootstrap.x86 +IN: bootstrap.x86 : stack-frame-size ( -- n ) 4 bootstrap-cells ; : nv-regs ( -- seq ) { RBX R12 R13 R14 R15 } ; diff --git a/language/bootstrap/assembler/x86.64.windows.factor b/language/bootstrap/assembler/x86.64.windows.factor index 744e348a9f..152395f24a 100644 --- a/language/bootstrap/assembler/x86.64.windows.factor +++ b/language/bootstrap/assembler/x86.64.windows.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: cpu.x86.assembler cpu.x86.assembler.operands kernel layouts parser sequences ; -in: bootstrap.x86 +IN: bootstrap.x86 defer: stack-reg diff --git a/language/bootstrap/assembler/x86.factor b/language/bootstrap/assembler/x86.factor index b73a32817c..c53f463ee9 100644 --- a/language/bootstrap/assembler/x86.factor +++ b/language/bootstrap/assembler/x86.factor @@ -5,7 +5,7 @@ compiler.constants compiler.units cpu.x86.assembler cpu.x86.assembler.operands kernel kernel.private layouts locals locals.backend math math.private memory namespaces sequences slots.private strings.private vocabs ; -in: bootstrap.x86 +IN: bootstrap.x86 : temp0/32 ( -- reg ) temp0 32-bit-version-of ; diff --git a/language/bootstrap/assembler/x86.unix.factor b/language/bootstrap/assembler/x86.unix.factor index 66ced46887..ef411b1cba 100644 --- a/language/bootstrap/assembler/x86.unix.factor +++ b/language/bootstrap/assembler/x86.unix.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: cpu.x86.assembler cpu.x86.assembler.operands kernel layouts ; -in: bootstrap.x86 +IN: bootstrap.x86 defer: stack-reg diff --git a/language/bootstrap/assembler/x86.windows.factor b/language/bootstrap/assembler/x86.windows.factor index fdbae0b76c..abc6cfa34f 100644 --- a/language/bootstrap/assembler/x86.windows.factor +++ b/language/bootstrap/assembler/x86.windows.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: compiler.constants cpu.x86.assembler cpu.x86.assembler.operands layouts locals ; -in: bootstrap.x86 +IN: bootstrap.x86 : tib-exception-list-offset ( -- n ) 0 bootstrap-cells ; : tib-stack-base-offset ( -- n ) 1 bootstrap-cells ; diff --git a/language/bootstrap/stage2.factor b/language/bootstrap/stage2.factor index 0694d736e2..6aa81244a1 100644 --- a/language/bootstrap/stage2.factor +++ b/language/bootstrap/stage2.factor @@ -4,7 +4,7 @@ USING: command-line compiler.units continuations definitions io io.pathnames kernel math math.parser memory namespaces parser parser.notes sequences sets splitting system combinators vocabs vocabs.loader ; -in: bootstrap.stage2 +IN: bootstrap.stage2 symbol: core-bootstrap-time diff --git a/language/compiler/cfg/value-numbering/comparisons/comarisons-docs.factor b/language/compiler/cfg/value-numbering/comparisons/comarisons-docs.factor index 3b56aae58a..0ad4064843 100644 --- a/language/compiler/cfg/value-numbering/comparisons/comarisons-docs.factor +++ b/language/compiler/cfg/value-numbering/comparisons/comarisons-docs.factor @@ -1,5 +1,5 @@ USING: compiler.cfg.instructions help.markup help.syntax kernel ; -in: compiler.cfg.value-numbering.comparisons +IN: compiler.cfg.value-numbering.comparisons HELP: >test-branch { $values { "insn" insn } { "insn'" ##test-branch } } diff --git a/language/compiler/tests/alien.factor b/language/compiler/tests/alien.factor index 8301d9c56b..6799f818f3 100755 --- a/language/compiler/tests/alien.factor +++ b/language/compiler/tests/alien.factor @@ -9,7 +9,7 @@ system threads tools.test words ; FROM: alien.c-types => float short ; specialized-array: float specialized-array: char -in: compiler.tests.alien +IN: compiler.tests.alien ! Make sure that invalid inputs don't pass the stack checker [ [ void { } "cdecl" alien-indirect ] infer ] must-fail diff --git a/language/compiler/tests/call-effect.factor b/language/compiler/tests/call-effect.factor index 8d7b818f6e..f90897bc9b 100644 --- a/language/compiler/tests/call-effect.factor +++ b/language/compiler/tests/call-effect.factor @@ -1,5 +1,5 @@ USING: tools.test combinators generic.single sequences kernel ; -in: compiler.tests.call-effect +IN: compiler.tests.call-effect : execute-ic-test ( a b -- c ) execute( a -- c ) ; diff --git a/language/compiler/tests/callback-error.factor b/language/compiler/tests/callback-error.factor index 10f16c52eb..8cb43a9b94 100644 --- a/language/compiler/tests/callback-error.factor +++ b/language/compiler/tests/callback-error.factor @@ -1,6 +1,6 @@ USING: accessors io io.encodings.ascii io.files io.files.temp io.launcher kernel make sequences system tools.test ; -in: compiler.tests.callback-error +IN: compiler.tests.callback-error : callback-error-script ( -- path ) "callback-error-script" temp-file ; diff --git a/language/compiler/tests/callstack-overflow.factor b/language/compiler/tests/callstack-overflow.factor index 0ca97e5aa1..4cef5da782 100644 --- a/language/compiler/tests/callstack-overflow.factor +++ b/language/compiler/tests/callstack-overflow.factor @@ -2,7 +2,7 @@ USING: accessors classes.struct continuations kernel kernel.private literals math memory sequences system threads.private tools.dispatch.private tools.test ; qualified: vm -in: compiler.tests.callstack-overflow +IN: compiler.tests.callstack-overflow ! This test file is for all callstack overflow-related problems. diff --git a/language/compiler/tests/codegen.factor b/language/compiler/tests/codegen.factor index 7bf26ebfb5..568b191e27 100644 --- a/language/compiler/tests/codegen.factor +++ b/language/compiler/tests/codegen.factor @@ -8,7 +8,7 @@ math.libm math.parser math.functions alien.syntax memory stack-checker ; FROM: math => float ; qualified: namespaces.private -in: compiler.tests.codegen +IN: compiler.tests.codegen ! Originally, this file did black box testing of templating ! optimization. We now have a different codegen, but the tests diff --git a/language/compiler/tests/curry.factor b/language/compiler/tests/curry.factor index 3eabd1bd60..6a2c9ad1ec 100644 --- a/language/compiler/tests/curry.factor +++ b/language/compiler/tests/curry.factor @@ -1,7 +1,7 @@ USING: tools.test quotations math kernel sequences assocs namespaces make compiler.units compiler.test locals random ; -in: compiler.tests.curry +IN: compiler.tests.curry [ 3 ] [ 5 [ [ 2 - ] curry call ] compile-call ] unit-test [ 3 ] [ [ 5 [ 2 - ] curry call ] compile-call ] unit-test diff --git a/language/compiler/tests/dead-code.factor b/language/compiler/tests/dead-code.factor index 805ff80458..293d76d2c4 100644 --- a/language/compiler/tests/dead-code.factor +++ b/language/compiler/tests/dead-code.factor @@ -1,6 +1,6 @@ USING: kernel math tools.test ; -in: compiler.tests.dead-code +IN: compiler.tests.dead-code : test-outputs0 ( a b -- ) /mod 2drop ; : test-outputs1 ( a b -- ) /i drop ; diff --git a/language/compiler/tests/float.factor b/language/compiler/tests/float.factor index 989d8b3b37..ea63772099 100644 --- a/language/compiler/tests/float.factor +++ b/language/compiler/tests/float.factor @@ -4,7 +4,7 @@ specialized-arrays sequences math.functions layouts literals ; QUALIFIED-WITH: alien.c-types c ; specialized-array: c:float specialized-array: c:double -in: compiler.tests.float +IN: compiler.tests.float [ 3.0 1 2 3 ] [ 1.0 2.0 [ float+ 1 2 3 ] compile-call ] unit-test diff --git a/language/compiler/tests/folding.factor b/language/compiler/tests/folding.factor index 5cbb6e0903..2440ca62b7 100644 --- a/language/compiler/tests/folding.factor +++ b/language/compiler/tests/folding.factor @@ -1,6 +1,6 @@ USING: eval tools.test compiler.units vocabs words kernel classes.mixin arrays ; -in: compiler.tests.folding +IN: compiler.tests.folding ! Calls to generic words were not folded away. diff --git a/language/compiler/tests/intrinsics.factor b/language/compiler/tests/intrinsics.factor index e3a734e2d1..2563108d5a 100644 --- a/language/compiler/tests/intrinsics.factor +++ b/language/compiler/tests/intrinsics.factor @@ -8,7 +8,7 @@ namespaces libc io.encodings.ascii classes compiler.test ; FROM: math => float ; FROM: alien.c-types => short ; QUALIFIED-WITH: alien.c-types c ; -in: compiler.tests.intrinsics +IN: compiler.tests.intrinsics ! Make sure that intrinsic ops compile to correct code. [ ] [ 1 [ drop ] compile-call ] unit-test diff --git a/language/compiler/tests/linkage-errors.factor b/language/compiler/tests/linkage-errors.factor index ce288129f1..07b3a2065d 100644 --- a/language/compiler/tests/linkage-errors.factor +++ b/language/compiler/tests/linkage-errors.factor @@ -1,7 +1,7 @@ USING: tools.test namespaces assocs alien.syntax kernel compiler.errors accessors alien alien.c-types alien.strings debugger literals kernel.private alien.libraries ; -in: compiler.tests.linkage-errors +IN: compiler.tests.linkage-errors ! Regression: calling an undefined function would raise a protection fault FUNCTION: void this_does_not_exist ( ) ; diff --git a/language/compiler/tests/low-level-ir.factor b/language/compiler/tests/low-level-ir.factor index c20b343ac6..29f412187e 100644 --- a/language/compiler/tests/low-level-ir.factor +++ b/language/compiler/tests/low-level-ir.factor @@ -5,7 +5,7 @@ compiler.cfg.ssa.destruction compiler.cfg.build-stack-frame compiler.cfg.utilities compiler.codegen compiler.units cpu.architecture hashtables kernel namespaces sequences tools.test vectors words layouts literals math arrays alien.c-types alien.syntax math.private ; -in: compiler.tests.low-level-ir +IN: compiler.tests.low-level-ir : compile-cfg ( cfg -- word ) gensym [ diff --git a/language/compiler/tests/optimizer.factor b/language/compiler/tests/optimizer.factor index 8c643ad660..aaa0976703 100644 --- a/language/compiler/tests/optimizer.factor +++ b/language/compiler/tests/optimizer.factor @@ -7,7 +7,7 @@ compiler.tree.builder compiler.tree.optimizer sequences.deep compiler.test definitions generic.single shuffle math.order compiler.cfg.debugger classes.struct alien.syntax alien.data alien.c-types splitting ; -in: compiler.tests.optimizer +IN: compiler.tests.optimizer GENERIC: xyz ( obj -- obj ) ; M: array xyz xyz ; diff --git a/language/compiler/tests/peg-regression-2.factor b/language/compiler/tests/peg-regression-2.factor index f1206892b4..5d9bb2f26c 100644 --- a/language/compiler/tests/peg-regression-2.factor +++ b/language/compiler/tests/peg-regression-2.factor @@ -1,5 +1,5 @@ USING: peg.ebnf strings tools.test ; -in: compiler.tests.peg-regression-2 +IN: compiler.tests.peg-regression-2 GENERIC: ( times -- term' ) ; M: string ; diff --git a/language/compiler/tests/peg-regression.factor b/language/compiler/tests/peg-regression.factor index c8516327ba..66f9d1eb7f 100644 --- a/language/compiler/tests/peg-regression.factor +++ b/language/compiler/tests/peg-regression.factor @@ -5,7 +5,7 @@ ! end of a compilation unit. USING: kernel accessors peg.ebnf words ; -in: compiler.tests.peg-regression +IN: compiler.tests.peg-regression TUPLE: pipeline-expr background ; diff --git a/language/compiler/tests/pic-problem-1.factor b/language/compiler/tests/pic-problem-1.factor index 56e9381854..aaa5eeaaf8 100644 --- a/language/compiler/tests/pic-problem-1.factor +++ b/language/compiler/tests/pic-problem-1.factor @@ -1,5 +1,5 @@ USING: kernel sequences prettyprint memory tools.test ; -in: compiler.tests.pic-problem-1 +IN: compiler.tests.pic-problem-1 TUPLE: x ; diff --git a/language/compiler/tests/redefine0.factor b/language/compiler/tests/redefine0.factor index 076483fa8b..bbf34b8aba 100644 --- a/language/compiler/tests/redefine0.factor +++ b/language/compiler/tests/redefine0.factor @@ -1,6 +1,6 @@ USING: tools.test eval compiler compiler.errors compiler.units definitions kernel math namespaces macros assocs ; -in: compiler.tests.redefine0 +IN: compiler.tests.redefine0 ! Test ripple-up behavior : test-1 ( -- a ) 3 ; diff --git a/language/compiler/tests/redefine1.factor b/language/compiler/tests/redefine1.factor index 6b067a8e73..4aed292822 100644 --- a/language/compiler/tests/redefine1.factor +++ b/language/compiler/tests/redefine1.factor @@ -1,7 +1,7 @@ USING: accessors compiler compiler.units tools.test math parser kernel sequences sequences.private classes.mixin generic definitions arrays words assocs eval strings ; -in: compiler.tests.redefine1 +IN: compiler.tests.redefine1 GENERIC: method-redefine-generic-1 ( a -- b ) ; diff --git a/language/compiler/tests/redefine10.factor b/language/compiler/tests/redefine10.factor index e87d9be135..245c78287a 100644 --- a/language/compiler/tests/redefine10.factor +++ b/language/compiler/tests/redefine10.factor @@ -1,6 +1,6 @@ USING: eval tools.test compiler.units vocabs words kernel definitions sequences math classes classes.mixin kernel.private ; -in: compiler.tests.redefine10 +IN: compiler.tests.redefine10 ! Mixin redefinition should update predicate call sites diff --git a/language/compiler/tests/redefine11.factor b/language/compiler/tests/redefine11.factor index c3a5152547..4329223867 100644 --- a/language/compiler/tests/redefine11.factor +++ b/language/compiler/tests/redefine11.factor @@ -1,6 +1,6 @@ USING: eval tools.test compiler.units vocabs words kernel classes.mixin arrays ; -in: compiler.tests.redefine11 +IN: compiler.tests.redefine11 ! Mixin redefinition did not recompile all necessary words. diff --git a/language/compiler/tests/redefine12.factor b/language/compiler/tests/redefine12.factor index 3061c335ea..505bff038f 100644 --- a/language/compiler/tests/redefine12.factor +++ b/language/compiler/tests/redefine12.factor @@ -1,5 +1,5 @@ USING: kernel tools.test eval ; -in: compiler.tests.redefine12 +IN: compiler.tests.redefine12 ! A regression that came about when fixing the ! 'no method on classes-intersect?' bug diff --git a/language/compiler/tests/redefine13.factor b/language/compiler/tests/redefine13.factor index 18035cbe2b..f96dca2aa2 100644 --- a/language/compiler/tests/redefine13.factor +++ b/language/compiler/tests/redefine13.factor @@ -1,5 +1,5 @@ USING: math fry macros eval tools.test ; -in: compiler.tests.redefine13 +IN: compiler.tests.redefine13 : breakage-word ( a b -- c ) + ; diff --git a/language/compiler/tests/redefine14.factor b/language/compiler/tests/redefine14.factor index 311dded63c..a72db4833c 100644 --- a/language/compiler/tests/redefine14.factor +++ b/language/compiler/tests/redefine14.factor @@ -1,5 +1,5 @@ USING: compiler.units definitions tools.test sequences ; -in: compiler.tests.redefine14 +IN: compiler.tests.redefine14 TUPLE: bad ; diff --git a/language/compiler/tests/redefine15.factor b/language/compiler/tests/redefine15.factor index 50d2eedaa4..b6d3723052 100644 --- a/language/compiler/tests/redefine15.factor +++ b/language/compiler/tests/redefine15.factor @@ -1,5 +1,5 @@ USING: compiler.units words tools.test math kernel ; -in: compiler.tests.redefine15 +IN: compiler.tests.redefine15 defer: word-1 diff --git a/language/compiler/tests/redefine16.factor b/language/compiler/tests/redefine16.factor index 48b929f79e..fc638248ad 100644 --- a/language/compiler/tests/redefine16.factor +++ b/language/compiler/tests/redefine16.factor @@ -1,6 +1,6 @@ USING: eval tools.test definitions words compiler.units quotations stack-checker ; -in: compiler.tests.redefine16 +IN: compiler.tests.redefine16 [ ] [ [ "blah" "compiler.tests.redefine16" lookup-word forget ] with-compilation-unit ] unit-test diff --git a/language/compiler/tests/redefine17.factor b/language/compiler/tests/redefine17.factor index c875f9664e..127b166a29 100644 --- a/language/compiler/tests/redefine17.factor +++ b/language/compiler/tests/redefine17.factor @@ -1,6 +1,6 @@ USING: tools.test classes.mixin compiler.units arrays kernel.private strings sequences vocabs definitions kernel ; -in: compiler.tests.redefine17 +IN: compiler.tests.redefine17 COMPILE< "compiler.tests.redefine17" vocab-words forget-all COMPILE> diff --git a/language/compiler/tests/redefine19.factor b/language/compiler/tests/redefine19.factor index c9049ba284..142521221f 100644 --- a/language/compiler/tests/redefine19.factor +++ b/language/compiler/tests/redefine19.factor @@ -1,5 +1,5 @@ USING: kernel classes.mixin compiler.units tools.test generic ; -in: compiler.tests.redefine19 +IN: compiler.tests.redefine19 GENERIC: g ( a -- b ) ; diff --git a/language/compiler/tests/redefine20.factor b/language/compiler/tests/redefine20.factor index 63b3dcbb8c..15afce0632 100644 --- a/language/compiler/tests/redefine20.factor +++ b/language/compiler/tests/redefine20.factor @@ -1,4 +1,4 @@ -in: compiler.tests.redefine20 +IN: compiler.tests.redefine20 USING: kernel sequences compiler.units definitions classes.mixin tools.test ; diff --git a/language/compiler/tests/redefine21.factor b/language/compiler/tests/redefine21.factor index ca0a64d640..262c3f9605 100644 --- a/language/compiler/tests/redefine21.factor +++ b/language/compiler/tests/redefine21.factor @@ -1,5 +1,5 @@ USING: kernel tools.test definitions compiler.units ; -in: compiler.tests.redefine21 +IN: compiler.tests.redefine21 [ ] [ : a ( -- ) ; COMPILE< : b ( quot -- ) call a ; inline COMPILE> [ ] b ] unit-test diff --git a/language/compiler/tests/redefine22.factor b/language/compiler/tests/redefine22.factor index d0da7fdd80..82b7666202 100644 --- a/language/compiler/tests/redefine22.factor +++ b/language/compiler/tests/redefine22.factor @@ -1,4 +1,4 @@ -in: compiler.tests.redefine22 +IN: compiler.tests.redefine22 USING: kernel sequences compiler.units vocabs tools.test definitions ; TUPLE: ttt ; diff --git a/language/compiler/tests/redefine23.factor b/language/compiler/tests/redefine23.factor index 22f98891ff..cd4c0d0ca0 100644 --- a/language/compiler/tests/redefine23.factor +++ b/language/compiler/tests/redefine23.factor @@ -1,4 +1,4 @@ -in: compiler.tests.redefine23 +IN: compiler.tests.redefine23 USING: classes.struct specialized-arrays alien.c-types sequences compiler.units vocabs tools.test specialized-arrays.private ; diff --git a/language/compiler/tests/redefine24.factor b/language/compiler/tests/redefine24.factor index 4cc34da595..e63f3770ad 100644 --- a/language/compiler/tests/redefine24.factor +++ b/language/compiler/tests/redefine24.factor @@ -1,6 +1,6 @@ USING: alien alien.syntax eval math tools.test ; qualified: alien.c-types -in: compiler.tests.redefine24 +IN: compiler.tests.redefine24 TYPEDEF: alien.c-types:int type-1 ; diff --git a/language/compiler/tests/redefine25.factor b/language/compiler/tests/redefine25.factor index d5b0d88dbf..42705c08cd 100644 --- a/language/compiler/tests/redefine25.factor +++ b/language/compiler/tests/redefine25.factor @@ -1,6 +1,6 @@ USING: tools.test compiler.units classes.mixin definitions kernel kernel.private ; -in: compiler.tests.redefine25 +IN: compiler.tests.redefine25 mixin: empty-mixin diff --git a/language/compiler/tests/redefine26.factor b/language/compiler/tests/redefine26.factor index 25fe5609a9..81dbabf1d9 100644 --- a/language/compiler/tests/redefine26.factor +++ b/language/compiler/tests/redefine26.factor @@ -1,6 +1,6 @@ USING: accessors classes.tuple classes.maybe compiler.units kernel math slots tools.test classes.union ; -in: compiler.tests.redefine26 +IN: compiler.tests.redefine26 TUPLE: yoo ; TUPLE: hoo ; diff --git a/language/compiler/tests/redefine4.factor b/language/compiler/tests/redefine4.factor index a03cf49c19..c069854a22 100644 --- a/language/compiler/tests/redefine4.factor +++ b/language/compiler/tests/redefine4.factor @@ -1,5 +1,5 @@ USING: io.streams.string kernel tools.test eval ; -in: compiler.tests.redefine4 +IN: compiler.tests.redefine4 : declaration-test-1 ( -- a ) 3 ; flushable diff --git a/language/compiler/tests/redefine5.factor b/language/compiler/tests/redefine5.factor index c38ab8340a..2d4ab041c4 100644 --- a/language/compiler/tests/redefine5.factor +++ b/language/compiler/tests/redefine5.factor @@ -1,5 +1,5 @@ USING: eval tools.test compiler.units vocabs words kernel ; -in: compiler.tests.redefine5 +IN: compiler.tests.redefine5 ! Regression: if dispatch was eliminated but method was not inlined, ! compiled usage information was not recorded. diff --git a/language/compiler/tests/redefine6.factor b/language/compiler/tests/redefine6.factor index b81bedc27f..a6ee476f6a 100644 --- a/language/compiler/tests/redefine6.factor +++ b/language/compiler/tests/redefine6.factor @@ -1,6 +1,6 @@ USING: eval tools.test compiler.units vocabs words kernel ; -in: compiler.tests.redefine6 +IN: compiler.tests.redefine6 ! Mixin redefinition did not recompile all necessary words. diff --git a/language/compiler/tests/redefine7.factor b/language/compiler/tests/redefine7.factor index 5b54c0e398..969859eb43 100644 --- a/language/compiler/tests/redefine7.factor +++ b/language/compiler/tests/redefine7.factor @@ -1,6 +1,6 @@ USING: eval tools.test compiler.units vocabs words kernel ; -in: compiler.tests.redefine7 +IN: compiler.tests.redefine7 ! Mixin redefinition did not recompile all necessary words. diff --git a/language/compiler/tests/redefine8.factor b/language/compiler/tests/redefine8.factor index 6d992e4106..ab156f8f0b 100644 --- a/language/compiler/tests/redefine8.factor +++ b/language/compiler/tests/redefine8.factor @@ -1,6 +1,6 @@ USING: eval tools.test compiler.units vocabs words kernel ; -in: compiler.tests.redefine8 +IN: compiler.tests.redefine8 ! Mixin redefinition did not recompile all necessary words. diff --git a/language/compiler/tests/redefine9.factor b/language/compiler/tests/redefine9.factor index 3d9174361b..e0f0618124 100644 --- a/language/compiler/tests/redefine9.factor +++ b/language/compiler/tests/redefine9.factor @@ -1,6 +1,6 @@ USING: eval tools.test compiler.units vocabs words kernel generic.math ; -in: compiler.tests.redefine9 +IN: compiler.tests.redefine9 ! Mixin redefinition did not recompile all necessary words. diff --git a/language/compiler/tests/reload.factor b/language/compiler/tests/reload.factor index f559b58017..fbfdbaa881 100644 --- a/language/compiler/tests/reload.factor +++ b/language/compiler/tests/reload.factor @@ -1,5 +1,5 @@ use: vocabs.loader -in: compiler.tests.reload +IN: compiler.tests.reload ! "parser" reload ! "sequences" reload diff --git a/language/compiler/tests/simple.factor b/language/compiler/tests/simple.factor index 397b8d2523..b33dcdcfb0 100644 --- a/language/compiler/tests/simple.factor +++ b/language/compiler/tests/simple.factor @@ -2,7 +2,7 @@ USING: compiler.test compiler.units tools.test kernel kernel.private sequences.private math.private math combinators strings alien arrays memory vocabs parser eval quotations compiler.errors definitions generic.single ; -in: compiler.tests.simple +IN: compiler.tests.simple ! Test empty word [ ] [ [ ] compile-call ] unit-test diff --git a/language/compiler/tests/spilling.factor b/language/compiler/tests/spilling.factor index c49ef5b0ee..897c182488 100644 --- a/language/compiler/tests/spilling.factor +++ b/language/compiler/tests/spilling.factor @@ -1,6 +1,6 @@ USING: math.private kernel combinators accessors arrays generalizations sequences.generalizations tools.test words ; -in: compiler.tests.spilling +IN: compiler.tests.spilling ! These tests are stupid and don't trigger spilling anymore diff --git a/language/compiler/tests/stack-trace.factor b/language/compiler/tests/stack-trace.factor index b0b74e5ca9..87e629adb3 100644 --- a/language/compiler/tests/stack-trace.factor +++ b/language/compiler/tests/stack-trace.factor @@ -1,7 +1,7 @@ USING: accessors combinators continuations grouping io.backend io.encodings.utf8 io.files kernel math namespaces parser sequences tools.test ; -in: compiler.tests.stack-trace +IN: compiler.tests.stack-trace : symbolic-stack-trace ( -- newseq ) error-continuation get call>> callstack>array diff --git a/language/compiler/tests/tuples.factor b/language/compiler/tests/tuples.factor index 836f71b4e4..6d7d14a9cf 100644 --- a/language/compiler/tests/tuples.factor +++ b/language/compiler/tests/tuples.factor @@ -1,5 +1,5 @@ USING: kernel tools.test compiler.units compiler.test ; -in: compiler.tests.tuples +IN: compiler.tests.tuples TUPLE: color red green blue ; diff --git a/language/compiler/tests/x87-regression.factor b/language/compiler/tests/x87-regression.factor index 729d124e9b..27c2b7939a 100644 --- a/language/compiler/tests/x87-regression.factor +++ b/language/compiler/tests/x87-regression.factor @@ -1,4 +1,4 @@ -in: compiler.tests.x87-regression +IN: compiler.tests.x87-regression USING: math.floats.env alien.syntax alien.c-types compiler.test tools.test kernel math ; diff --git a/language/io/pipes/unix/pipes-tests.factor b/language/io/pipes/unix/pipes-tests.factor index 478faebbb0..ce3f1551b1 100644 --- a/language/io/pipes/unix/pipes-tests.factor +++ b/language/io/pipes/unix/pipes-tests.factor @@ -1,6 +1,6 @@ USING: tools.test io.pipes io.pipes.unix io.encodings.utf8 io.encodings io namespaces sequences ; -in: io.pipes.unix.tests +IN: io.pipes.unix.tests [ { 0 0 } ] [ { "ls" "grep ." } run-pipeline ] unit-test diff --git a/language/multi-methods/tests/canonicalize.factor b/language/multi-methods/tests/canonicalize.factor index e405867c04..6d1a9c5cab 100644 --- a/language/multi-methods/tests/canonicalize.factor +++ b/language/multi-methods/tests/canonicalize.factor @@ -1,6 +1,6 @@ USING: multi-methods tools.test math sequences namespaces system kernel strings ; -in: multi-methods.tests +IN: multi-methods.tests [ { postpone\ f integer } ] [ { f integer } canonicalize-specializer-0 ] unit-test diff --git a/language/multi-methods/tests/definitions.factor b/language/multi-methods/tests/definitions.factor index 382b370bc7..af6b3b6683 100644 --- a/language/multi-methods/tests/definitions.factor +++ b/language/multi-methods/tests/definitions.factor @@ -1,6 +1,6 @@ USING: multi-methods tools.test math sequences namespaces system kernel strings words compiler.units quotations ; -in: multi-methods.tests +IN: multi-methods.tests defer: fake \ fake H{ } clone "multi-methods" set-word-prop diff --git a/language/multi-methods/tests/legacy.factor b/language/multi-methods/tests/legacy.factor index a5438af6fd..b8148c2859 100644 --- a/language/multi-methods/tests/legacy.factor +++ b/language/multi-methods/tests/legacy.factor @@ -1,5 +1,5 @@ USING: math strings sequences tools.test ; -in: multi-methods.tests +IN: multi-methods.tests GENERIC: legacy-test ( a -- b ) ; diff --git a/language/multi-methods/tests/syntax.factor b/language/multi-methods/tests/syntax.factor index 863fe51291..1e1f35a727 100644 --- a/language/multi-methods/tests/syntax.factor +++ b/language/multi-methods/tests/syntax.factor @@ -2,7 +2,7 @@ USING: multi-methods tools.test math sequences namespaces system kernel strings definitions prettyprint debugger arrays hashtables continuations classes assocs accessors see ; RENAME: GENERIC: multi-methods => multi-methods:GENERIC: ; -in: multi-methods.tests +IN: multi-methods.tests multi-methods:GENERIC: first-test ( -- ) ; diff --git a/language/multi-methods/tests/topological-sort.factor b/language/multi-methods/tests/topological-sort.factor index 5e47ad4d52..f1618374ef 100644 --- a/language/multi-methods/tests/topological-sort.factor +++ b/language/multi-methods/tests/topological-sort.factor @@ -1,6 +1,6 @@ USING: kernel multi-methods tools.test math arrays sequences math.order ; -in: multi-methods.tests +IN: multi-methods.tests [ { 1 2 3 4 5 6 } ] [ { 6 4 5 1 3 2 } [ <=> ] topological-sort diff --git a/libs/fjsc/resources/bootstrap.factor b/libs/fjsc/resources/bootstrap.factor index 4dc766c870..598ccfa415 100644 --- a/libs/fjsc/resources/bootstrap.factor +++ b/libs/fjsc/resources/bootstrap.factor @@ -1,4 +1,4 @@ -in: namespaces +IN: namespaces use: kernel-internals : with-variables ( ns quot -- ) swap >n call n> drop ; diff --git a/libs/math/blas/matrices/matrices-docs.factor b/libs/math/blas/matrices/matrices-docs.factor index 4bce03fa1c..22beda640d 100644 --- a/libs/math/blas/matrices/matrices-docs.factor +++ b/libs/math/blas/matrices/matrices-docs.factor @@ -1,5 +1,5 @@ USING: alien byte-arrays help.markup help.syntax math math.blas.vectors sequences strings ; -in: math.blas.matrices +IN: math.blas.matrices ARTICLE: "math.blas-summary" "Basic Linear Algebra Subroutines (BLAS) interface" "Factor provides an interface to high-performance vector and matrix math routines available in implementations of the BLAS math library. A set of specialized types are provided for handling packed, unboxed vector data:" diff --git a/libs/math/blas/matrices/matrices-tests.factor b/libs/math/blas/matrices/matrices-tests.factor index 4bd3c50455..5a7345d682 100644 --- a/libs/math/blas/matrices/matrices-tests.factor +++ b/libs/math/blas/matrices/matrices-tests.factor @@ -1,6 +1,6 @@ USING: kernel math.blas.matrices math.blas.vectors sequences tools.test ; -in: math.blas.matrices.tests +IN: math.blas.matrices.tests ! clone diff --git a/libs/math/blas/matrices/matrices.factor b/libs/math/blas/matrices/matrices.factor index cf2bf727be..159a06e52a 100644 --- a/libs/math/blas/matrices/matrices.factor +++ b/libs/math/blas/matrices/matrices.factor @@ -11,7 +11,7 @@ specialized-array: float specialized-array: double specialized-array: complex-float specialized-array: complex-double -in: math.blas.matrices +IN: math.blas.matrices TUPLE: blas-matrix-base underlying ld rows cols transpose ; diff --git a/libs/math/blas/vectors/vectors-docs.factor b/libs/math/blas/vectors/vectors-docs.factor index 2c462bd296..4d1a6bf7ec 100644 --- a/libs/math/blas/vectors/vectors-docs.factor +++ b/libs/math/blas/vectors/vectors-docs.factor @@ -1,5 +1,5 @@ USING: alien byte-arrays help.markup help.syntax math sequences ; -in: math.blas.vectors +IN: math.blas.vectors ARTICLE: "math.blas.vectors" "BLAS interface vector operations" "Slicing vectors:" diff --git a/libs/math/blas/vectors/vectors-tests.factor b/libs/math/blas/vectors/vectors-tests.factor index bdaedfd7bd..e566a46f5d 100644 --- a/libs/math/blas/vectors/vectors-tests.factor +++ b/libs/math/blas/vectors/vectors-tests.factor @@ -1,5 +1,5 @@ USING: kernel math.blas.vectors math.functions sequences tools.test ; -in: math.blas.vectors.tests +IN: math.blas.vectors.tests ! clone diff --git a/libs/math/blas/vectors/vectors.factor b/libs/math/blas/vectors/vectors.factor index 665c6bff0b..41c372743d 100644 --- a/libs/math/blas/vectors/vectors.factor +++ b/libs/math/blas/vectors/vectors.factor @@ -8,7 +8,7 @@ specialized-array: float specialized-array: double specialized-array: complex-float specialized-array: complex-double -in: math.blas.vectors +IN: math.blas.vectors TUPLE: blas-vector-base underlying length inc ; diff --git a/libs/math/vectors/simd/cords/cords-tests.factor b/libs/math/vectors/simd/cords/cords-tests.factor index dfabef141b..066fad0fb4 100644 --- a/libs/math/vectors/simd/cords/cords-tests.factor +++ b/libs/math/vectors/simd/cords/cords-tests.factor @@ -1,4 +1,4 @@ USING: math.vectors.simd math.vectors.simd.cords tools.test ; -in: math.vectors.simd.cords.tests +IN: math.vectors.simd.cords.tests { float-4{ 1.0 2.0 3.0 4.0 } } [ double-4{ 1.0 2.0 3.0 4.0 } >float-4 ] unit-test diff --git a/libs/math/vectors/simd/cords/cords.factor b/libs/math/vectors/simd/cords/cords.factor index e134b063a5..9190d44d42 100644 --- a/libs/math/vectors/simd/cords/cords.factor +++ b/libs/math/vectors/simd/cords/cords.factor @@ -3,7 +3,7 @@ cpu.architecture effects functors generalizations kernel lexer math math.vectors.simd math.vectors.simd.intrinsics parser prettyprint.custom quotations sequences sequences.cords words classes ; -in: math.vectors.simd.cords +IN: math.vectors.simd.cords COMPILE< PRIVATE< diff --git a/libs/math/vectors/simd/simd-docs.factor b/libs/math/vectors/simd/simd-docs.factor index d102ec81ff..ead9176a9d 100644 --- a/libs/math/vectors/simd/simd-docs.factor +++ b/libs/math/vectors/simd/simd-docs.factor @@ -1,7 +1,7 @@ USING: classes.tuple.private cpu.architecture help.markup help.syntax kernel.private math math.vectors math.vectors.simd.intrinsics sequences ; -in: math.vectors.simd +IN: math.vectors.simd ARTICLE: "math.vectors.simd.intro" "Introduction to SIMD support" "Modern CPUs support a form of data-level parallelism, where arithmetic operations on fixed-size short vectors can be done on all components in parallel. This is known as single-instruction-multiple-data (SIMD)." diff --git a/libs/math/vectors/simd/simd-tests.factor b/libs/math/vectors/simd/simd-tests.factor index 1431a8be70..5139141275 100644 --- a/libs/math/vectors/simd/simd-tests.factor +++ b/libs/math/vectors/simd/simd-tests.factor @@ -10,7 +10,7 @@ math.vectors.simd.cords alien.data ; FROM: math.vectors.simd.intrinsics => alien-vector set-alien-vector ; QUALIFIED-WITH: alien.c-types c ; specialized-array: c:float -in: math.vectors.simd.tests +IN: math.vectors.simd.tests ! Test type propagation { V{ float } } [ [ { float-4 } declare norm-sq ] final-classes ] unit-test diff --git a/libs/math/vectors/simd/simd.factor b/libs/math/vectors/simd/simd.factor index 968cd0c5f6..cb4daa0c73 100644 --- a/libs/math/vectors/simd/simd.factor +++ b/libs/math/vectors/simd/simd.factor @@ -6,7 +6,7 @@ namespaces parser prettyprint.custom quotations sequences sequences.generalizations sequences.private vocabs vocabs.loader words math.bitwise ; QUALIFIED-WITH: alien.c-types c ; -in: math.vectors.simd +IN: math.vectors.simd ERROR: bad-simd-length got expected ; ERROR: bad-simd-vector obj ; diff --git a/libs/xml/tests/cdata.factor b/libs/xml/tests/cdata.factor index 76389c1f3c..56f344610c 100644 --- a/libs/xml/tests/cdata.factor +++ b/libs/xml/tests/cdata.factor @@ -1,5 +1,5 @@ USING: xml xml.writer tools.test ; -in: xml.tests +IN: xml.tests { " diff --git a/libs/xml/tests/funny-dtd.factor b/libs/xml/tests/funny-dtd.factor index ebc339a6aa..e9a38ae96b 100644 --- a/libs/xml/tests/funny-dtd.factor +++ b/libs/xml/tests/funny-dtd.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -in: xml.tests +IN: xml.tests USING: xml xml.writer io.files io.encodings.utf8 tools.test kernel ; [ t ] [ diff --git a/libs/xml/tests/soap.factor b/libs/xml/tests/soap.factor index 7f84e751d5..464002b060 100644 --- a/libs/xml/tests/soap.factor +++ b/libs/xml/tests/soap.factor @@ -1,5 +1,5 @@ USING: sequences xml kernel arrays xml.traversal io.files tools.test ; -in: xml.tests +IN: xml.tests : assemble-data ( tag -- 3array ) { "URL" "snippet" "title" } diff --git a/libs/xml/tests/state-parser-tests.factor b/libs/xml/tests/state-parser-tests.factor index 9b5639dd12..d33b15ed11 100644 --- a/libs/xml/tests/state-parser-tests.factor +++ b/libs/xml/tests/state-parser-tests.factor @@ -1,5 +1,5 @@ USING: tools.test xml.tokenize xml.state io.streams.string kernel io strings ascii ; -in: xml.test.state +IN: xml.test.state : string-parse ( str quot -- ) [ ] dip with-state ; inline diff --git a/libs/xml/tests/templating.factor b/libs/xml/tests/templating.factor index 74a3b324bd..3b02f5cd4d 100644 --- a/libs/xml/tests/templating.factor +++ b/libs/xml/tests/templating.factor @@ -1,6 +1,6 @@ USING: kernel xml sequences assocs tools.test io arrays namespaces fry accessors xml.data xml.traversal xml.writer generic sequences.deep multiline ; -in: xml.tests +IN: xml.tests CONSTANT: sub-tag T{ name f f "sub" "http://littledan.onigirihouse.com/namespaces/replace" } ; diff --git a/libs/xml/tests/test.factor b/libs/xml/tests/test.factor index 61430dfa55..e6e63cb832 100644 --- a/libs/xml/tests/test.factor +++ b/libs/xml/tests/test.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2005, 2009 Daniel Ehrenberg ! See http://factorcode.org/license.txt for BSD license. -in: xml.tests +IN: xml.tests USING: kernel xml tools.test io namespaces make sequences xml.errors xml.entities.html parser strings xml.data io.files xml.traversal continuations assocs io.encodings.binary diff --git a/libs/xml/tests/xmltest.factor b/libs/xml/tests/xmltest.factor index e7676ad0b6..5311c42ee3 100644 --- a/libs/xml/tests/xmltest.factor +++ b/libs/xml/tests/xmltest.factor @@ -2,7 +2,7 @@ USING: accessors assocs combinators combinators.smart continuations fry generalizations io.pathnames kernel macros sequences stack-checker tools.test xml xml.traversal xml.writer arrays xml.data ; -in: xml.tests.suite +IN: xml.tests.suite TUPLE: xml-test id uri sections description type ; diff --git a/libs/xml/tests/xmode-dtd.factor b/libs/xml/tests/xmode-dtd.factor index 4c9d24b840..ae223bf82f 100644 --- a/libs/xml/tests/xmode-dtd.factor +++ b/libs/xml/tests/xmode-dtd.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: xml xml.data kernel tools.test ; -in: xml.tests +IN: xml.tests [ t ] [ "vocab:xmode/xmode.dtd" file>dtd dtd? diff --git a/libs/zeromq/examples/echo-client.factor b/libs/zeromq/examples/echo-client.factor index 5c1f8dbcc4..979bf13208 100644 --- a/libs/zeromq/examples/echo-client.factor +++ b/libs/zeromq/examples/echo-client.factor @@ -4,7 +4,7 @@ USING: byte-arrays calendar calendar.format destructors io kernel present strings threads zeromq zeromq.ffi ; -in: zeromq.examples.echo-client +IN: zeromq.examples.echo-client : echo-client ( -- ) [ diff --git a/libs/zeromq/examples/echo-server.factor b/libs/zeromq/examples/echo-server.factor index cdfac4253a..866e29ea46 100644 --- a/libs/zeromq/examples/echo-server.factor +++ b/libs/zeromq/examples/echo-server.factor @@ -3,7 +3,7 @@ USING: destructors io kernel strings zeromq zeromq.ffi ; -in: zeromq.examples.echoserver +IN: zeromq.examples.echoserver : echo-server ( -- ) [ diff --git a/libs/zeromq/examples/hwclient.factor b/libs/zeromq/examples/hwclient.factor index 6b6e420d32..95a0c932fa 100644 --- a/libs/zeromq/examples/hwclient.factor +++ b/libs/zeromq/examples/hwclient.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: byte-arrays destructors formatting io kernel sequences strings zeromq zeromq.ffi ; -in: zeromq.examples.hwclient +IN: zeromq.examples.hwclient : hwclient ( -- ) [ diff --git a/libs/zeromq/examples/hwserver.factor b/libs/zeromq/examples/hwserver.factor index 6a49798ebe..80ca212bc3 100644 --- a/libs/zeromq/examples/hwserver.factor +++ b/libs/zeromq/examples/hwserver.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: byte-arrays calendar destructors io kernel strings threads zeromq zeromq.ffi ; -in: zeromq.examples.hwserver +IN: zeromq.examples.hwserver : hwserver ( -- ) [ diff --git a/libs/zeromq/examples/tasksink.factor b/libs/zeromq/examples/tasksink.factor index dc437ca30a..e0cd8ac309 100644 --- a/libs/zeromq/examples/tasksink.factor +++ b/libs/zeromq/examples/tasksink.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: byte-arrays calendar destructors formatting io kernel math strings sequences zeromq zeromq.ffi ; -in: zeromq.examples.tasksink +IN: zeromq.examples.tasksink : tasksink ( -- ) [ diff --git a/libs/zeromq/examples/taskvent.factor b/libs/zeromq/examples/taskvent.factor index 97ae0e90cd..0ecec76d64 100644 --- a/libs/zeromq/examples/taskvent.factor +++ b/libs/zeromq/examples/taskvent.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: byte-arrays calendar destructors formatting io kernel math namespaces random threads zeromq zeromq.ffi ; -in: zeromq.examples.taskvent +IN: zeromq.examples.taskvent : taskvent ( -- ) [ diff --git a/libs/zeromq/examples/taskwork.factor b/libs/zeromq/examples/taskwork.factor index 0446c4b6d8..494448f147 100644 --- a/libs/zeromq/examples/taskwork.factor +++ b/libs/zeromq/examples/taskwork.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: byte-arrays calendar destructors formatting io kernel math.parser strings threads zeromq zeromq.ffi ; -in: zeromq.examples.taskwork +IN: zeromq.examples.taskwork : taskwork ( -- ) [ diff --git a/libs/zeromq/examples/wuclient.factor b/libs/zeromq/examples/wuclient.factor index 141e2a9c3e..2346c1088e 100644 --- a/libs/zeromq/examples/wuclient.factor +++ b/libs/zeromq/examples/wuclient.factor @@ -3,7 +3,7 @@ USING: byte-arrays command-line destructors formatting io kernel math math.parser namespaces sequences splitting strings zeromq zeromq.ffi ; -in: zeromq.examples.wuclient +IN: zeromq.examples.wuclient : wuclient ( -- ) [ diff --git a/libs/zeromq/examples/wuserver.factor b/libs/zeromq/examples/wuserver.factor index d135669ee2..c48468bb28 100644 --- a/libs/zeromq/examples/wuserver.factor +++ b/libs/zeromq/examples/wuserver.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: byte-arrays calendar destructors formatting kernel math namespaces random zeromq zeromq.ffi ; -in: zeromq.examples.wuserver +IN: zeromq.examples.wuserver : wuserver ( -- ) [ diff --git a/tools/graphviz/builder/builder-docs.factor b/tools/graphviz/builder/builder-docs.factor index c2de85159e..8f988ceaec 100644 --- a/tools/graphviz/builder/builder-docs.factor +++ b/tools/graphviz/builder/builder-docs.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: alien graphviz graphviz.attributes graphviz.ffi help.markup help.syntax kernel ; -in: graphviz.builder +IN: graphviz.builder HELP: build-alien { $values diff --git a/tools/tools/deploy/shaker/next-methods.factor b/tools/tools/deploy/shaker/next-methods.factor index 5bbf57c214..4e771d24fd 100644 --- a/tools/tools/deploy/shaker/next-methods.factor +++ b/tools/tools/deploy/shaker/next-methods.factor @@ -1,5 +1,5 @@ USING: kernel words ; -in: generic +IN: generic : (call-next-method) ( method -- ) dup "next-method" word-prop execute ; diff --git a/tools/tools/deploy/shaker/strip-call.factor b/tools/tools/deploy/shaker/strip-call.factor index c690d798eb..01ea6923cf 100644 --- a/tools/tools/deploy/shaker/strip-call.factor +++ b/tools/tools/deploy/shaker/strip-call.factor @@ -1,13 +1,13 @@ ! Copyright (C) 2009 Slava Pestov ! See http://factorcode.org/license.txt for BSD license. USING: combinators.private kernel ; -in: combinators +IN: combinators : call-effect ( word effect -- ) call-effect-unsafe ; : execute-effect ( word effect -- ) execute-effect-unsafe ; -in: compiler.tree.propagation.call-effect +IN: compiler.tree.propagation.call-effect : call-effect-unsafe? ( quot effect -- ? ) 2drop t ; inline diff --git a/tools/tools/deploy/shaker/strip-cocoa.factor b/tools/tools/deploy/shaker/strip-cocoa.factor index 2f4c13b246..283d888bbb 100644 --- a/tools/tools/deploy/shaker/strip-cocoa.factor +++ b/tools/tools/deploy/shaker/strip-cocoa.factor @@ -3,7 +3,7 @@ USING: cocoa cocoa.messages cocoa.application cocoa.nibs assocs namespaces kernel kernel.private words compiler.units sequences init vocabs memoize accessors ; -in: tools.deploy.shaker.cocoa +IN: tools.deploy.shaker.cocoa : pool ( obj -- obj' ) \ pool get [ ] cache ; diff --git a/tools/tools/deploy/shaker/strip-debugger.factor b/tools/tools/deploy/shaker/strip-debugger.factor index 45da7e45aa..eae05e075d 100644 --- a/tools/tools/deploy/shaker/strip-debugger.factor +++ b/tools/tools/deploy/shaker/strip-debugger.factor @@ -1,5 +1,5 @@ USING: continuations namespaces tools.deploy.shaker ; -in: debugger +IN: debugger : error. ( error -- ) original-error get die-with2 ; diff --git a/tools/tools/deploy/shaker/strip-destructors.factor b/tools/tools/deploy/shaker/strip-destructors.factor index 34f6aadd49..a4a3a54678 100644 --- a/tools/tools/deploy/shaker/strip-destructors.factor +++ b/tools/tools/deploy/shaker/strip-destructors.factor @@ -1,5 +1,5 @@ use: kernel -in: destructors +IN: destructors PRIVATE< diff --git a/tools/tools/deploy/shaker/strip-gtk-icon.factor b/tools/tools/deploy/shaker/strip-gtk-icon.factor index c8997fccd8..e444d9a390 100644 --- a/tools/tools/deploy/shaker/strip-gtk-icon.factor +++ b/tools/tools/deploy/shaker/strip-gtk-icon.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: kernel tools.deploy.shaker literals namespaces vocabs.loader io.pathnames io.files io.encodings.binary ; -in: ui.backend.gtk +IN: ui.backend.gtk CONSTANT: get-icon-data $[ diff --git a/tools/tools/deploy/shaker/strip-libc.factor b/tools/tools/deploy/shaker/strip-libc.factor index 993a732db3..7b8c1c81ad 100644 --- a/tools/tools/deploy/shaker/strip-libc.factor +++ b/tools/tools/deploy/shaker/strip-libc.factor @@ -1,5 +1,5 @@ USING: libc.private ; -in: libc +IN: libc : malloc ( size -- newalien ) (malloc) check-ptr ; diff --git a/tools/tools/deploy/shaker/strip-specialized-arrays.factor b/tools/tools/deploy/shaker/strip-specialized-arrays.factor index 8c58535d57..195a3db976 100644 --- a/tools/tools/deploy/shaker/strip-specialized-arrays.factor +++ b/tools/tools/deploy/shaker/strip-specialized-arrays.factor @@ -1,4 +1,4 @@ -in: specialized-arrays +IN: specialized-arrays ERROR: cannot-define-array-in-deployed-app type ;