From 4ebe5218c7d59680fb998f0f7d7de70ac0d15641 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Mon, 24 Oct 2011 21:47:00 -0700 Subject: [PATCH] Update Windows for word renames, fix lint errors --- basis/io/launcher/windows/windows.factor | 2 +- basis/windows/directx/dinput/constants/constants.factor | 2 +- core/combinators/combinators-docs.factor | 4 ++-- core/math/integers/integers-docs.factor | 6 +++--- core/math/math-docs.factor | 2 +- extra/graphviz/graphviz-docs.factor | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/basis/io/launcher/windows/windows.factor b/basis/io/launcher/windows/windows.factor index 5b2bde0946..4cc6028944 100755 --- a/basis/io/launcher/windows/windows.factor +++ b/basis/io/launcher/windows/windows.factor @@ -28,7 +28,7 @@ TUPLE: CreateProcess-args : default-CreateProcess-args ( -- obj ) CreateProcess-args new STARTUPINFO - dup class heap-size >>cb + dup class-of heap-size >>cb >>lpStartupInfo PROCESS_INFORMATION >>lpProcessInformation TRUE >>bInheritHandles diff --git a/basis/windows/directx/dinput/constants/constants.factor b/basis/windows/directx/dinput/constants/constants.factor index 1c8e0a3087..a47a47da5a 100755 --- a/basis/windows/directx/dinput/constants/constants.factor +++ b/basis/windows/directx/dinput/constants/constants.factor @@ -30,7 +30,7 @@ M: object array-base-type ; M: array array-base-type first ; : (field-spec-of) ( field struct -- field-spec ) - c-type fields>> [ name>> = ] with find nip ; + lookup-c-type fields>> [ name>> = ] with find nip ; : (offsetof) ( field struct -- offset ) [ (field-spec-of) offset>> ] [ drop 0 ] if* ; : (sizeof) ( field struct -- size ) diff --git a/core/combinators/combinators-docs.factor b/core/combinators/combinators-docs.factor index 8caa39c652..783b8209d1 100644 --- a/core/combinators/combinators-docs.factor +++ b/core/combinators/combinators-docs.factor @@ -145,9 +145,9 @@ $nl "Here is an array containing the " { $link f } " class:" { $example "{ POSTPONE: f } ." "{ POSTPONE: f }" } "The " { $link f } " object is an instance of the " { $link f } " class:" -{ $example "USE: classes" "f class ." "POSTPONE: f" } +{ $example "USE: classes" "f class-of ." "POSTPONE: f" } "The " { $link f } " class is an instance of " { $link word } ":" -{ $example "USE: classes" "\\ f class ." "word" } +{ $example "USE: classes" "\\ f class-of ." "word" } "On the other hand, " { $link t } " is just a word, and there is no class which it is a unique instance of." { $example "t \\ t eq? ." "t" } "Many words which search collections confuse the case of no element being present with an element being found equal to " { $link f } ". If this distinction is important, there is usually an alternative word which can be used; for example, compare " { $link at } " with " { $link at* } "." ; diff --git a/core/math/integers/integers-docs.factor b/core/math/integers/integers-docs.factor index 6f1dbece37..4ff4b11b83 100644 --- a/core/math/integers/integers-docs.factor +++ b/core/math/integers/integers-docs.factor @@ -4,10 +4,10 @@ IN: math.integers ARTICLE: "integers" "Integers" { $subsections integer } "Integers come in two varieties -- fixnums and bignums. Fixnums fit in a machine word and are faster to manipulate; if the result of a fixnum operation is too large to fit in a fixnum, the result is upgraded to a bignum. Here is an example where two fixnums are multiplied yielding a bignum:" -{ $example "USE: classes" "67108864 class ." "fixnum" } -{ $example "USE: classes" "128 class ." "fixnum" } +{ $example "USE: classes" "67108864 class-of ." "fixnum" } +{ $example "USE: classes" "128 class-of ." "fixnum" } { $example "134217728 128 * ." "17179869184" } -{ $example "USE: classes" "1 128 shift class ." "bignum" } +{ $example "USE: classes" "1 128 shift class-of ." "bignum" } "Integers can be entered using a different base; see " { $link "syntax-numbers" } "." $nl "Integers can be tested for, and real numbers can be converted to integers:" diff --git a/core/math/math-docs.factor b/core/math/math-docs.factor index cc5f2d43f7..44420951fb 100644 --- a/core/math/math-docs.factor +++ b/core/math/math-docs.factor @@ -444,7 +444,7 @@ ARTICLE: "number-protocol" "Number protocol" "Math operations obey certain numerical upgrade rules. If one of the inputs is a bignum and the other is a fixnum, the latter is first coerced to a bignum; if one of the inputs is a float, the other is coerced to a float." $nl "Two examples where you should note the types of the inputs and outputs:" -{ $example "USE: classes" "3 >fixnum 6 >bignum * class ." "bignum" } +{ $example "USE: classes" "3 >fixnum 6 >bignum * class-of ." "bignum" } { $example "1/2 2.0 + ." "2.5" } "The following usual operations are supported by all numbers." { $subsections diff --git a/extra/graphviz/graphviz-docs.factor b/extra/graphviz/graphviz-docs.factor index 76a27b2eb5..c05b2fc82c 100644 --- a/extra/graphviz/graphviz-docs.factor +++ b/extra/graphviz/graphviz-docs.factor @@ -121,7 +121,7 @@ HELP: { $example "USING: accessors classes graphviz kernel prettyprint strings ;" "1 { 2 3 4 } " - "[ tail>> class . ] [ head>> class . ] bi" + "[ tail>> class-of . ] [ head>> class-of . ] bi" "string\nsubgraph" } $nl @@ -319,7 +319,7 @@ HELP: add " 1 add" " 2 add" " 1 2 add" - "statements>> [ class . ] each" + "statements>> [ class-of . ] each" "node\nnode\nedge" } } -- 2.34.1