Write a first draft macro expander.

Committing it because it compiles. I have to write tests and debug
it still.

1 files changed, 25 insertions, 6 deletions

diff --git a/csc/hash-map.csc b/csc/hash-map.csc
index 2862e84..81ed770 100644
--- a/csc/hash-map.csc
+++ b/csc/hash-map.csc
@@ -1,16 +1,18 @@
 (define-library (csc hash-map)
   (export
     alist->map
-    hash-bytevector
-    map->alist
     for-each
+    hash-bytevector
     insert
+    key-not-found-error?
     lookup
+    make-map
+    map->alist
     map?
-    key-not-found-error?
-    make-map)
+    merge)
   (import (scheme base)
-          (only (csc format) sprintf))
+          (only (csc format) sprintf)
+          (only (csc match) match))
   (begin
 
 
@@ -255,4 +257,21 @@
                  (hash 0))
         (if (>= i (bytevector-length b))
             hash
-          (loop (+ 1 i) (+ (* hash #x100) (bytevector-u8-ref b i))))))))
+          (loop (+ 1 i) (+ (* hash #x100) (bytevector-u8-ref b i))))))
+
+
+    (define (merge2 m1 m2)
+      (let ((m1 m1))
+        (for-each
+          (lambda (k v)
+            (set! m1 (insert m1 k v)))
+          m2)
+        m1))
+
+
+    (define (merge m . m*)
+      (let loop ((m* m*)
+                 (m m))
+        (match m*
+          ('() m)
+          ((head . tail) (loop tail (merge2 m head))))))))