diff --git a/gc.c b/gc.c index 13ab828a..5936e3f5 100644 --- a/gc.c +++ b/gc.c @@ -268,7 +268,7 @@ char *gc_copy_obj(object dest, char *obj, gc_thread_data *thd) type_of(hp) = closure1_tag; hp->fn = ((closure1) obj)->fn; hp->num_args = ((closure1) obj)->num_args; - hp->elt1 = ((closure1) obj)->elt1; + hp->element = ((closure1) obj)->element; return (char *)hp; } case closureN_tag: { @@ -1035,7 +1035,7 @@ void gc_mark_black(object obj) break; } case closure1_tag: - gc_collector_mark_gray(obj, ((closure1) obj)->elt1); + gc_collector_mark_gray(obj, ((closure1) obj)->element); break; case closureN_tag: { int i, n = ((closureN) obj)->num_elt; diff --git a/include/cyclone/types.h b/include/cyclone/types.h index e9915333..22b8771f 100644 --- a/include/cyclone/types.h +++ b/include/cyclone/types.h @@ -492,7 +492,7 @@ typedef struct { tag_type tag; function_type fn; int num_args; - object elt1; + object element; } closure1_type; typedef struct { gc_header_type hdr; @@ -532,7 +532,7 @@ typedef closure0_type *macro; c.tag = closure1_tag; \ c.fn = f; \ c.num_args = -1; \ - c.elt1 = a; + c.element = a; /* Primitive types */ typedef struct { diff --git a/runtime.c b/runtime.c index cbdc11d1..7a32cfb0 100644 --- a/runtime.c +++ b/runtime.c @@ -2935,7 +2935,7 @@ int gc_minor(void *data, object low_limit, object high_limit, closure cont, obje break; } case closure1_tag: - gc_move2heap(((closure1) obj)->elt1); + gc_move2heap(((closure1) obj)->element); break; case closureN_tag: { int i, n = ((closureN) obj)->num_elt; diff --git a/scheme/cyclone/cgen.sld b/scheme/cyclone/cgen.sld index 32aef406..678bada1 100644 --- a/scheme/cyclone/cgen.sld +++ b/scheme/cyclone/cgen.sld @@ -1607,7 +1607,7 @@ (emit compiled-program))) (else ;; Do not use closcall1 macro as it might not have been defined - (emit "cont = ((closure1_type *)cont)->elt1;") + (emit "cont = ((closure1_type *)cont)->element;") ;(emit "((cont)->fn)(1, cont, cont);") (emit* "(((closure)"