suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix problems with `raise-range-error'

Browse Source 
Problems include bad index reporting for vectors, bad treatment of
empty strings and byte strings, and misformatting of given name.
This commit is contained in:
Matthew Flatt 2012-09-02 15:57:01 -06:00
parent 64eb4f9389
commit 99de1b3efa
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/racket/src/error.c
View File

@ -1707,7 +1707,7 @@ static void do_out_of_range(const char *name, const char *type, const char *whic
type = (SCHEME_BYTE_STRINGP(s) ? "byte string" : "string");
}
if (!SAME_OBJ(slen, scheme_make_integer(0))) {
if (!scheme_bin_lt(slen, sstart)) {
char *sstr;
intptr_t strlen;
int small_end = 0;
@ -1776,7 +1776,7 @@ static Scheme_Object *raise_range_error(int argc, Scheme_Object *argv[])
type = scheme_char_string_to_byte_string(argv[1]);
desc = scheme_char_string_to_byte_string(argv[2]);
do_out_of_range(scheme_symbol_name(argv[0]),
do_out_of_range(scheme_symbol_val(argv[0]),
SCHEME_BYTE_STR_VAL(type), /* type */
SCHEME_BYTE_STR_VAL(desc), /* index description */
((argc > 7) && SCHEME_TRUEP(argv[7])),

2
src/racket/src/vector.c
View File

@ -378,7 +378,7 @@ void scheme_bad_vec_index(char *name, Scheme_Object *i, const char *which, Schem
? "fxvector"
: NULL)));
scheme_out_of_range(name, type, which, i, vec, bottom, len);
scheme_out_of_range(name, type, which, i, vec, bottom, len-1);
}
static Scheme_Object *