Allow quasi-quoting over hash table literals,

to express dynamic hash table construction

* eval.c (expand_qquote): Recognize hash-construct
forms: expand the hash arguments and pairs separately,
then rewrite to a new hash-construct form.
(eval-init): hash-construct intrinsic function added.

* hash.c (hash_construct_s): New symbol variable.
(hash_construct): New function.
(hash_init): Initialize hash_construct_s.

* hash.h (hash_construct_s, hash_construct): Declared.

* parser.y (hash): Rule rewritten to emit either a literal
hash table object, or a hash-construct form, based on
whether quasiquote unquotes occur within the syntax.
(hash_from_notation): Function removed.

1 files changed, 2 insertions, 0 deletions

diff --git a/hash.h b/hash.h
index f4c23cb2..72752f72 100644
--- a/hash.h
+++ b/hash.h
@@ -25,6 +25,7 @@
  */
 
 extern val weak_keys_k, weak_vals_k, equal_based_k;
+extern val hash_construct_s;
 
 val make_hash(val weak_keys, val weak_vals, val equal_based);
 val *gethash_l(val hash, val key, val *new_p);
@@ -44,6 +45,7 @@ val hash_next(val *iter);
 val hash_eql(val obj);
 val hash_equal(val obj);
 val hashv(val args);
+val hash_construct(val hashv_args, val pairs);
 
 void hash_process_weak(void);