diff --git a/basis/alien/data/data-tests.factor b/basis/alien/data/data-tests.factor index 9806d90fc8..911627dc7e 100644 --- a/basis/alien/data/data-tests.factor +++ b/basis/alien/data/data-tests.factor @@ -46,7 +46,7 @@ SPECIALIZED-ARRAY: foo { f } [ B{ } binary-zero? ] unit-test { t } [ S{ foo f 0 f f } binary-zero? ] unit-test { f } [ S{ foo f 1 f f } binary-zero? ] unit-test -{ f } [ S{ foo f 0 ALIEN: 8 f } binary-zero? ] unit-test +{ f } [ S{ foo f 0 alien: 8 f } binary-zero? ] unit-test { f } [ S{ foo f 0 f t } binary-zero? ] unit-test { t t f } [ foo-array{ diff --git a/basis/alien/prettyprint/prettyprint.factor b/basis/alien/prettyprint/prettyprint.factor index 3417d6d1b8..6e1221db9f 100644 --- a/basis/alien/prettyprint/prettyprint.factor +++ b/basis/alien/prettyprint/prettyprint.factor @@ -11,7 +11,7 @@ M: alien pprint* { { [ dup expired? ] [ drop \ BAD-ALIEN pprint-word ] } { [ dup pinned-c-ptr? not ] [ drop "( displaced alien )" text ] } - [ \ ALIEN: [ alien-address >hex text ] pprint-prefix ] + [ \ alien: [ alien-address >hex text ] pprint-prefix ] } cond ; M: dll pprint* dll-path dup "DLL\" " "\"" pprint-string ; diff --git a/basis/alien/syntax/syntax-docs.factor b/basis/alien/syntax/syntax-docs.factor index fbdb8b59c4..571dd3591c 100644 --- a/basis/alien/syntax/syntax-docs.factor +++ b/basis/alien/syntax/syntax-docs.factor @@ -7,15 +7,15 @@ HELP: DLL" { $values { "path" "a pathname string" } } { $description "Constructs a DLL handle at parse time." } ; -HELP: ALIEN: -{ $syntax "ALIEN: address" } +HELP: alien: +{ $syntax "alien: address" } { $values { "address" "a non-negative hexadecimal integer" } } { $description "Creates an alien object at parse time." } { $notes "Alien objects are invalidated between image saves and loads, and hence source files should not contain alien literals; this word is for interactive use only. See " { $link "alien-expiry" } " for details." } ; ARTICLE: "syntax-aliens" "Alien object literal syntax" { $subsections - postpone: ALIEN: + postpone: alien: postpone: DLL" } ; diff --git a/basis/alien/syntax/syntax.factor b/basis/alien/syntax/syntax.factor index ae79370192..17e7c5d537 100755 --- a/basis/alien/syntax/syntax.factor +++ b/basis/alien/syntax/syntax.factor @@ -8,7 +8,7 @@ IN: alien.syntax SYNTAX: \DLL" lexer get skip-blank parse-string dlopen suffix! ; -SYNTAX: \ALIEN: 16 scan-base suffix! ; +SYNTAX: \alien: 16 scan-base suffix! ; SYNTAX: \BAD-ALIEN suffix! ; diff --git a/basis/compiler/tests/codegen.factor b/basis/compiler/tests/codegen.factor index 294ea1be3e..e2bfc97feb 100644 --- a/basis/compiler/tests/codegen.factor +++ b/basis/compiler/tests/codegen.factor @@ -451,7 +451,7 @@ TUPLE: myseq { underlying1 byte-array read-only } { underlying2 byte-array read- ] unit-test ! ##box-displaced-alien is a def-is-use instruction -[ ALIEN: 3e9 ] [ +[ alien: 3e9 ] [ [ f 100 [ 10 swap ] times diff --git a/basis/compiler/tests/intrinsics.factor b/basis/compiler/tests/intrinsics.factor index 97ba2cf589..da8fabeba8 100644 --- a/basis/compiler/tests/intrinsics.factor +++ b/basis/compiler/tests/intrinsics.factor @@ -437,8 +437,8 @@ ERROR: bug-in-fixnum* x y a b ; [ ] [ "s" get free ] unit-test ] when -[ ALIEN: 1234 ] [ ALIEN: 1234 [ { alien } declare void* ] compile-call void* deref ] unit-test -[ ALIEN: 1234 ] [ ALIEN: 1234 [ { c-ptr } declare void* ] compile-call void* deref ] unit-test +[ alien: 1234 ] [ alien: 1234 [ { alien } declare void* ] compile-call void* deref ] unit-test +[ alien: 1234 ] [ alien: 1234 [ { c-ptr } declare void* ] compile-call void* deref ] unit-test [ f ] [ f [ { postpone: f } declare void* ] compile-call void* deref ] unit-test [ 252 ] [ B{ 1 2 3 -4 5 } 3 [ { byte-array fixnum } declare alien-unsigned-1 ] compile-call ] unit-test @@ -478,15 +478,15 @@ ERROR: bug-in-fixnum* x y a b ; ] compile-call ] unit-test -[ ALIEN: 123 ] [ +[ alien: 123 ] [ 0x123 [ ] compile-call ] unit-test -[ ALIEN: 123 ] [ +[ alien: 123 ] [ 0x123 [ { fixnum } declare ] compile-call ] unit-test -[ ALIEN: 123 ] [ +[ alien: 123 ] [ [ 0x123 ] compile-call ] unit-test @@ -502,16 +502,16 @@ ERROR: bug-in-fixnum* x y a b ; [ 0 ] compile-call ] unit-test -[ ALIEN: 321 ] [ - 0 ALIEN: 321 [ ] compile-call +[ alien: 321 ] [ + 0 alien: 321 [ ] compile-call ] unit-test -[ ALIEN: 321 ] [ - 0 ALIEN: 321 [ { fixnum c-ptr } declare ] compile-call +[ alien: 321 ] [ + 0 alien: 321 [ { fixnum c-ptr } declare ] compile-call ] unit-test -[ ALIEN: 321 ] [ - ALIEN: 321 [ 0 swap ] compile-call +[ alien: 321 ] [ + alien: 321 [ 0 swap ] compile-call ] unit-test [ B{ 0 1 2 3 4 } ] [ @@ -526,8 +526,8 @@ ERROR: bug-in-fixnum* x y a b ; underlying>> ] unit-test -[ ALIEN: 1234 ALIEN: 2234 ] [ - ALIEN: 234 [ +[ alien: 1234 alien: 2234 ] [ + alien: 234 [ { c-ptr } declare [ 0x1000 swap ] [ 0x2000 swap ] bi diff --git a/basis/compiler/tests/optimizer.factor b/basis/compiler/tests/optimizer.factor index 3e0966263f..b8f38110bf 100644 --- a/basis/compiler/tests/optimizer.factor +++ b/basis/compiler/tests/optimizer.factor @@ -440,10 +440,10 @@ M: object bad-push-test-case "foo" throw ; inline STRUCT: BitmapData { Scan0 void* } ; -[ ALIEN: 123 ] [ +[ alien: 123 ] [ [ { BitmapData } - [ BitmapData memory>struct ALIEN: 123 >>Scan0 drop ] + [ BitmapData memory>struct alien: 123 >>Scan0 drop ] with-out-parameters Scan0>> ] compile-call ] unit-test diff --git a/basis/io/files/windows/windows-docs.factor b/basis/io/files/windows/windows-docs.factor index 099efaa07c..113871d412 100644 --- a/basis/io/files/windows/windows-docs.factor +++ b/basis/io/files/windows/windows-docs.factor @@ -8,6 +8,6 @@ HELP: open-read { $unchecked-example "USING: io.files.windows prettyprint ;" "\"resource:core/kernel/kernel.factor\" absolute-path open-read ." - "T{ win32-file { handle ALIEN: 234 } { ptr 0 } }" + "T{ win32-file { handle alien: 234 } { ptr 0 } }" } } ; diff --git a/basis/specialized-arrays/specialized-arrays-tests.factor b/basis/specialized-arrays/specialized-arrays-tests.factor index 95db87e683..29fe73b7c9 100644 --- a/basis/specialized-arrays/specialized-arrays-tests.factor +++ b/basis/specialized-arrays/specialized-arrays-tests.factor @@ -45,7 +45,7 @@ SPECIALIZED-ARRAYS: bool uchar ushort char uint float ulonglong ; { f } [ [ float-array{ 4 3 2 1 } dup clone [ underlying>> ] bi@ eq? ] compile-call ] unit-test { ushort-array{ 0 0 0 } } [ - 3 ALIEN: 123 100 new-sequence + 3 alien: 123 100 new-sequence [ drop 0 ] map! ] unit-test @@ -83,7 +83,7 @@ SPECIALIZED-ARRAY: test-struct ] with-destructors ] unit-test -{ } [ ALIEN: 123 10 drop ] unit-test +{ } [ alien: 123 10 drop ] unit-test { } [ [ @@ -113,13 +113,13 @@ STRUCT: fixed-string { text char[64] } ; SPECIALIZED-ARRAY: fixed-string -{ { ALIEN: 100 ALIEN: 140 ALIEN: 180 ALIEN: 1c0 } } [ - ALIEN: 100 4 [ (underlying)>> ] { } map-as +{ { alien: 100 alien: 140 alien: 180 alien: 1c0 } } [ + alien: 100 4 [ (underlying)>> ] { } map-as ] unit-test ! Ensure that byte-length works with direct arrays { 400 } [ - ALIEN: 123 100 byte-length + alien: 123 100 byte-length ] unit-test { } [ diff --git a/basis/tools/ps/windows/windows.factor b/basis/tools/ps/windows/windows.factor index 6b6a143eb5..db79e62f20 100644 --- a/basis/tools/ps/windows/windows.factor +++ b/basis/tools/ps/windows/windows.factor @@ -62,7 +62,7 @@ IN: tools.ps.windows PVOID heap-size read-process-memory PVOID deref :> args-offset - args-offset ALIEN: 0 = [ + args-offset alien: 0 = [ f ] [ handle diff --git a/basis/ui/backend/gtk/gtk-tests.factor b/basis/ui/backend/gtk/gtk-tests.factor index 921f70fb2a..91dd447c6c 100644 --- a/basis/ui/backend/gtk/gtk-tests.factor +++ b/basis/ui/backend/gtk/gtk-tests.factor @@ -5,13 +5,13 @@ IN: ui.backend.gtk.tests : gdk-key-release-event ( -- event ) S{ GdkEventKey { type 9 } - { window ALIEN: 1672900 } + { window alien: 1672900 } { send_event 0 } { time 1332590199 } { state 17 } { keyval 72 } { length 1 } - { string ALIEN: 1b25c80 } + { string alien: 1b25c80 } { hardware_keycode 43 } { group 0 } { is_modifier 0 } @@ -20,13 +20,13 @@ IN: ui.backend.gtk.tests : gdk-key-press-event ( -- event ) S{ GdkEventKey { type 8 } - { window ALIEN: 16727e0 } + { window alien: 16727e0 } { send_event 0 } { time 1332864912 } { state 16 } { keyval 65471 } { length 0 } - { string ALIEN: 19c9700 } + { string alien: 19c9700 } { hardware_keycode 68 } { group 0 } { is_modifier 0 } @@ -35,13 +35,13 @@ IN: ui.backend.gtk.tests : gdk-space-key-press-event ( -- event ) S{ GdkEventKey { type 8 } - { window ALIEN: 1b66360 } + { window alien: 1b66360 } { send_event 0 } { time 28246628 } { state 0 } { keyval 32 } { length 0 } - { string ALIEN: 20233b0 } + { string alien: 20233b0 } { hardware_keycode 64 } { group 0 } { is_modifier 1 } @@ -50,13 +50,13 @@ IN: ui.backend.gtk.tests : gdk-windows-key-release-event ( -- event ) S{ GdkEventKey { type 9 } - { window ALIEN: 1a71d80 } + { window alien: 1a71d80 } { send_event 0 } { time 47998769 } { state 67108928 } { keyval 119 } { length 1 } - { string ALIEN: 2017640 } + { string alien: 2017640 } { hardware_keycode 25 } { group 0 } { is_modifier 0 } diff --git a/basis/unix/ffi/ffi.factor b/basis/unix/ffi/ffi.factor index 7c0080f6e8..8353bfa3a0 100644 --- a/basis/unix/ffi/ffi.factor +++ b/basis/unix/ffi/ffi.factor @@ -32,9 +32,9 @@ CONSTANT: DT_LNK 10 CONSTANT: DT_SOCK 12 CONSTANT: DT_WHT 14 -: SIG_EFF ( -- obj ) ALIEN: -1 void* ; inline -: SIG_DFL ( -- obj ) ALIEN: 0 void* ; inline -: SIG_IGN ( -- obj ) ALIEN: 1 void* ; inline +: SIG_EFF ( -- obj ) alien: -1 void* ; inline +: SIG_DFL ( -- obj ) alien: 0 void* ; inline +: SIG_IGN ( -- obj ) alien: 1 void* ; inline ! Possible values for 'ai_flags' in 'addrinfo'. CONSTANT: AI_PASSIVE 0x0001 diff --git a/core/alien/alien-docs.factor b/core/alien/alien-docs.factor index 79c15f91b3..30b790c237 100644 --- a/core/alien/alien-docs.factor +++ b/core/alien/alien-docs.factor @@ -149,7 +149,7 @@ HELP: alien-assembly ARTICLE: "alien-expiry" "Alien expiry" "When an image is loaded, any alien objects which persisted from the previous session are marked as having expired. This is because the C pointers they contain are almost certainly no longer valid." $nl -"For this reason, the " { $link postpone: ALIEN: } " word should not be used in source files, since loading the source file then saving the image will result in the literal becoming expired. Use " { $link } " instead, and ensure the word calling " { $link } " is not declared " { $link postpone: flushable } "." +"For this reason, the " { $link postpone: alien: } " word should not be used in source files, since loading the source file then saving the image will result in the literal becoming expired. Use " { $link } " instead, and ensure the word calling " { $link } " is not declared " { $link postpone: flushable } "." { $subsections expired? } ; ARTICLE: "aliens" "Alien addresses" diff --git a/core/alien/alien-tests.factor b/core/alien/alien-tests.factor index d49ea4b890..6f2eaa1840 100644 --- a/core/alien/alien-tests.factor +++ b/core/alien/alien-tests.factor @@ -56,7 +56,7 @@ cell 8 = [ ] unit-test ] when -{ "ALIEN: 1234" } [ 0x1234 unparse ] unit-test +{ "alien: 1234" } [ 0x1234 unparse ] unit-test { } [ 0 B{ 1 2 3 } drop ] unit-test diff --git a/extra/benchmark/dispatch3/dispatch3.factor b/extra/benchmark/dispatch3/dispatch3.factor index a1d58474b8..dffad3b2f8 100644 --- a/extra/benchmark/dispatch3/dispatch3.factor +++ b/extra/benchmark/dispatch3/dispatch3.factor @@ -41,7 +41,7 @@ M: object g drop "object" ; 123.456 , 1/6 , C{ 1 2 } , - ALIEN: 1234 , + alien: 1234 , ] { } make ; : dispatch3-benchmark ( -- ) diff --git a/extra/forestdb/lib/lib.factor b/extra/forestdb/lib/lib.factor index 6d576d1828..3e44a8af66 100644 --- a/extra/forestdb/lib/lib.factor +++ b/extra/forestdb/lib/lib.factor @@ -223,8 +223,8 @@ CONSTRUCTOR: fdb-info ( filename new-filename doc-count space-used file-s ! Example fdb_doc and converted doc S{ fdb_doc { keylen 4 } { metalen 0 } { bodylen 4 } { size_ondisk 0 } - { key ALIEN: 1002f2f10 } { seqnum 5 } { offset 4256 } - { meta ALIEN: 1002dc790 } { body f } { deleted f } + { key alien: 1002f2f10 } { seqnum 5 } { offset 4256 } + { meta alien: 1002dc790 } { body f } { deleted f } } T{ doc { seqnum 5 } diff --git a/extra/llvm/reader/reader-docs.factor b/extra/llvm/reader/reader-docs.factor index 5a34ba6a2e..0aa57e9557 100644 --- a/extra/llvm/reader/reader-docs.factor +++ b/extra/llvm/reader/reader-docs.factor @@ -15,6 +15,6 @@ HELP: load-module { $unchecked-example "USING: io.pathnames llvm.reader ;" "\"resource:extra/llvm/wrappers/add.bc\" absolute-path load-module" - "T{ module { value ALIEN: 1be7120 } }" + "T{ module { value alien: 1be7120 } }" } } ; diff --git a/misc/fuel/strange-syntax.factor b/misc/fuel/strange-syntax.factor index cbab9204c4..88a96594b7 100644 --- a/misc/fuel/strange-syntax.factor +++ b/misc/fuel/strange-syntax.factor @@ -96,7 +96,7 @@ FUNCTION: int futimes ( int id, FUNCTION: int booyah ( int x ) FUNCTION-ALIAS: test int bah ( int* ah, int[] eh ) -hexcolor: ffffff color: green nan: 1234 char: m ALIEN: 93 +hexcolor: ffffff color: green nan: 1234 char: m alien: 93 2drop 2drop drop PRIMITIVE: one ( a -- b )