summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2024-06-14 13:44:53 -0700
committerKaz Kylheku <kaz@kylheku.com>2024-06-14 13:44:53 -0700
commit08eef02fb98856550fdd6a2cdccfdb65dc0cfec8 (patch)
treefc4e5392cb4ffa97d56562f7e9fbe1ed3a843518
parent176dd45c7614da1c7e524556409741076b9e062d (diff)
downloadtxr-08eef02fb98856550fdd6a2cdccfdb65dc0cfec8.tar.gz
txr-08eef02fb98856550fdd6a2cdccfdb65dc0cfec8.tar.bz2
txr-08eef02fb98856550fdd6a2cdccfdb65dc0cfec8.zip
lib: rename seq_iter_ops static object.
The seq_iter_ops static structure is an instance of cobj_ops. Its name is the same identifier as that of struct seq_iter_ops, which is not related. This is confusing. * lib.c (seq_iter_ops): Structure renamed to seq_iter_obj_ops. (seq_begin, iter_begin, iter_dynamic, iter_catv): References to object updated to new name.
-rw-r--r--lib.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/lib.c b/lib.c
index 363b55a3..b4f44a01 100644
--- a/lib.c
+++ b/lib.c
@@ -1224,11 +1224,12 @@ static void seq_iter_mark(val seq_iter)
si->ops->mark(si);
}
-static struct cobj_ops seq_iter_ops = cobj_ops_init(eq,
- cobj_print_op,
- cobj_destroy_free_op,
- seq_iter_mark,
- cobj_eq_hash_op);
+static struct cobj_ops
+ seq_iter_cobj_ops = cobj_ops_init(eq,
+ cobj_print_op,
+ cobj_destroy_free_op,
+ seq_iter_mark,
+ cobj_eq_hash_op);
val seq_begin(val obj)
{
@@ -1237,7 +1238,7 @@ val seq_begin(val obj)
struct seq_iter *si = coerce(struct seq_iter *, chk_calloc(1, sizeof *si));
seq_iter_init(self, si, obj);
iter = si->ui.iter;
- si_obj = cobj(coerce(mem_t *, si), seq_iter_cls, &seq_iter_ops);
+ si_obj = cobj(coerce(mem_t *, si), seq_iter_cls, &seq_iter_cobj_ops);
gc_hint(iter);
gc_hint(obj);
return si_obj;
@@ -1293,7 +1294,7 @@ val iter_begin(val obj)
chk_calloc(1, sizeof *si));
seq_iter_init_with_info(self, si, sinf, 0);
iter = si->ui.iter;
- si_obj = cobj(coerce(mem_t *, si), seq_iter_cls, &seq_iter_ops);
+ si_obj = cobj(coerce(mem_t *, si), seq_iter_cls, &seq_iter_cobj_ops);
gc_hint(iter);
gc_hint(obj);
return si_obj;
@@ -1307,7 +1308,7 @@ static val iter_dynamic(struct seq_iter *si_orig)
struct seq_iter *si = coerce(struct seq_iter *,
chk_copy_obj(coerce(mem_t *, si_orig),
sizeof *si));
- return cobj(coerce(mem_t *, si), seq_iter_cls, &seq_iter_ops);
+ return cobj(coerce(mem_t *, si), seq_iter_cls, &seq_iter_cobj_ops);
}
val iter_more(val iter)
@@ -1463,7 +1464,7 @@ val iter_catv(varg iters)
si->ui.index = index;
si->ul.dargs = dargs;
si->ops = &si_cat_ops;
- si_obj = cobj(coerce(mem_t *, si), seq_iter_cls, &seq_iter_ops);
+ si_obj = cobj(coerce(mem_t *, si), seq_iter_cls, &seq_iter_cobj_ops);
gc_hint(iter);
return si_obj;
}