From a32e4c21286764c013950015108d745fbdcd97ae Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Tue, 11 Feb 2014 01:21:17 -0800 Subject: * combi.c (comb_hash_while_fun, comb_hash_gen_fun, comb_hash): New static functions. (comb): Support hash tables. * hash.c (print_key_val): When values are nil, print in a more condensed way by omitting the second element. This notation is accepted as input already by the parser. (hash_insert_pair): New function. * txr.1: Description of comb updated to indicate that it works over hashes. --- combi.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'combi.c') diff --git a/combi.c b/combi.c index 2af2a051..e32957a4 100644 --- a/combi.c +++ b/combi.c @@ -33,6 +33,7 @@ #include "signal.h" #include "unwind.h" #include "eval.h" +#include "hash.h" #include "combi.h" static val perm_while_fun(val state) @@ -426,6 +427,33 @@ static val comb_str(val str, val k) func_f0(state, comb_str_gen_fun)); } +static val comb_hash_while_fun(val state) +{ + return car(car(state)); +} + +static val comb_hash_gen_fun(val hstate) +{ + cons_bind (state, hash, hstate); + val iter, out = make_similar_hash(hash); + + for (iter = state; iter; iter = cdr(iter)) { + val pair = car(car(iter)); + sethash(out, car(pair), cdr(pair)); + } + + comb_gen_fun_common(state); + return out; +} + + +static val comb_hash(val hash, val k) +{ + val hstate = cons(nreverse(k_conses(hash_alist(hash), k)), hash); + return generate(func_f0(hstate, comb_hash_while_fun), + func_f0(hstate, comb_hash_gen_fun)); +} + val comb(val seq, val k) { if (!integerp(k)) @@ -457,6 +485,13 @@ val comb(val seq, val k) return nil; return comb_str(seq, k); default: + if (hashp(seq)) { + if (k == zero) + return cons(make_similar_hash(seq), nil); + if (gt(k, hash_count(seq))) + return nil; + return comb_hash(seq, k); + } type_mismatch(lit("comb: ~s is not a sequence"), seq, nao); } } -- cgit v1.2.3