diff options
author | Kaz Kylheku <kaz@kylheku.com> | 2019-03-12 22:49:39 -0700 |
---|---|---|
committer | Kaz Kylheku <kaz@kylheku.com> | 2019-03-12 22:49:39 -0700 |
commit | 3388b5baed9b9288ccd4fcd7611f936cb6025469 (patch) | |
tree | f3b97a5f1910f1e51e0eecd9dc3c3be0aa2fc6e6 /hash.c | |
parent | 33e0a53bd96744a92fef7e364e7625bde57d7699 (diff) | |
download | txr-3388b5baed9b9288ccd4fcd7611f936cb6025469.tar.gz txr-3388b5baed9b9288ccd4fcd7611f936cb6025469.tar.bz2 txr-3388b5baed9b9288ccd4fcd7611f936cb6025469.zip |
lib: use accessor for lcons function.
* hash.c (hash_keys_lazy, hash_values_lazy, hash_pairs_lazy,
hash_alist_lazy): Use us_lcons_fun instead of direct
lcons->lc.fun access.
* lib.c (simple_lazy_stream_func, lazy_stream_func): Likewise.
Diffstat (limited to 'hash.c')
-rw-r--r-- | hash.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1299,7 +1299,7 @@ val group_reduce(val hash, val by_fun, val reduce_fun, val seq, static val hash_keys_lazy(val iter, val lcons) { val cell = hash_next(iter); - us_rplacd(lcons, if2(cell, make_lazy_cons_car(lcons->lc.func, us_car(cell)))); + us_rplacd(lcons, if2(cell, make_lazy_cons_car(us_lcons_fun(lcons), us_car(cell)))); return nil; } @@ -1315,7 +1315,7 @@ val hash_keys(val hash) static val hash_values_lazy(val iter, val lcons) { val cell = hash_next(iter); - us_rplacd(lcons, if2(cell, make_lazy_cons_car(lcons->lc.func, us_cdr(cell)))); + us_rplacd(lcons, if2(cell, make_lazy_cons_car(us_lcons_fun(lcons), us_cdr(cell)))); return nil; } @@ -1332,7 +1332,7 @@ static val hash_pairs_lazy(val iter, val lcons) { val cell = hash_next(iter); us_rplacd(lcons, if2(cell, - make_lazy_cons_car(lcons->lc.func, + make_lazy_cons_car(us_lcons_fun(lcons), cons(us_car(cell), cons(us_cdr(cell), nil))))); @@ -1352,7 +1352,7 @@ val hash_pairs(val hash) static val hash_alist_lazy(val iter, val lcons) { val cell = hash_next(iter); - us_rplacd(lcons, if2(cell, make_lazy_cons_car(lcons->lc.func, cell))); + us_rplacd(lcons, if2(cell, make_lazy_cons_car(us_lcons_fun(lcons), cell))); return nil; } |