steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix array size fep

cvs
Slava Pestov 2005-11-05 03:50:26 +00:00
parent c0f4d073df
commit a3687773b5
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/bootstrap/init.factor
View File

@ -14,4 +14,4 @@ parser threads words ;
init-error-handler init-error-handler
default-cli-args default-cli-args
parse-command-line parse-command-line
"null-stdio" get [ T{ null-stream f } stdio set ] when ; "null-stdio" get [ T{ null-stream } stdio set ] when ;

3
library/test/math/float.factor
View File

@ -32,3 +32,6 @@ USE: test
[ t ] [ pi double>bits bits>double pi = ] unit-test [ t ] [ pi double>bits bits>double pi = ] unit-test
[ t ] [ e double>bits bits>double e = ] unit-test [ t ] [ e double>bits bits>double e = ] unit-test
[ 2.0 ] [ 1.0 1+ ] unit-test
[ 0.0 ] [ 1.0 1- ] unit-test

14
native/array.c
View File

@ -2,7 +2,7 @@
/* the array is full of undefined data, and must be correctly filled before the /* the array is full of undefined data, and must be correctly filled before the
next GC. */ next GC. */
F_ARRAY* allot_array(CELL type, CELL capacity) F_ARRAY* allot_array(CELL type, F_FIXNUM capacity)
{ {
F_ARRAY *array; F_ARRAY *array;
@ -20,7 +20,7 @@ either be F or a fixnum.
if you want to use pass a pointer, you _must_ hit if you want to use pass a pointer, you _must_ hit
the write barrier manually with a write_barrier() the write barrier manually with a write_barrier()
call with the returned object. */ call with the returned object. */
F_ARRAY* array(CELL type, CELL capacity, CELL fill) F_ARRAY* array(CELL type, F_FIXNUM capacity, CELL fill)
{ {
int i; F_ARRAY* array = allot_array(type, capacity); int i; F_ARRAY* array = allot_array(type, capacity);
for(i = 0; i < capacity; i++) for(i = 0; i < capacity; i++)
@ -30,27 +30,27 @@ F_ARRAY* array(CELL type, CELL capacity, CELL fill)
void primitive_array(void) void primitive_array(void)
{ {
CELL size = to_fixnum(dpop()); F_FIXNUM size = to_fixnum(dpop());
maybe_gc(array_size(size)); maybe_gc(array_size(size));
dpush(tag_object(array(ARRAY_TYPE,size,F))); dpush(tag_object(array(ARRAY_TYPE,size,F)));
} }
void primitive_tuple(void) void primitive_tuple(void)
{ {
CELL size = to_fixnum(dpop()); F_FIXNUM size = to_fixnum(dpop());
maybe_gc(array_size(size)); maybe_gc(array_size(size));
dpush(tag_object(array(TUPLE_TYPE,size,F))); dpush(tag_object(array(TUPLE_TYPE,size,F)));
} }
void primitive_byte_array(void) void primitive_byte_array(void)
{ {
CELL size = to_fixnum(dpop()); F_FIXNUM size = to_fixnum(dpop());
maybe_gc(array_size(size)); maybe_gc(array_size(size));
dpush(tag_object(array(BYTE_ARRAY_TYPE,size,0))); dpush(tag_object(array(BYTE_ARRAY_TYPE,size,0)));
} }
/* see note about fill in array() */ /* see note about fill in array() */
F_ARRAY* resize_array(F_ARRAY* array, CELL capacity, CELL fill) F_ARRAY* resize_array(F_ARRAY* array, F_FIXNUM capacity, CELL fill)
{ {
int i; int i;
F_ARRAY* new_array; F_ARRAY* new_array;
@ -72,7 +72,7 @@ F_ARRAY* resize_array(F_ARRAY* array, CELL capacity, CELL fill)
void primitive_resize_array(void) void primitive_resize_array(void)
{ {
F_ARRAY* array; F_ARRAY* array;
CELL capacity = to_fixnum(dpeek2()); F_FIXNUM capacity = to_fixnum(dpeek2());
maybe_gc(array_size(capacity)); maybe_gc(array_size(capacity));
array = untag_array(dpop()); array = untag_array(dpop());
drepl(tag_object(resize_array(array,capacity,F))); drepl(tag_object(resize_array(array,capacity,F)));

6
native/array.h
View File

@ -25,14 +25,14 @@ INLINE CELL array_size(CELL size)
return align8(sizeof(F_ARRAY) + size * CELLS); return align8(sizeof(F_ARRAY) + size * CELLS);
} }
F_ARRAY* allot_array(CELL type, CELL capacity); F_ARRAY* allot_array(CELL type, F_FIXNUM capacity);
F_ARRAY* array(CELL type, CELL capacity, CELL fill); F_ARRAY* array(CELL type, F_FIXNUM capacity, CELL fill);
void primitive_array(void); void primitive_array(void);
void primitive_tuple(void); void primitive_tuple(void);
void primitive_byte_array(void); void primitive_byte_array(void);
F_ARRAY* resize_array(F_ARRAY* array, CELL capacity, CELL fill); F_ARRAY* resize_array(F_ARRAY* array, F_FIXNUM capacity, CELL fill);
void primitive_resize_array(void); void primitive_resize_array(void);
void primitive_array_to_tuple(void); void primitive_array_to_tuple(void);
void primitive_tuple_to_array(void); void primitive_tuple_to_array(void);

5
native/vector.c
View File

@ -2,10 +2,7 @@
F_VECTOR* vector(F_FIXNUM capacity) F_VECTOR* vector(F_FIXNUM capacity)
{ {
F_VECTOR* vector; F_VECTOR* vector = allot_object(VECTOR_TYPE,sizeof(F_VECTOR));
if(capacity < 0)
general_error(ERROR_NEGATIVE_ARRAY_SIZE,tag_fixnum(capacity));
vector = allot_object(VECTOR_TYPE,sizeof(F_VECTOR));
vector->top = tag_fixnum(0); vector->top = tag_fixnum(0);
vector->array = tag_object(array(ARRAY_TYPE,capacity,F)); vector->array = tag_object(array(ARRAY_TYPE,capacity,F));
return vector; return vector;