From 7717eedcb68dfa7cfdd2327f9c29f99e9ecc4c01 Mon Sep 17 00:00:00 2001
From: Kaz Kylheku <kaz@kylheku.com>
Date: Tue, 12 Mar 2019 22:34:25 -0700
Subject: lib: rename make_half_lazy_cons.

* lib.h (make_half_lazy_cons): Renamed to make
make_lazy_cons_car.

* lib.c (rem_lazy_rec, make_half_lazy_cons): Follow rename.

* hash.c (hash_keys_lazy, hash_keys, hash_values_lazy,
hash_values, hash_pairs_lazy, hash_pairs, hash_alist_lazy,
hash_alist): Follow rename.
---
 hash.c | 24 ++++++++++++------------
 lib.c  |  4 ++--
 lib.h  |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/hash.c b/hash.c
index 500f1a09..93be6805 100644
--- a/hash.c
+++ b/hash.c
@@ -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_half_lazy_cons(lcons->lc.func, us_car(cell))));
+  us_rplacd(lcons, if2(cell, make_lazy_cons_car(lcons->lc.func, us_car(cell))));
   return nil;
 }
 
@@ -1309,13 +1309,13 @@ val hash_keys(val hash)
   val cell = hash_next(iter);
   if (!cell)
     return nil;
-  return make_half_lazy_cons(func_f1(iter, hash_keys_lazy), us_car(cell));
+  return make_lazy_cons_car(func_f1(iter, hash_keys_lazy), us_car(cell));
 }
 
 static val hash_values_lazy(val iter, val lcons)
 {
   val cell = hash_next(iter);
-  us_rplacd(lcons, if2(cell, make_half_lazy_cons(lcons->lc.func, us_cdr(cell))));
+  us_rplacd(lcons, if2(cell, make_lazy_cons_car(lcons->lc.func, us_cdr(cell))));
   return nil;
 }
 
@@ -1325,17 +1325,17 @@ val hash_values(val hash)
   val cell = hash_next(iter);
   if (!cell)
     return nil;
-  return make_half_lazy_cons(func_f1(iter, hash_values_lazy), us_cdr(cell));
+  return make_lazy_cons_car(func_f1(iter, hash_values_lazy), us_cdr(cell));
 }
 
 static val hash_pairs_lazy(val iter, val lcons)
 {
   val cell = hash_next(iter);
   us_rplacd(lcons, if2(cell,
-                       make_half_lazy_cons(lcons->lc.func,
-                                           cons(us_car(cell),
-                                                cons(us_cdr(cell),
-                                                     nil)))));
+                       make_lazy_cons_car(lcons->lc.func,
+                                          cons(us_car(cell),
+                                               cons(us_cdr(cell),
+                                                    nil)))));
   return nil;
 }
 
@@ -1345,14 +1345,14 @@ val hash_pairs(val hash)
   val cell = hash_next(iter);
   if (!cell)
     return nil;
-  return make_half_lazy_cons(func_f1(iter, hash_pairs_lazy),
-                             cons(us_car(cell), cons(us_cdr(cell), nil)));
+  return make_lazy_cons_car(func_f1(iter, hash_pairs_lazy),
+                            cons(us_car(cell), cons(us_cdr(cell), nil)));
 }
 
 static val hash_alist_lazy(val iter, val lcons)
 {
   val cell = hash_next(iter);
-  us_rplacd(lcons, if2(cell, make_half_lazy_cons(lcons->lc.func, cell)));
+  us_rplacd(lcons, if2(cell, make_lazy_cons_car(lcons->lc.func, cell)));
   return nil;
 }
 
@@ -1362,7 +1362,7 @@ val hash_alist(val hash)
   val cell = hash_next(iter);
   if (!cell)
     return nil;
-  return make_half_lazy_cons(func_f1(iter, hash_alist_lazy), cell);
+  return make_lazy_cons_car(func_f1(iter, hash_alist_lazy), cell);
 }
 
 val hash_uni(val hash1, val hash2, val join_func)
diff --git a/lib.c b/lib.c
index bb34f88d..fd968ab0 100644
--- a/lib.c
+++ b/lib.c
@@ -1989,7 +1989,7 @@ static val rem_lazy_rec(val pred, val list, val env, val func)
     func = func_f1(cons(pred, cdr(list)), rem_lazy_func);
   else
     rplacd(env, cdr(list));
-  return make_half_lazy_cons(func, car(list));
+  return make_lazy_cons_car(func, car(list));
 }
 
 val remq_lazy(val obj, val list)
@@ -3002,7 +3002,7 @@ val make_lazy_cons(val func)
   return obj;
 }
 
-val make_half_lazy_cons(val func, val car)
+val make_lazy_cons_car(val func, val car)
 {
   val obj = make_obj();
   obj->lc.type = LCONS;
diff --git a/lib.h b/lib.h
index bc41ffea..404ba7b4 100644
--- a/lib.h
+++ b/lib.h
@@ -663,7 +663,7 @@ mem_t *chk_copy_obj(mem_t *orig, size_t size);
 mem_t *chk_xalloc(ucnum m, ucnum n, val self);
 val cons(val car, val cdr);
 val make_lazy_cons(val func);
-val make_half_lazy_cons(val func, val car);
+val make_lazy_cons_car(val func, val car);
 void rcyc_cons(val cons);
 void rcyc_list(val list);
 void rcyc_empty(void);
-- 
cgit v1.2.3