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

further fixes to vector abuse

Browse Source
This commit is contained in:
Matthew Flatt 2012-03-12 11:47:18 -06:00
parent 018292ec00
commit e1a5e032cb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/racket/src/struct.c
View File

@ -2513,8 +2513,8 @@ static Scheme_Object *struct_info_chaperone(Scheme_Object *o, Scheme_Object *si,
while (SCHEME_CHAPERONEP(o)) { while (SCHEME_CHAPERONEP(o)) {
px = (Scheme_Chaperone *)o; px = (Scheme_Chaperone *)o;
if (SCHEME_VECTORP(px->redirects)) { if (SCHEME_VECTORP(px->redirects)) {
if (SCHEME_VEC_ELS(px->redirects)[1]) {
proc = SCHEME_VEC_ELS(px->redirects)[1]; proc = SCHEME_VEC_ELS(px->redirects)[1];
if (SCHEME_TRUEP(proc)) {
if (SCHEME_CHAPERONE_FLAGS(px) & SCHEME_CHAPERONE_IS_IMPERSONATOR) if (SCHEME_CHAPERONE_FLAGS(px) & SCHEME_CHAPERONE_IS_IMPERSONATOR)
proc = scheme_box(proc); proc = scheme_box(proc);
procs = scheme_make_pair(proc, procs); procs = scheme_make_pair(proc, procs);
@ -5128,7 +5128,7 @@ static Scheme_Object *do_chaperone_struct(const char *name, int is_impersonator,
Scheme_Chaperone *px; Scheme_Chaperone *px;
Scheme_Struct_Type *stype; Scheme_Struct_Type *stype;
Scheme_Object *val = argv[0], *proc; Scheme_Object *val = argv[0], *proc;
Scheme_Object *redirects, *prop, *si_chaperone = NULL; Scheme_Object *redirects, *prop, *si_chaperone = scheme_false;
Struct_Proc_Info *pi; Struct_Proc_Info *pi;
Scheme_Object *a[1]; Scheme_Object *a[1];
int i, offset, arity; int i, offset, arity;
@ -5183,7 +5183,7 @@ static Scheme_Object *do_chaperone_struct(const char *name, int is_impersonator,
} }
if (offset == -2) { if (offset == -2) {
if (si_chaperone) if (SCHEME_TRUEP(si_chaperone))
scheme_raise_exn(MZEXN_FAIL_CONTRACT, scheme_raise_exn(MZEXN_FAIL_CONTRACT,
"%s: struct-info procedure supplied a second time: %V", "%s: struct-info procedure supplied a second time: %V",
name, name,
@ -5287,7 +5287,7 @@ static Scheme_Object *do_chaperone_struct(const char *name, int is_impersonator,
SCHEME_VEC_ELS(redirects)[1] = si_chaperone; SCHEME_VEC_ELS(redirects)[1] = si_chaperone;
} }
SCHEME_VEC_ELS(redirects)[0] = (Scheme_Object *)red_props; SCHEME_VEC_ELS(redirects)[0] = (red_props ? (Scheme_Object *)red_props : scheme_false);
px = MALLOC_ONE_TAGGED(Scheme_Chaperone); px = MALLOC_ONE_TAGGED(Scheme_Chaperone);
if (SCHEME_PROCP(val)) if (SCHEME_PROCP(val))