From 30b75a797a39a48714677a1fbdeff7fd2d80fb41 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 13 Apr 2008 15:06:09 -0500 Subject: [PATCH] construct-boa -> boa construct-empty -> new --- core/alien/alien.factor | 2 +- core/alien/c-types/c-types.factor | 2 +- core/alien/compiler/compiler.factor | 12 +++--- core/alien/structs/structs.factor | 2 +- core/bit-vectors/bit-vectors.factor | 2 +- core/boxes/boxes.factor | 2 +- core/byte-vectors/byte-vectors.factor | 2 +- core/classes/mixin/mixin.factor | 2 +- core/classes/tuple/tuple-docs.factor | 40 +++++++++---------- core/classes/tuple/tuple-tests.factor | 10 ++--- core/classes/tuple/tuple.factor | 2 +- core/compiler/tests/tuples.factor | 8 ++-- core/compiler/units/units.factor | 2 +- core/cpu/x86/assembler/assembler.factor | 2 +- core/dlists/dlists.factor | 2 +- core/effects/effects.factor | 2 +- core/float-vectors/float-vectors.factor | 2 +- core/generator/fixup/fixup.factor | 8 ++-- core/generator/registers/registers.factor | 8 ++-- core/generic/generic.factor | 2 +- .../standard/engines/tuple/tuple.factor | 2 +- core/generic/standard/standard-tests.factor | 16 ++++---- core/hashtables/hashtables.factor | 2 +- core/heaps/heaps.factor | 4 +- core/inference/backend/backend.factor | 4 +- core/inference/dataflow/dataflow.factor | 18 ++++----- .../transforms/transforms-tests.factor | 2 +- core/inference/transforms/transforms.factor | 6 +-- core/io/encodings/encodings.factor | 8 ++-- core/io/streams/duplex/duplex-tests.factor | 4 +- core/io/streams/duplex/duplex.factor | 2 +- core/kernel/kernel.factor | 6 +-- core/mirrors/mirrors.factor | 2 +- core/optimizer/known-words/known-words.factor | 2 +- core/optimizer/optimizer-tests.factor | 2 +- core/parser/parser.factor | 4 +- core/prettyprint/sections/sections.factor | 4 +- core/sbufs/sbufs.factor | 2 +- core/sequences/sequences.factor | 2 +- core/splitting/splitting.factor | 2 +- core/syntax/syntax-docs.factor | 6 +-- core/syntax/syntax.factor | 2 +- core/threads/threads.factor | 2 +- core/vectors/vectors.factor | 2 +- core/vocabs/vocabs.factor | 2 +- 45 files changed, 111 insertions(+), 111 deletions(-) diff --git a/core/alien/alien.factor b/core/alien/alien.factor index 2f82e5db98..f664e1175a 100755 --- a/core/alien/alien.factor +++ b/core/alien/alien.factor @@ -54,7 +54,7 @@ TUPLE: library path abi dll ; : library ( name -- library ) libraries get at ; : ( path abi -- library ) - over dup [ dlopen ] when \ library construct-boa ; + over dup [ dlopen ] when \ library boa ; : load-library ( name -- dll ) library dup [ library-dll ] when ; diff --git a/core/alien/c-types/c-types.factor b/core/alien/c-types/c-types.factor index 508fcd61a6..2e5e05f6e8 100755 --- a/core/alien/c-types/c-types.factor +++ b/core/alien/c-types/c-types.factor @@ -19,7 +19,7 @@ getter setter reg-class size align stack-align? ; : construct-c-type ( class -- type ) - construct-empty + new int-regs >>reg-class ; : ( -- type ) diff --git a/core/alien/compiler/compiler.factor b/core/alien/compiler/compiler.factor index 594c42268c..b6fcbe6176 100755 --- a/core/alien/compiler/compiler.factor +++ b/core/alien/compiler/compiler.factor @@ -220,7 +220,7 @@ M: no-such-library compiler-error-type drop +linkage+ ; : no-such-library ( name -- ) - \ no-such-library construct-boa + \ no-such-library boa compiling-word get compiler-error ; TUPLE: no-such-symbol name ; @@ -232,7 +232,7 @@ M: no-such-symbol compiler-error-type drop +linkage+ ; : no-such-symbol ( name -- ) - \ no-such-symbol construct-boa + \ no-such-symbol boa compiling-word get compiler-error ; : check-dlsym ( symbols dll -- ) @@ -251,7 +251,7 @@ M: no-such-symbol compiler-error-type \ alien-invoke [ ! Four literals 4 ensure-values - #alien-invoke construct-empty + #alien-invoke new ! Compile-time parameters pop-parameters >>parameters pop-literal nip >>function @@ -288,7 +288,7 @@ M: alien-indirect-error summary ! Three literals and function pointer 4 ensure-values 4 reify-curries - #alien-indirect construct-empty + #alien-indirect new ! Compile-time parameters pop-literal nip >>abi pop-parameters >>parameters @@ -335,7 +335,7 @@ M: alien-callback-error summary \ alien-callback [ 4 ensure-values - #alien-callback construct-empty dup node, + #alien-callback new dup node, pop-literal nip >>quot pop-literal nip >>abi pop-parameters >>parameters @@ -381,7 +381,7 @@ TUPLE: callback-context ; : wrap-callback-quot ( node -- quot ) [ [ quot>> ] [ prepare-callback-return ] bi append , - [ callback-context construct-empty do-callback ] % + [ callback-context new do-callback ] % ] [ ] make ; : %unnest-stacks ( -- ) "unnest_stacks" f %alien-invoke ; diff --git a/core/alien/structs/structs.factor b/core/alien/structs/structs.factor index 491f4351a3..6d98d31790 100755 --- a/core/alien/structs/structs.factor +++ b/core/alien/structs/structs.factor @@ -68,7 +68,7 @@ M: struct-type stack-size : (define-struct) ( name vocab size align fields -- ) >r [ align ] keep r> - struct-type construct-boa + struct-type boa -rot define-c-type ; : make-field ( struct-name vocab type field-name -- spec ) diff --git a/core/bit-vectors/bit-vectors.factor b/core/bit-vectors/bit-vectors.factor index 3949dc2632..db941ac6f7 100755 --- a/core/bit-vectors/bit-vectors.factor +++ b/core/bit-vectors/bit-vectors.factor @@ -7,7 +7,7 @@ IN: bit-vectors vector ( bit-array length -- bit-vector ) - bit-vector construct-boa ; inline + bit-vector boa ; inline PRIVATE> diff --git a/core/boxes/boxes.factor b/core/boxes/boxes.factor index a989e091bb..b56a46b6b3 100755 --- a/core/boxes/boxes.factor +++ b/core/boxes/boxes.factor @@ -5,7 +5,7 @@ IN: boxes TUPLE: box value full? ; -: ( -- box ) box construct-empty ; +: ( -- box ) box new ; : >box ( value box -- ) dup box-full? [ "Box already has a value" throw ] when diff --git a/core/byte-vectors/byte-vectors.factor b/core/byte-vectors/byte-vectors.factor index 9a0185319f..206a23f43b 100755 --- a/core/byte-vectors/byte-vectors.factor +++ b/core/byte-vectors/byte-vectors.factor @@ -7,7 +7,7 @@ IN: byte-vectors vector ( byte-array length -- byte-vector ) - byte-vector construct-boa ; inline + byte-vector boa ; inline PRIVATE> diff --git a/core/classes/mixin/mixin.factor b/core/classes/mixin/mixin.factor index 9bbe89d7d9..33b0fc32fa 100755 --- a/core/classes/mixin/mixin.factor +++ b/core/classes/mixin/mixin.factor @@ -24,7 +24,7 @@ TUPLE: check-mixin-class mixin ; : check-mixin-class ( mixin -- mixin ) dup mixin-class? [ - \ check-mixin-class construct-boa throw + \ check-mixin-class boa throw ] unless ; : if-mixin-member? ( class mixin true false -- ) diff --git a/core/classes/tuple/tuple-docs.factor b/core/classes/tuple/tuple-docs.factor index 5d35afb7d3..76165deb38 100755 --- a/core/classes/tuple/tuple-docs.factor +++ b/core/classes/tuple/tuple-docs.factor @@ -4,7 +4,7 @@ generic.standard sequences definitions compiler.units ; IN: classes.tuple ARTICLE: "parametrized-constructors" "Parameterized constructors" -"A " { $emphasis "parametrized constructor" } " is a word which directly or indirectly calls " { $link construct-empty } " or " { $link construct-boa } ", but instead of passing a literal class symbol, it takes the class symbol as an input from the stack." +"A " { $emphasis "parametrized constructor" } " is a word which directly or indirectly calls " { $link new } " or " { $link boa } ", but instead of passing a literal class symbol, it takes the class symbol as an input from the stack." $nl "Parametrized constructors are useful in many situations, in particular with subclassing. For example, consider the following code:" { $code @@ -14,14 +14,14 @@ $nl "" "TUPLE: car < vehicle engine ;" ": ( max-speed engine -- car )" - " car construct-empty" + " car new" " V{ } clone >>occupants" " swap >>engine" " swap >>max-speed ;" "" "TUPLE: aeroplane < vehicle max-altitude ;" ": ( max-speed max-altitude -- aeroplane )" - " aeroplane construct-empty" + " aeroplane new" " V{ } clone >>occupants" " swap >>max-altitude" " swap >>max-speed ;" @@ -33,7 +33,7 @@ $nl ": add-occupant ( person vehicle -- ) occupants>> push ;" "" ": construct-vehicle ( class -- vehicle )" - " construct-empty" + " new" " V{ } clone >>occupants ;" "" "TUPLE: car < vehicle engine ;" @@ -52,8 +52,8 @@ $nl ARTICLE: "tuple-constructors" "Tuple constructors" "Tuples are created by calling one of two constructor primitives:" -{ $subsection construct-empty } -{ $subsection construct-boa } +{ $subsection new } +{ $subsection boa } "A shortcut for defining BOA constructors:" { $subsection POSTPONE: C: } "By convention, construction logic is encapsulated in a word named after the tuple class surrounded in angle brackets; for example, the constructor word for a " { $snippet "point" } " class might be named " { $snippet "" } "." @@ -65,11 +65,11 @@ $nl "TUPLE: color red green blue alpha ;" "" "C: rgba" - ": color construct-boa ; ! identical to above" + ": color boa ; ! identical to above" "" ": f ;" "" - ": construct-empty ;" + ": new ;" ": f f f f ; ! identical to above" } { $subsection "parametrized-constructors" } ; @@ -129,7 +129,7 @@ $nl $nl "The second is to use ad-hoc slot polymorphism. If two classes define a slot with the same name, then code which uses " { $link "accessors" } " can operate on instances of both objects, assuming the values stored in that slot implement a common protocol. This allows code to be shared without creating contrieved relationships between classes." { $heading "Anti-pattern #3: subclassing to override a method definition" } -"While method overriding is a very powerful tool, improper use can cause tight coupling of code and lead to difficulty in testing and refactoring. Subclassing should not be used as a means of ``monkey patching'' methods to fix bugs and add features. Only subclass from classes which were designed to be inherited from, and when writing classes of your own which are intended to be subclassed, clearly document that subclasses may and may not do. This includes construction policy; document whether subclasses should use " { $link construct-empty } ", " { $link construct-boa } ", or a custom parametrized constructor." +"While method overriding is a very powerful tool, improper use can cause tight coupling of code and lead to difficulty in testing and refactoring. Subclassing should not be used as a means of ``monkey patching'' methods to fix bugs and add features. Only subclass from classes which were designed to be inherited from, and when writing classes of your own which are intended to be subclassed, clearly document that subclasses may and may not do. This includes construction policy; document whether subclasses should use " { $link new } ", " { $link boa } ", or a custom parametrized constructor." { $see-also "parametrized-constructors" } ; ARTICLE: "tuple-subclassing" "Tuple subclassing" @@ -164,11 +164,11 @@ ARTICLE: "tuple-examples" "Tuple examples" } "We can define a constructor which makes an empty employee:" { $code ": ( -- employee )" - " employee construct-empty ;" } + " employee new ;" } "Or we may wish the default constructor to always give employees a starting salary:" { $code ": ( -- employee )" - " employee construct-empty" + " employee new" " 40000 >>salary ;" } "We can define more refined constructors:" @@ -178,7 +178,7 @@ ARTICLE: "tuple-examples" "Tuple examples" "An alternative strategy is to define the most general BOA constructor first:" { $code ": ( name position -- person )" - " 40000 employee construct-boa ;" + " 40000 employee boa ;" } "Now we can define more specific constructors:" { $code @@ -191,7 +191,7 @@ ARTICLE: "tuple-examples" "Tuple examples" "SYMBOL: checks" "" ": ( to amount -- check )" - " checks counter check construct-boa ;" + " checks counter check boa ;" "" ": biweekly-paycheck ( employee -- check )" " dup name>> swap salary>> 26 / ;" @@ -326,20 +326,20 @@ HELP: tuple>array ( tuple -- array ) HELP: ( layout -- tuple ) { $values { "layout" tuple-layout } { "tuple" tuple } } -{ $description "Low-level tuple constructor. User code should never call this directly, and instead use " { $link construct-empty } "." } ; +{ $description "Low-level tuple constructor. User code should never call this directly, and instead use " { $link new } "." } ; HELP: ( ... layout -- tuple ) { $values { "..." "values" } { "layout" tuple-layout } { "tuple" tuple } } -{ $description "Low-level tuple constructor. User code should never call this directly, and instead use " { $link construct-boa } "." } ; +{ $description "Low-level tuple constructor. User code should never call this directly, and instead use " { $link boa } "." } ; -HELP: construct-empty +HELP: new { $values { "class" tuple-class } { "tuple" tuple } } { $description "Creates a new instance of " { $snippet "class" } " with all slots initially set to " { $link f } "." } { $examples { $example "USING: kernel prettyprint ;" "TUPLE: employee number name department ;" - "employee construct-empty ." + "employee new ." "T{ employee f f f f }" } } ; @@ -361,12 +361,12 @@ HELP: construct " color construct ;" } "The last definition is actually equivalent to the following:" - { $code ": ( r g b a -- color ) rgba construct-boa ;" } + { $code ": ( r g b a -- color ) rgba boa ;" } "Which can be abbreviated further:" { $code "C: color" } } ; -HELP: construct-boa +HELP: boa { $values { "..." "slot values" } { "class" tuple-class } { "tuple" tuple } } { $description "Creates a new instance of " { $snippet "class" } " and fill in the slots from the stack, with the top-most stack element being stored in the right-most slot." } -{ $notes "The " { $snippet "-boa" } " suffix is shorthand for ``by order of arguments'', and ``BOA constructor'' is a pun on ``boa constrictor''." } ; +{ $notes "The name " { $snippet "boa" } " is shorthand for ``by order of arguments'', and ``BOA constructor'' is a pun on ``boa constrictor''." } ; diff --git a/core/classes/tuple/tuple-tests.factor b/core/classes/tuple/tuple-tests.factor index 2575570d2f..b34491ead6 100755 --- a/core/classes/tuple/tuple-tests.factor +++ b/core/classes/tuple/tuple-tests.factor @@ -7,7 +7,7 @@ calendar prettyprint io.streams.string splitting inspector ; IN: classes.tuple.tests TUPLE: rect x y w h ; -: rect construct-boa ; +: rect boa ; : move ( x rect -- rect ) [ + ] change-x ; @@ -198,8 +198,8 @@ SYMBOL: not-a-tuple-class ] unit-test ! Missing check -[ not-a-tuple-class construct-boa ] must-fail -[ not-a-tuple-class construct-empty ] must-fail +[ not-a-tuple-class boa ] must-fail +[ not-a-tuple-class new ] must-fail TUPLE: erg's-reshape-problem a b c d ; @@ -207,8 +207,8 @@ C: erg's-reshape-problem ! We want to make sure constructors are recompiled when ! tuples are reshaped -: cons-test-1 \ erg's-reshape-problem construct-empty ; -: cons-test-2 \ erg's-reshape-problem construct-boa ; +: cons-test-1 \ erg's-reshape-problem new ; +: cons-test-2 \ erg's-reshape-problem boa ; "IN: classes.tuple.tests TUPLE: erg's-reshape-problem a b c d e f ;" eval diff --git a/core/classes/tuple/tuple.factor b/core/classes/tuple/tuple.factor index aa8ef6cdb7..8d5c4ee2d8 100755 --- a/core/classes/tuple/tuple.factor +++ b/core/classes/tuple/tuple.factor @@ -199,7 +199,7 @@ M: tuple-class define-tuple-class : define-error-class ( class superclass slots -- ) [ define-tuple-class ] [ 2drop ] 3bi - dup [ construct-boa throw ] curry define ; + dup [ boa throw ] curry define ; M: tuple-class reset-class [ diff --git a/core/compiler/tests/tuples.factor b/core/compiler/tests/tuples.factor index 97cde6261c..2b43ac6f56 100755 --- a/core/compiler/tests/tuples.factor +++ b/core/compiler/tests/tuples.factor @@ -4,16 +4,16 @@ USING: kernel tools.test compiler.units ; TUPLE: color red green blue ; [ T{ color f 1 2 3 } ] -[ 1 2 3 [ color construct-boa ] compile-call ] unit-test +[ 1 2 3 [ color boa ] compile-call ] unit-test [ 1 3 ] [ - 1 2 3 color construct-boa + 1 2 3 color boa [ { color-red color-blue } get-slots ] compile-call ] unit-test [ T{ color f 10 2 20 } ] [ 10 20 - 1 2 3 color construct-boa [ + 1 2 3 color boa [ [ { set-color-red set-color-blue } set-slots ] compile-call @@ -21,4 +21,4 @@ TUPLE: color red green blue ; ] unit-test [ T{ color f f f f } ] -[ [ color construct-empty ] compile-call ] unit-test +[ [ color new ] compile-call ] unit-test diff --git a/core/compiler/units/units.factor b/core/compiler/units/units.factor index 58300b721a..65e57a8912 100755 --- a/core/compiler/units/units.factor +++ b/core/compiler/units/units.factor @@ -10,7 +10,7 @@ SYMBOL: new-definitions TUPLE: redefine-error def ; : redefine-error ( definition -- ) - \ redefine-error construct-boa + \ redefine-error boa { { "Continue" t } } throw-restarts drop ; : add-once ( key assoc -- ) diff --git a/core/cpu/x86/assembler/assembler.factor b/core/cpu/x86/assembler/assembler.factor index 450aa8f980..3ad7d4f7b5 100755 --- a/core/cpu/x86/assembler/assembler.factor +++ b/core/cpu/x86/assembler/assembler.factor @@ -104,7 +104,7 @@ M: indirect extended? indirect-base extended? ; canonicalize-ESP ; : ( base index scale displacement -- indirect ) - indirect construct-boa dup canonicalize ; + indirect boa dup canonicalize ; : reg-code "register" word-prop 7 bitand ; diff --git a/core/dlists/dlists.factor b/core/dlists/dlists.factor index b4ae207455..e79907f11f 100755 --- a/core/dlists/dlists.factor +++ b/core/dlists/dlists.factor @@ -7,7 +7,7 @@ IN: dlists TUPLE: dlist front back length ; : ( -- obj ) - dlist construct-empty + dlist new 0 >>length ; : dlist-empty? ( dlist -- ? ) front>> not ; diff --git a/core/effects/effects.factor b/core/effects/effects.factor index 7da290992c..80a4f679c0 100755 --- a/core/effects/effects.factor +++ b/core/effects/effects.factor @@ -8,7 +8,7 @@ TUPLE: effect in out terminated? ; : ( in out -- effect ) dup { "*" } sequence= [ drop { } t ] [ f ] if - effect construct-boa ; + effect boa ; : effect-height ( effect -- n ) dup effect-out length swap effect-in length - ; diff --git a/core/float-vectors/float-vectors.factor b/core/float-vectors/float-vectors.factor index 11535e349e..7f62f6f95c 100755 --- a/core/float-vectors/float-vectors.factor +++ b/core/float-vectors/float-vectors.factor @@ -7,7 +7,7 @@ IN: float-vectors vector ( float-array length -- float-vector ) - float-vector construct-boa ; inline + float-vector boa ; inline PRIVATE> diff --git a/core/generator/fixup/fixup.factor b/core/generator/fixup/fixup.factor index 3a5a6571b7..920690e9d8 100755 --- a/core/generator/fixup/fixup.factor +++ b/core/generator/fixup/fixup.factor @@ -10,7 +10,7 @@ IN: generator.fixup TUPLE: frame-required n ; -: frame-required ( n -- ) \ frame-required construct-boa , ; +: frame-required ( n -- ) \ frame-required boa , ; : stack-frame-size ( code -- n ) no-stack-frame [ @@ -25,7 +25,7 @@ GENERIC: fixup* ( frame-size obj -- frame-size ) TUPLE: label offset ; -: