diff --git a/basis/alien/c-types/c-types.factor b/basis/alien/c-types/c-types.factor index c3ae644b47..ae148e3ac0 100644 --- a/basis/alien/c-types/c-types.factor +++ b/basis/alien/c-types/c-types.factor @@ -204,7 +204,7 @@ M: byte-array byte-length length ; dup length [ nip malloc dup ] 2keep memcpy ; : memory>byte-array ( alien len -- byte-array ) - [ nip dup ] 2keep memcpy ; + [ nip (byte-array) dup ] 2keep memcpy ; : byte-array>memory ( byte-array base -- ) swap dup length memcpy ; diff --git a/basis/bootstrap/stage2.factor b/basis/bootstrap/stage2.factor index 78355a4670..fb7292b989 100644 --- a/basis/bootstrap/stage2.factor +++ b/basis/bootstrap/stage2.factor @@ -100,4 +100,8 @@ SYMBOL: bootstrap-time "output-image" get save-image-and-exit ] if -] [ drop "resource:basis/bootstrap/bootstrap-error.factor" run-file ] recover +] [ + drop + load-help? off + "resource:basis/bootstrap/bootstrap-error.factor" run-file +] recover diff --git a/basis/compiler/tree/propagation/slots/slots.factor b/basis/compiler/tree/propagation/slots/slots.factor index 83e71c3363..8192b1c520 100644 --- a/basis/compiler/tree/propagation/slots/slots.factor +++ b/basis/compiler/tree/propagation/slots/slots.factor @@ -14,12 +14,13 @@ IN: compiler.tree.propagation.slots UNION: fixed-length-sequence array byte-array string ; : sequence-constructor? ( word -- ? ) - { } memq? ; + { (byte-array) } memq? ; : constructor-output-class ( word -- class ) { { array } { byte-array } + { (byte-array) byte-array } { string } } at ; diff --git a/core/sequences/sequences-docs.factor b/core/sequences/sequences-docs.factor index a78117c35f..7354759bb6 100644 --- a/core/sequences/sequences-docs.factor +++ b/core/sequences/sequences-docs.factor @@ -1,6 +1,6 @@ USING: arrays help.markup help.syntax math sequences.private vectors strings kernel math.order layouts -quotations ; +quotations generic.standard ; IN: sequences HELP: sequence @@ -14,8 +14,8 @@ HELP: length HELP: set-length { $values { "n" "a non-negative integer" } { "seq" "a resizable sequence" } } -{ $contract "Resizes the sequence. Not all sequences are resizable." } -{ $errors "Throws a " { $link bounds-error } " if the new length is negative." } +{ $contract "Resizes a sequence. The initial contents of the new area is undefined." } +{ $errors "Throws a " { $link no-method } " error if the sequence is not resizable, and a " { $link bounds-error } " if the new length is negative." } { $side-effects "seq" } ; HELP: lengthen diff --git a/vm/primitives.c b/vm/primitives.c index 142db9e204..dcf082d40d 100755 --- a/vm/primitives.c +++ b/vm/primitives.c @@ -126,7 +126,6 @@ void *primitives[] = { primitive_wrapper, primitive_clone, primitive_string, - primitive_uninitialized_string, primitive_array_to_quotation, primitive_quotation_xt, primitive_tuple, diff --git a/vm/types.c b/vm/types.c index 4a598dc601..c9e657f8ee 100755 --- a/vm/types.c +++ b/vm/types.c @@ -256,7 +256,7 @@ F_BYTE_ARRAY *reallot_byte_array(F_BYTE_ARRAY *array, CELL capacity) to_copy = capacity; REGISTER_UNTAGGED(array); - F_BYTE_ARRAY *new_array = allot_byte_array(capacity); + F_BYTE_ARRAY *new_array = allot_byte_array_internal(capacity); UNREGISTER_UNTAGGED(array); memcpy(new_array + 1,array + 1,to_copy);