summaryrefslogtreecommitdiffstats
path: root/hash.c
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2014-02-22 00:58:18 -0800
committerKaz Kylheku <kaz@kylheku.com>2014-02-22 00:58:18 -0800
commitaded325cb48f684b3a0849acde7ec31db48733ce (patch)
treeb87dce2ae9df01a1f66d3c2ff43af93e3047387e /hash.c
parent9462f8c7b3d57ccaaa73fd0e891f8a82b41c4b84 (diff)
downloadtxr-aded325cb48f684b3a0849acde7ec31db48733ce.tar.gz
txr-aded325cb48f684b3a0849acde7ec31db48733ce.tar.bz2
txr-aded325cb48f684b3a0849acde7ec31db48733ce.zip
The C function nullp is being renamed to null, and the rarely
used global variable null which holds a symbol becomes null_s. A new macro called nilp is added that more efficiently checks whether an object is nil, producing a C boolean value rather than t or nil. Most of the uses of nullp in the codebase just become the more streamlined nilp. * debug.c (show_bindings): nullp to nilp * eval.c (lookup_var, lookup_var_l, lookup_fun, lookup_sym_lisp1, do_eval, expand_qquote, expand_quasi, expand_op): nullp to nilp. (op_modplace): nullp to null. (eval_init): Update registration of null and not from C function nullp to null. * filter.c (trie_compress, html_hex_continue): nullp to nil. (filter_string_tree): null to null_s. * hash.c (hash_next): nullp to nilp. * lib.c (null): Variable renamed to null_s. (code2type): null to null_s. (lazy_flatten_scan, chainv, lazy_str, lazy_str_force_upto, obj_print, obj_pprint): nullp to nilp. (obj_init): null to null_s; nullp to null. * lib.h (null): declaration changed to null_s. (nullp): Inline function renamed to null. (nilp): New macro. * match.c (do_match_line): nullp to nilp. * rand.c (make_random_state): Likewise. * regex.c (compile_regex): Likewise.
Diffstat (limited to 'hash.c')
-rw-r--r--hash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hash.c b/hash.c
index 55906c2e..48aa3cea 100644
--- a/hash.c
+++ b/hash.c
@@ -666,7 +666,7 @@ val hash_next(val iter)
struct hash *h = (struct hash *) hash->co.handle;
if (hi->cons)
hi->cons = cdr(hi->cons);
- while (nullp(hi->cons)) {
+ while (nilp(hi->cons)) {
if (++hi->chain >= h->modulus)
return nil;
set(hi->cons, vecref(h->table, num_fast(hi->chain)));