From 4e700098bd49fee26bb92167bedbe2cc9d9708ad Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sat, 4 Jun 2016 17:15:47 -0700 Subject: [PATCH] factor: QUALIFIED: -> qualified:. More FUNCTION: fixes --- .../io/files/acls/macosx/macosx.factor | 2 +- .../specialized-vectors.factor | 2 +- core/alien/alien-tests.factor | 2 +- core/alien/c-types/c-types-docs.factor | 2 +- core/bootstrap/stage1.factor | 2 +- core/bootstrap/syntax.factor | 2 +- core/graphs/graphs-tests.factor | 2 +- core/parser/parser-tests.factor | 4 +- core/syntax/syntax-docs.factor | 8 +- core/syntax/syntax.factor | 2 +- ffi/forestdb/lib/lib.factor | 13 +- ffi/libudev/libudev.factor | 207 +++++++----------- ffi/pcre/pcre-tests.factor | 2 +- ffi/pcre/pcre.factor | 2 +- ffi/python/python.factor | 2 +- ffi/readline/readline.factor | 2 +- ffi/unix/types/types.factor | 2 +- ffi/unix/users/users.factor | 2 +- games/space-invaders/space-invaders.factor | 4 +- .../compiler/cfg/intrinsics/intrinsics.factor | 30 +-- .../linear-scan/assignment/assignment.factor | 2 +- .../cfg/liveness/liveness-tests.factor | 2 +- .../cfg/parallel-copy/parallel-copy.factor | 2 +- .../ssa/construction/tdmsc/tdmsc-tests.factor | 2 +- .../coalescing/coalescing-tests.factor | 2 +- .../cfg/stacks/local/local-tests.factor | 2 +- .../cfg/stacks/padding/padding.factor | 2 +- .../codegen/gc-maps/gc-maps-tests.factor | 2 +- .../compiler/tests/callstack-overflow.factor | 2 +- language/compiler/tests/codegen.factor | 2 +- language/compiler/tests/redefine24.factor | 2 +- language/compiler/tree/def-use/def-use.factor | 2 +- language/io/backend/unix/unix.factor | 2 +- language/io/pipes/unix/unix.factor | 2 +- language/multi-methods/multi-methods.factor | 2 +- language/prettyprint/backend/backend.factor | 2 +- language/vm/vm-tests.factor | 2 +- libs/fuel/xref/xref-tests.factor | 2 +- libs/http/server/static/static.factor | 2 +- libs/images/png/png.factor | 2 +- libs/imap/imap.factor | 2 +- libs/logging/insomniac/insomniac.factor | 2 +- libs/unicode/case/case.factor | 2 +- tools/tools/deploy/shaker/shaker.factor | 2 +- .../code-heap-reader/code-heap-reader.factor | 2 +- .../gc-info/gc-info-tests.factor | 10 +- unmaintained/cfdg/cfdg.factor | 2 +- unmaintained/sniffer/io/bsd/bsd.factor | 2 +- unmaintained/ui/gadgets/layout/layout.factor | 2 +- 49 files changed, 153 insertions(+), 207 deletions(-) diff --git a/collections/io/files/acls/macosx/macosx.factor b/collections/io/files/acls/macosx/macosx.factor index f68e93c6af..78a3075d0c 100644 --- a/collections/io/files/acls/macosx/macosx.factor +++ b/collections/io/files/acls/macosx/macosx.factor @@ -5,7 +5,7 @@ classes.struct combinators destructors io.backend io.files io.files.acls.macosx.ffi kernel libc literals locals math.order prettyprint sequences unix unix.ffi unix.groups unix.types unix.users ; -QUALIFIED: io +qualified: io in: io.files.acls.macosx nth-unsafe ; FROM: specialized-arrays.private => nth-c-ptr direct-like ; -QUALIFIED: vectors.functor +qualified: vectors.functor in: specialized-vectors mixin: specialized-vector diff --git a/core/alien/alien-tests.factor b/core/alien/alien-tests.factor index 55ea180be9..0a4ecfb4d0 100644 --- a/core/alien/alien-tests.factor +++ b/core/alien/alien-tests.factor @@ -1,7 +1,7 @@ USING: accessors alien alien.accessors alien.c-types alien.syntax byte-arrays continuations fry kernel layouts math namespaces prettyprint sequences tools.memory tools.test ; -QUALIFIED: sets +qualified: sets in: alien.tests { t } [ -1 alien-address 0 > ] unit-test diff --git a/core/alien/c-types/c-types-docs.factor b/core/alien/c-types/c-types-docs.factor index d7a63e84af..a6c1f2e2e6 100644 --- a/core/alien/c-types/c-types-docs.factor +++ b/core/alien/c-types/c-types-docs.factor @@ -148,7 +148,7 @@ ARTICLE: "c-types.ambiguity" "Word name clashes with C types" "FUNCTION: float magic_number ( ) ;" "magic_number 3.0 + ." } -"The correct solution is to use one of " { $link postpone: FROM: } ", " { $link postpone: QUALIFIED: } " or " { $link postpone: QUALIFIED-WITH: } " to disambiguate word lookup:" +"The correct solution is to use one of " { $link postpone: FROM: } ", " { $link postpone: qualified: } " or " { $link postpone: QUALIFIED-WITH: } " to disambiguate word lookup:" { $code "USING: alien.syntax math prettyprint ;" "QUALIFIED-WITH: alien.c-types c" diff --git a/core/bootstrap/stage1.factor b/core/bootstrap/stage1.factor index 303faee665..70aaacf5d4 100644 --- a/core/bootstrap/stage1.factor +++ b/core/bootstrap/stage1.factor @@ -4,7 +4,7 @@ USING: assocs hash-sets hashtables hashtables.identity 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 +qualified: bootstrap.image.private in: bootstrap.stage1 "Bootstrap stage 1..." print flush diff --git a/core/bootstrap/syntax.factor b/core/bootstrap/syntax.factor index b1c2735e30..86d301c3de 100644 --- a/core/bootstrap/syntax.factor +++ b/core/bootstrap/syntax.factor @@ -65,7 +65,7 @@ in: bootstrap.syntax "UNUSE:" "unuse:" "USING:" - "QUALIFIED:" + "qualified:" "qualified:" "QUALIFIED-WITH:" "FROM:" diff --git a/core/graphs/graphs-tests.factor b/core/graphs/graphs-tests.factor index 8b559648fe..54a92968d8 100644 --- a/core/graphs/graphs-tests.factor +++ b/core/graphs/graphs-tests.factor @@ -1,5 +1,5 @@ USING: assocs graphs kernel namespaces sorting tools.test ; -QUALIFIED: sets +qualified: sets H{ } "g" set { 1 2 3 } "v" set diff --git a/core/parser/parser-tests.factor b/core/parser/parser-tests.factor index 42a42f055d..2b55cf86a0 100644 --- a/core/parser/parser-tests.factor +++ b/core/parser/parser-tests.factor @@ -519,8 +519,8 @@ in: qualified.tests.bar in: qualified.tests.baz : x ( -- a ) 3 ; -QUALIFIED: qualified.tests.foo -QUALIFIED: qualified.tests.bar +qualified: qualified.tests.foo +qualified: qualified.tests.bar { 1 2 3 } [ qualified.tests.foo:x qualified.tests.bar:x x ] unit-test QUALIFIED-WITH: qualified.tests.bar p ; diff --git a/core/syntax/syntax-docs.factor b/core/syntax/syntax-docs.factor index 28b22cfac6..8b50ba354e 100644 --- a/core/syntax/syntax-docs.factor +++ b/core/syntax/syntax-docs.factor @@ -529,19 +529,19 @@ HELP: USING: { $notes "If adding the vocabularies introduces ambiguity, referencing the ambiguous names will throw a " { $link ambiguous-use-error } "." } { $errors "Throws an error if one of the vocabularies does not exist." } ; -HELP: QUALIFIED: -{ $syntax "QUALIFIED: vocab" } +HELP: qualified: +{ $syntax "qualified: vocab" } { $description "Adds the vocabulary's words, prefixed with the vocabulary name, to the search path." } { $notes "If adding the vocabulary introduces ambiguity, the vocabulary will take precedence when resolving any ambiguous names. This is a rare case; for example, suppose a vocabulary " { $snippet "fish" } " defines a word named " { $snippet "go:fishing" } ", and a vocabulary named " { $snippet "go" } " defines a word named " { $snippet "fishing" } ". Then, the following will call the latter word:" { $code "use: fish" - "QUALIFIED: go" + "qualified: go" "go:fishing" } } { $examples { $example "USING: prettyprint ;" - "QUALIFIED: math" + "qualified: math" "1 2 math:+ ." "3" } } ; diff --git a/core/syntax/syntax.factor b/core/syntax/syntax.factor index 42a1aec69c..f38818d591 100644 --- a/core/syntax/syntax.factor +++ b/core/syntax/syntax.factor @@ -82,7 +82,7 @@ in: bootstrap.syntax "USING:" [ ";" [ use-vocab ] each-token ] define-core-syntax - "QUALIFIED:" [ scan-token dup add-qualified ] define-core-syntax + "qualified:" [ scan-token dup add-qualified ] define-core-syntax "qualified:" [ scan-token dup add-qualified ] define-core-syntax "QUALIFIED-WITH:" [ scan-token scan-token ";" expect add-qualified ] define-core-syntax diff --git a/ffi/forestdb/lib/lib.factor b/ffi/forestdb/lib/lib.factor index a072def47c..00c28772ab 100644 --- a/ffi/forestdb/lib/lib.factor +++ b/ffi/forestdb/lib/lib.factor @@ -1,11 +1,12 @@ ! Copyright (C) 2014 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors alien.c-types alien.data alien.strings byte-arrays -classes.struct combinators constructors continuations destructors -forestdb.ffi fry generalizations io.directories io.encodings.string -io.encodings.utf8 io.pathnames kernel libc math multiline namespaces -sequences strings ; -QUALIFIED: sets +USING: accessors alien.c-types alien.data alien.strings arrays +byte-arrays classes.struct combinators constructors +continuations destructors forestdb.ffi forestdb.paths fry +generalizations io.encodings.string io.encodings.utf8 +io.pathnames kernel libc math multiline namespaces sequences +strings ; +qualified: sets in: forestdb.lib /* diff --git a/ffi/libudev/libudev.factor b/ffi/libudev/libudev.factor index 07665ff09a..9636321767 100644 --- a/ffi/libudev/libudev.factor +++ b/ffi/libudev/libudev.factor @@ -10,19 +10,11 @@ library: libudev c-type: udev -FUNCTION: udev* udev_ref ( - udev* udev ) - - - -FUNCTION: void udev_unref ( - udev* udev ) - - - -FUNCTION: udev* udev_new ( ) ; +FUNCTION: udev* udev_ref ( udev* udev ) ; +FUNCTION: void udev_unref ( udev* udev ) ; +FUNCTION: udev* udev_new ( ) ; CALLBACK: void udev_set_log_fn_callback ( udev* udev @@ -30,66 +22,41 @@ CALLBACK: void udev_set_log_fn_callback ( c-string file, int line, c-string fn, - c-string format ) + c-string format ) ; ! va_list args ) ; FUNCTION: void udev_set_log_fn ( udev* udev, - udev_set_log_fn_callback log_fn ) + udev_set_log_fn_callback log_fn ) ; +FUNCTION: int udev_get_log_priority ( udev* udev ) ; +FUNCTION: void udev_set_log_priority ( udev* udev, int priority ) ; -FUNCTION: int udev_get_log_priority ( - udev* udev ) +FUNCTION: c-string udev_get_sys_path ( udev* udev ) ; +FUNCTION: c-string udev_get_dev_path ( udev* udev ) ; +FUNCTION: void* udev_get_userdata ( udev* udev ) ; -FUNCTION: void udev_set_log_priority ( - udev* udev, - int priority ) - - - -FUNCTION: c-string udev_get_sys_path ( - udev* udev ) - - - -FUNCTION: c-string udev_get_dev_path ( - udev* udev ) - - - -FUNCTION: void* udev_get_userdata ( - udev* udev ) - - - -FUNCTION: void udev_set_userdata ( - udev* udev, - void* userdata ) - - +FUNCTION: void udev_set_userdata ( udev* udev, void* userdata ) ; c-type: udev_list_entry -FUNCTION: udev_list_entry* udev_list_entry_get_next ( - udev_list_entry* list_entry ) - - +FUNCTION: udev_list_entry* udev_list_entry_get_next ( udev_list_entry* list_entry ) ; FUNCTION: udev_list_entry* udev_list_entry_get_by_name ( udev_list_entry* list_entry, - c-string name ) + c-string name ) ; FUNCTION: c-string udev_list_entry_get_name ( - udev_list_entry* list_entry ) + udev_list_entry* list_entry ) ; FUNCTION: c-string udev_list_entry_get_value ( - udev_list_entry* list_entry ) + udev_list_entry* list_entry ) ; @@ -102,342 +69,320 @@ FUNCTION: c-string udev_list_entry_get_value ( : udev-list-entries ( first_entry -- seq ) [ ] collector [ udev_list_entry_foreach ] dip ; - - c-type: udev_device FUNCTION: udev_device* udev_device_ref ( - udev_device* udev_device ) - - + udev_device* udev_device ) ; FUNCTION: void udev_device_unref ( - udev_device* udev_device ) - - + udev_device* udev_device ) ; FUNCTION: udev* udev_device_get_udev ( - udev_device* udev_device ) - - + udev_device* udev_device ) ; FUNCTION: udev_device* udev_device_new_from_syspath ( udev* udev, - c-string syspath ) - - + c-string syspath ) ; FUNCTION: udev_device* udev_device_new_from_devnum ( udev* udev, char type, - dev_t devnum ) - - + dev_t devnum ) ; FUNCTION: udev_device* udev_device_new_from_subsystem_sysname ( udev* udev, c-string subsystem, - c-string sysname ) - - + c-string sysname ) ; FUNCTION: udev_device* udev_device_get_parent ( - udev_device* udev_device ) - - + udev_device* udev_device ) ; FUNCTION: udev_device* udev_device_get_parent_with_subsystem_devtype ( udev_device* udev_device, c-string subsystem, - c-string devtype ) - - + c-string devtype ) ; FUNCTION: c-string udev_device_get_devpath ( - udev_device* udev_device ) - - + udev_device* udev_device ) ; FUNCTION: c-string udev_device_get_subsystem ( - udev_device* udev_device ) + udev_device* udev_device ) ; FUNCTION: c-string udev_device_get_devtype ( - udev_device* udev_device ) + udev_device* udev_device ) ; FUNCTION: c-string udev_device_get_syspath ( - udev_device* udev_device ) + udev_device* udev_device ) ; FUNCTION: c-string udev_device_get_sysname ( - udev_device* udev_device ) + udev_device* udev_device ) ; FUNCTION: c-string udev_device_get_sysnum ( - udev_device* udev_device ) + udev_device* udev_device ) ; FUNCTION: c-string udev_device_get_devnode ( - udev_device* udev_device ) + udev_device* udev_device ) ; FUNCTION: udev_list_entry* udev_device_get_devlinks_list_entry ( - udev_device* udev_device ) + udev_device* udev_device ) ; FUNCTION: udev_list_entry* udev_device_get_properties_list_entry ( - udev_device* udev_device ) + udev_device* udev_device ) ; FUNCTION: c-string udev_device_get_property_value ( udev_device* udev_device, - c-string key ) + c-string key ) ; FUNCTION: c-string udev_device_get_driver ( - udev_device* udev_device ) + udev_device* udev_device ) ; FUNCTION: dev_t udev_device_get_devnum ( - udev_device* udev_device ) + udev_device* udev_device ) ; FUNCTION: c-string udev_device_get_action ( - udev_device* udev_device ) + udev_device* udev_device ) ; FUNCTION: ulonglong udev_device_get_seqnum ( - udev_device* udev_device ) + udev_device* udev_device ) ; FUNCTION: c-string udev_device_get_sysattr_value ( udev_device* udev_device, - c-string sysattr ) - - + c-string sysattr ) ; c-type: udev_monitor FUNCTION: udev_monitor* udev_monitor_ref ( - udev_monitor* udev_monitor ) + udev_monitor* udev_monitor ) ; FUNCTION: void udev_monitor_unref ( - udev_monitor* udev_monitor ) + udev_monitor* udev_monitor ) ; FUNCTION: udev* udev_monitor_get_udev ( - udev_monitor* udev_monitor ) + udev_monitor* udev_monitor ) ; FUNCTION: udev_monitor* udev_monitor_new_from_netlink ( udev* udev, - c-string name ) + c-string name ) ; FUNCTION: udev_monitor* udev_monitor_new_from_socket ( udev* udev, - c-string socket_path ) + c-string socket_path ) ; FUNCTION: int udev_monitor_enable_receiving ( - udev_monitor* udev_monitor ) + udev_monitor* udev_monitor ) ; FUNCTION: int udev_monitor_set_receive_buffer_size ( udev_monitor* udev_monitor, - int size ) + int size ) ; FUNCTION: int udev_monitor_get_fd ( - udev_monitor* udev_monitor ) + udev_monitor* udev_monitor ) ; FUNCTION: udev_device* udev_monitor_receive_device ( - udev_monitor* udev_monitor ) + udev_monitor* udev_monitor ) ; FUNCTION: int udev_monitor_filter_add_match_subsystem_devtype ( udev_monitor* udev_monitor, c-string subsystem, - c-string devtype ) + c-string devtype ) ; FUNCTION: int udev_monitor_filter_update ( - udev_monitor* udev_monitor ) + udev_monitor* udev_monitor ) ; FUNCTION: int udev_monitor_filter_remove ( - udev_monitor* udev_monitor ) + udev_monitor* udev_monitor ) ; c-type: udev_enumerate FUNCTION: udev_enumerate* udev_enumerate_ref ( - udev_enumerate* udev_enumerate ) + udev_enumerate* udev_enumerate ) ; FUNCTION: void udev_enumerate_unref ( - udev_enumerate* udev_enumerate ) + udev_enumerate* udev_enumerate ) ; FUNCTION: udev* udev_enumerate_get_udev ( - udev_enumerate* udev_enumerate ) + udev_enumerate* udev_enumerate ) ; FUNCTION: udev_enumerate* udev_enumerate_new ( - udev* udev ) + udev* udev ) ; FUNCTION: int udev_enumerate_add_match_subsystem ( udev_enumerate* udev_enumerate, - c-string subsystem ) + c-string subsystem ) ; FUNCTION: int udev_enumerate_add_nomatch_subsystem ( udev_enumerate* udev_enumerate, - c-string subsystem ) + c-string subsystem ) ; FUNCTION: int udev_enumerate_add_match_sysattr ( udev_enumerate* udev_enumerate, c-string sysattr, - c-string value ) + c-string value ) ; FUNCTION: int udev_enumerate_add_nomatch_sysattr ( udev_enumerate* udev_enumerate, c-string sysattr, - c-string value ) + c-string value ) ; FUNCTION: int udev_enumerate_add_match_property ( udev_enumerate* udev_enumerate, c-string property, - c-string value ) + c-string value ) ; FUNCTION: int udev_enumerate_add_match_sysname ( udev_enumerate* udev_enumerate, - c-string sysname ) + c-string sysname ) ; FUNCTION: int udev_enumerate_add_syspath ( udev_enumerate* udev_enumerate, - c-string syspath ) + c-string syspath ) ; FUNCTION: int udev_enumerate_scan_devices ( - udev_enumerate* udev_enumerate ) + udev_enumerate* udev_enumerate ) ; FUNCTION: int udev_enumerate_scan_subsystems ( - udev_enumerate* udev_enumerate ) + udev_enumerate* udev_enumerate ) ; FUNCTION: udev_list_entry* udev_enumerate_get_list_entry ( - udev_enumerate* udev_enumerate ) + udev_enumerate* udev_enumerate ) ; c-type: udev_queue FUNCTION: udev_queue* udev_queue_ref ( - udev_queue* udev_queue ) + udev_queue* udev_queue ) ; FUNCTION: void udev_queue_unref ( - udev_queue* udev_queue ) + udev_queue* udev_queue ) ; FUNCTION: udev* udev_queue_get_udev ( - udev_queue* udev_queue ) + udev_queue* udev_queue ) ; FUNCTION: udev_queue* udev_queue_new ( - udev* udev ) + udev* udev ) ; FUNCTION: ulonglong udev_queue_get_kernel_seqnum ( - udev_queue* udev_queue ) + udev_queue* udev_queue ) ; FUNCTION: ulonglong udev_queue_get_udev_seqnum ( - udev_queue* udev_queue ) + udev_queue* udev_queue ) ; FUNCTION: int udev_queue_get_udev_is_active ( - udev_queue* udev_queue ) + udev_queue* udev_queue ) ; FUNCTION: int udev_queue_get_queue_is_empty ( - udev_queue* udev_queue ) + udev_queue* udev_queue ) ; FUNCTION: int udev_queue_get_seqnum_is_finished ( udev_queue* udev_queue, - ulonglong seqnum ) + ulonglong seqnum ) ; FUNCTION: int udev_queue_get_seqnum_sequence_is_finished ( udev_queue* udev_queue, ulonglong start, - ulonglong end ) + ulonglong end ) ; FUNCTION: udev_list_entry* udev_queue_get_queued_list_entry ( - udev_queue* udev_queue ) + udev_queue* udev_queue ) ; FUNCTION: udev_list_entry* udev_queue_get_failed_list_entry ( - udev_queue* udev_queue ) + udev_queue* udev_queue ) ; diff --git a/ffi/pcre/pcre-tests.factor b/ffi/pcre/pcre-tests.factor index 5e901fe32c..8bad0f47b7 100644 --- a/ffi/pcre/pcre-tests.factor +++ b/ffi/pcre/pcre-tests.factor @@ -1,7 +1,7 @@ USING: accessors arrays assocs continuations http.client kernel literals math.ranges pcre pcre.ffi pcre.private random sequences system tools.test ; -QUALIFIED: regexp +qualified: regexp in: pcre.tests { { "Bords" "words" "word" } } [ diff --git a/ffi/pcre/pcre.factor b/ffi/pcre/pcre.factor index 1806e08507..987aaf0dd9 100644 --- a/ffi/pcre/pcre.factor +++ b/ffi/pcre/pcre.factor @@ -5,7 +5,7 @@ USING: accessors alien alien.accessors alien.c-types alien.data alien.enums alien.strings arrays assocs combinators fry io.encodings.string io.encodings.utf8 kernel literals math math.bitwise pcre.ffi sequences splitting strings ; -QUALIFIED: regexp +qualified: regexp in: pcre ERROR: bad-option what ; diff --git a/ffi/python/python.factor b/ffi/python/python.factor index 391d23691d..8b73d17ad6 100644 --- a/ffi/python/python.factor +++ b/ffi/python/python.factor @@ -3,7 +3,7 @@ hashtables init io.encodings.utf8 kernel namespaces python.errors python.ffi python.objects sequences specialized-arrays strings vectors ; in: python -QUALIFIED: math +qualified: math ERROR: python-error type message traceback ; diff --git a/ffi/readline/readline.factor b/ffi/readline/readline.factor index 41352dec10..93e6f4dbe9 100644 --- a/ffi/readline/readline.factor +++ b/ffi/readline/readline.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: alien.data alien.libraries alien.strings compiler.units destructors fry io.encodings.utf8 kernel libc sequences words ; -QUALIFIED: readline.ffi +qualified: readline.ffi in: readline : readline ( prompt -- str ) diff --git a/ffi/unix/types/types.factor b/ffi/unix/types/types.factor index 31e84942e9..f0cf122c07 100644 --- a/ffi/unix/types/types.factor +++ b/ffi/unix/types/types.factor @@ -1,5 +1,5 @@ USING: accessors alien.c-types alien.syntax system vocabs ; -QUALIFIED: sequences +qualified: sequences in: unix.types TYPEDEF: uchar u_int8_t ; diff --git a/ffi/unix/users/users.factor b/ffi/unix/users/users.factor index 720672e2c4..963d9b6497 100644 --- a/ffi/unix/users/users.factor +++ b/ffi/unix/users/users.factor @@ -5,7 +5,7 @@ byte-arrays classes.struct combinators combinators.short-circuit continuations fry grouping io.encodings.utf8 kernel math math.parser namespaces sequences splitting strings system unix unix.ffi vocabs ; -QUALIFIED: unix.ffi +qualified: unix.ffi in: unix.users TUPLE: passwd user-name password uid gid gecos dir shell ; diff --git a/games/space-invaders/space-invaders.factor b/games/space-invaders/space-invaders.factor index 4bc8bf6bea..83910ae3ce 100755 --- a/games/space-invaders/space-invaders.factor +++ b/games/space-invaders/space-invaders.factor @@ -6,8 +6,8 @@ USING: accessors alien.c-types alien.data arrays combinators cpu.8080 cpu.8080.emulator io.pathnames kernel locals math math.order openal openal.alut opengl.gl sequences specialized-arrays ui ui.gadgets ui.gestures ui.render ; -QUALIFIED: threads -QUALIFIED: system +qualified: threads +qualified: system specialized-array: uchar in: space-invaders diff --git a/language/compiler/cfg/intrinsics/intrinsics.factor b/language/compiler/cfg/intrinsics/intrinsics.factor index 706b545709..a2ce0de779 100644 --- a/language/compiler/cfg/intrinsics/intrinsics.factor +++ b/language/compiler/cfg/intrinsics/intrinsics.factor @@ -6,21 +6,21 @@ compiler.cfg.intrinsics.fixnum compiler.cfg.intrinsics.float compiler.cfg.intrinsics.misc compiler.cfg.intrinsics.slots compiler.cfg.intrinsics.strings compiler.cfg.stacks cpu.architecture kernel words ; -QUALIFIED: alien -QUALIFIED: alien.accessors -QUALIFIED: alien.c-types -QUALIFIED: alien.data.private -QUALIFIED: arrays -QUALIFIED: byte-arrays -QUALIFIED: classes.tuple.private -QUALIFIED: kernel.private -QUALIFIED: math.bitwise.private -QUALIFIED: math.floats.private -QUALIFIED: math.integers.private -QUALIFIED: math.libm -QUALIFIED: math.private -QUALIFIED: slots.private -QUALIFIED: strings.private +qualified: alien +qualified: alien.accessors +qualified: alien.c-types +qualified: alien.data.private +qualified: arrays +qualified: byte-arrays +qualified: classes.tuple.private +qualified: kernel.private +qualified: math.bitwise.private +qualified: math.floats.private +qualified: math.integers.private +qualified: math.libm +qualified: math.private +qualified: slots.private +qualified: strings.private in: compiler.cfg.intrinsics ERROR: inline-intrinsics-not-supported word quot ; diff --git a/language/compiler/cfg/linear-scan/assignment/assignment.factor b/language/compiler/cfg/linear-scan/assignment/assignment.factor index 5c73e3832e..452d036403 100644 --- a/language/compiler/cfg/linear-scan/assignment/assignment.factor +++ b/language/compiler/cfg/linear-scan/assignment/assignment.factor @@ -8,7 +8,7 @@ compiler.cfg.renaming.functor compiler.cfg.ssa.destruction.leaders compiler.cfg.utilities fry heaps kernel make math namespaces sequences ; in: compiler.cfg.linear-scan.assignment -QUALIFIED: sets +qualified: sets ! This contains both active and inactive intervals; any interval ! such that start <= insn# <= end is in this set. diff --git a/language/compiler/cfg/liveness/liveness-tests.factor b/language/compiler/cfg/liveness/liveness-tests.factor index 3d5d69202b..86a005be5b 100644 --- a/language/compiler/cfg/liveness/liveness-tests.factor +++ b/language/compiler/cfg/liveness/liveness-tests.factor @@ -5,7 +5,7 @@ compiler.cfg.ssa.destruction.leaders compiler.cfg.utilities cpu.architecture cpu.x86.assembler.operands kernel math namespaces sequences system tools.test ; in: compiler.cfg.liveness.tests -QUALIFIED: sets +qualified: sets ! compute-edge-live-in { H{ } } [ diff --git a/language/compiler/cfg/parallel-copy/parallel-copy.factor b/language/compiler/cfg/parallel-copy/parallel-copy.factor index 0d64a70ac0..0f8b3ba1db 100644 --- a/language/compiler/cfg/parallel-copy/parallel-copy.factor +++ b/language/compiler/cfg/parallel-copy/parallel-copy.factor @@ -3,7 +3,7 @@ USING: assocs compiler.cfg.instructions compiler.cfg.registers compiler.cfg.ssa.destruction.leaders cpu.architecture deques dlists fry kernel locals make namespaces sequences ; -QUALIFIED: sets +qualified: sets in: compiler.cfg.parallel-copy vreg diff --git a/language/compiler/cfg/stacks/padding/padding.factor b/language/compiler/cfg/stacks/padding/padding.factor index eee57dd053..5af538bbf1 100644 --- a/language/compiler/cfg/stacks/padding/padding.factor +++ b/language/compiler/cfg/stacks/padding/padding.factor @@ -4,7 +4,7 @@ USING: accessors arrays assocs compiler.cfg.dataflow-analysis compiler.cfg.instructions compiler.cfg.linearization compiler.cfg.registers compiler.cfg.stacks.local fry kernel math math.order namespaces sequences ; -QUALIFIED: sets +qualified: sets in: compiler.cfg.stacks.padding ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/language/compiler/codegen/gc-maps/gc-maps-tests.factor b/language/compiler/codegen/gc-maps/gc-maps-tests.factor index 58560ec13d..3f07f8517b 100644 --- a/language/compiler/codegen/gc-maps/gc-maps-tests.factor +++ b/language/compiler/codegen/gc-maps/gc-maps-tests.factor @@ -3,7 +3,7 @@ compiler.cfg.instructions compiler.cfg.stack-frame compiler.cfg.utilities compiler.codegen.gc-maps compiler.codegen.relocation cpu.architecture cpu.x86 byte-arrays make namespaces kernel layouts math sequences specialized-arrays system tools.test ; -QUALIFIED: vm +qualified: vm specialized-array: uint in: compiler.codegen.gc-maps.tests diff --git a/language/compiler/tests/callstack-overflow.factor b/language/compiler/tests/callstack-overflow.factor index d3cf021e1d..0ca97e5aa1 100644 --- a/language/compiler/tests/callstack-overflow.factor +++ b/language/compiler/tests/callstack-overflow.factor @@ -1,7 +1,7 @@ USING: accessors classes.struct continuations kernel kernel.private literals math memory sequences system threads.private tools.dispatch.private tools.test ; -QUALIFIED: vm +qualified: vm 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 47da8c500b..1f516d295e 100644 --- a/language/compiler/tests/codegen.factor +++ b/language/compiler/tests/codegen.factor @@ -7,7 +7,7 @@ make alien.c-types alien.data combinators.short-circuit math.order math.libm math.parser math.functions alien.syntax memory stack-checker ; FROM: math => float ; -QUALIFIED: namespaces.private +qualified: namespaces.private in: compiler.tests.codegen ! Originally, this file did black box testing of templating diff --git a/language/compiler/tests/redefine24.factor b/language/compiler/tests/redefine24.factor index f067dac751..4cc34da595 100644 --- a/language/compiler/tests/redefine24.factor +++ b/language/compiler/tests/redefine24.factor @@ -1,5 +1,5 @@ USING: alien alien.syntax eval math tools.test ; -QUALIFIED: alien.c-types +qualified: alien.c-types in: compiler.tests.redefine24 TYPEDEF: alien.c-types:int type-1 ; diff --git a/language/compiler/tree/def-use/def-use.factor b/language/compiler/tree/def-use/def-use.factor index fe81805677..12b138955f 100644 --- a/language/compiler/tree/def-use/def-use.factor +++ b/language/compiler/tree/def-use/def-use.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors assocs compiler.tree compiler.tree.combinators fry kernel namespaces sequences stack-checker.branches ; -QUALIFIED: sets +qualified: sets in: compiler.tree.def-use symbol: def-use diff --git a/language/io/backend/unix/unix.factor b/language/io/backend/unix/unix.factor index 2c306d154f..3f75bf13e0 100755 --- a/language/io/backend/unix/unix.factor +++ b/language/io/backend/unix/unix.factor @@ -6,7 +6,7 @@ io.backend io.backend.unix.multiplexers io.buffers io.files io.ports io.timeouts kernel kernel.private libc locals make math namespaces sequences summary system threads unix unix.ffi unix.stat unix.types ; -QUALIFIED: io +qualified: io in: io.backend.unix CONSTANT: file-mode 0o0666 ; diff --git a/language/io/pipes/unix/unix.factor b/language/io/pipes/unix/unix.factor index 3a60556352..717f799a02 100644 --- a/language/io/pipes/unix/unix.factor +++ b/language/io/pipes/unix/unix.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: alien.c-types alien.data system kernel unix math sequences io.backend.unix io.ports libc specialized-arrays accessors unix.ffi ; -QUALIFIED: io.pipes +qualified: io.pipes specialized-array: int in: io.pipes.unix diff --git a/language/multi-methods/multi-methods.factor b/language/multi-methods/multi-methods.factor index 494e42a6a3..25d26a7c6c 100644 --- a/language/multi-methods/multi-methods.factor +++ b/language/multi-methods/multi-methods.factor @@ -246,7 +246,7 @@ SYNTAX: M: define ; ! Definition protocol. We qualify core generics here -QUALIFIED: syntax +qualified: syntax syntax:M: generic definer drop \ GENERIC: f ; diff --git a/language/prettyprint/backend/backend.factor b/language/prettyprint/backend/backend.factor index d4e9cc1d81..8d7733269c 100644 --- a/language/prettyprint/backend/backend.factor +++ b/language/prettyprint/backend/backend.factor @@ -7,7 +7,7 @@ hash-sets hashtables io.pathnames io.styles kernel make math math.order math.parser namespaces prettyprint.config prettyprint.custom prettyprint.sections prettyprint.stylesheet quotations sbufs sequences strings vectors words ; -QUALIFIED: sets +qualified: sets in: prettyprint.backend M: effect pprint* effect>string text ; diff --git a/language/vm/vm-tests.factor b/language/vm/vm-tests.factor index 313ab1c3ae..a5c1e84830 100644 --- a/language/vm/vm-tests.factor +++ b/language/vm/vm-tests.factor @@ -1,6 +1,6 @@ USING: accessors classes.struct kernel kernel.private math math.order tools.test ; -QUALIFIED: vm +qualified: vm in: vm.tests : get-ctx ( -- ctx ) diff --git a/libs/fuel/xref/xref-tests.factor b/libs/fuel/xref/xref-tests.factor index 3d5721dfd1..7c2b82da78 100644 --- a/libs/fuel/xref/xref-tests.factor +++ b/libs/fuel/xref/xref-tests.factor @@ -1,6 +1,6 @@ USING: arrays definitions fuel.xref fuel.xref.private io.pathnames kernel math sequences sets tools.test ; -QUALIFIED: tools.crossref +qualified: tools.crossref in: fuel.xref.tests { t } [ diff --git a/libs/http/server/static/static.factor b/libs/http/server/static/static.factor index fa6ba35976..3ae8729c7a 100644 --- a/libs/http/server/static/static.factor +++ b/libs/http/server/static/static.factor @@ -10,7 +10,7 @@ io.files.info io.directories io.pathnames io.encodings.binary fry xml.entities destructors urls html xml.syntax html.templates.fhtml http http.server http.server.responses http.server.redirection xml.writer ; -QUALIFIED: sets +qualified: sets TUPLE: file-responder root hook special index-names allow-listings ; diff --git a/libs/images/png/png.factor b/libs/images/png/png.factor index 2ec76ac21b..f80b57398b 100644 --- a/libs/images/png/png.factor +++ b/libs/images/png/png.factor @@ -5,7 +5,7 @@ compression.inflate fry grouping images images.loader io io.binary io.encodings.8-bit.latin1 io.encodings.ascii io.encodings.binary io.encodings.string io.streams.byte-array io.streams.throwing kernel locals math math.bitwise math.functions sequences sorting splitting ; -QUALIFIED: bitstreams +qualified: bitstreams in: images.png singleton: png-image diff --git a/libs/imap/imap.factor b/libs/imap/imap.factor index 3c87a6e345..b095f62d9a 100644 --- a/libs/imap/imap.factor +++ b/libs/imap/imap.factor @@ -3,7 +3,7 @@ formatting fry grouping io io.crlf io.encodings.ascii io.encodings.binary io.encodings.string io.encodings.utf7 io.encodings.utf8 io.sockets io.sockets.secure io.streams.duplex io.streams.string kernel math math.parser sequences splitting strings ; -QUALIFIED: pcre +qualified: pcre in: imap ERROR: imap4-error ind data ; diff --git a/libs/logging/insomniac/insomniac.factor b/libs/logging/insomniac/insomniac.factor index 9fa982b3ab..e2409a2790 100644 --- a/libs/logging/insomniac/insomniac.factor +++ b/libs/logging/insomniac/insomniac.factor @@ -3,7 +3,7 @@ USING: logging.analysis logging.server logging smtp kernel io.files io.streams.string namespaces make timers assocs io.encodings.utf8 accessors calendar sequences locals ; -QUALIFIED: io.sockets +qualified: io.sockets in: logging.insomniac symbol: insomniac-sender diff --git a/libs/unicode/case/case.factor b/libs/unicode/case/case.factor index ef901f8d4e..5cb9288b64 100644 --- a/libs/unicode/case/case.factor +++ b/libs/unicode/case/case.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: combinators.short-circuit kernel locals namespaces sbufs sequences splitting unicode.categories unicode.data ; -QUALIFIED: ascii +qualified: ascii in: unicode.case symbol: locale ! Just casing locale, or overall? diff --git a/tools/tools/deploy/shaker/shaker.factor b/tools/tools/deploy/shaker/shaker.factor index 4372a8bced..0c7b960357 100755 --- a/tools/tools/deploy/shaker/shaker.factor +++ b/tools/tools/deploy/shaker/shaker.factor @@ -12,7 +12,7 @@ tools.deploy.config combinators combinators.private classes vocabs.loader.private classes.builtin slots.private grouping command-line io.pathnames memoize namespaces.private hashtables locals source-files ; -QUALIFIED: classes.private +qualified: classes.private in: tools.deploy.shaker ! This file is some hairy shit. diff --git a/tools/tools/image-analyzer/code-heap-reader/code-heap-reader.factor b/tools/tools/image-analyzer/code-heap-reader/code-heap-reader.factor index 2612681043..84bc341885 100644 --- a/tools/tools/image-analyzer/code-heap-reader/code-heap-reader.factor +++ b/tools/tools/image-analyzer/code-heap-reader/code-heap-reader.factor @@ -1,7 +1,7 @@ USING: accessors alien.c-types classes.struct io kernel math math.bitwise tools.image-analyzer.gc-info tools.image-analyzer.vm ; in: tools.image-analyzer.code-heap-reader -QUALIFIED: layouts +qualified: layouts : free? ( code-block -- ? ) header>> 1 mask? ; diff --git a/tools/tools/image-analyzer/gc-info/gc-info-tests.factor b/tools/tools/image-analyzer/gc-info/gc-info-tests.factor index 8ed1a2f928..c40ac25865 100644 --- a/tools/tools/image-analyzer/gc-info/gc-info-tests.factor +++ b/tools/tools/image-analyzer/gc-info/gc-info-tests.factor @@ -7,11 +7,11 @@ random sequences sequences.generalizations tools.image-analyzer.gc-info tools.image-analyzer.utils tools.test vm vocabs words ; in: tools.image-analyzer.gc-info.tests -QUALIFIED: cpu.x86.features.private -QUALIFIED: crypto.aes.utils -QUALIFIED: effects -QUALIFIED: gtk-samples.opengl -QUALIFIED: opencl +qualified: cpu.x86.features.private +qualified: crypto.aes.utils +qualified: effects +qualified: gtk-samples.opengl +qualified: opencl : normal? ( word -- ? ) { [ generic? ] [ primitive? ] [ inline? ] [ no-compile? ] } 1|| not ; diff --git a/unmaintained/cfdg/cfdg.factor b/unmaintained/cfdg/cfdg.factor index 099f041031..a338991ad0 100644 --- a/unmaintained/cfdg/cfdg.factor +++ b/unmaintained/cfdg/cfdg.factor @@ -8,7 +8,7 @@ USING: kernel alien.c-types combinators namespaces make arrays ui.gadgets.handler ui.gestures assocs ui.gadgets macros specialized-arrays.double ; -QUALIFIED: syntax +qualified: syntax in: cfdg diff --git a/unmaintained/sniffer/io/bsd/bsd.factor b/unmaintained/sniffer/io/bsd/bsd.factor index 76b08d6f31..eb26783f02 100644 --- a/unmaintained/sniffer/io/bsd/bsd.factor +++ b/unmaintained/sniffer/io/bsd/bsd.factor @@ -4,7 +4,7 @@ USING: alien.c-types alien.syntax destructors hexdump io io.buffers io.nonblocking io.sockets io.unix.backend io.unix.files kernel libc locals math qualified sequences io.sniffer.backend ; -QUALIFIED: unix +qualified: unix in: io.sniffer.bsd M: unix-io destruct-handle ( obj -- ) unix:close ; diff --git a/unmaintained/ui/gadgets/layout/layout.factor b/unmaintained/ui/gadgets/layout/layout.factor index f4806b6b98..cbb356ea83 100644 --- a/unmaintained/ui/gadgets/layout/layout.factor +++ b/unmaintained/ui/gadgets/layout/layout.factor @@ -2,7 +2,7 @@ USING: accessors assocs arrays fry kernel lexer make math.parser models monads namespaces parser sequences sequences.extras models.combinators ui.gadgets ui.gadgets.tracks words ui.gadgets.controls ; -QUALIFIED: make +qualified: make QUALIFIED-WITH: ui.gadgets.books book ; in: ui.gadgets.layout