dict with types (still rough)

1 files changed, 18 insertions, 9 deletions

diff --git a/libs/dict.neb b/libs/dict.neb
index dd7d5ba..9dccf97 100644
--- a/libs/dict.neb
+++ b/libs/dict.neb
@@ -1,24 +1,33 @@
 ; dicts
-(func dict () (list))
+(func dict? (val)
+    (and
+        (list? val)  ; TODO should this be automatic?
+        (or
+            (eq? 0 (list-length val))
+            (and
+                (eq? 1 (list-length val))
+                (list? (first val)))
+            (apply and (map list? val)))
+        (eq? 0 (list-length (filter (lambda (x) (not (eq? x 2))) (map list-length val))))))
+
+(type :dict :list dict?)
 
-(func dict? (in)
-    (empty?
-        (filter (lambda (x) (not (eq? x 2))) (map list-length in))))
+(func dict () (list))
 
-(func has? (in :list key)
+(func has? (in :dict key)
     (not (empty?
         (filter (lambda (x) (eq? (first x) key)) in))))
 
-(func get (d :list key)
+(func get (d :dict key)
     (first (rest (first
         (filter (lambda (x) (eq? (first x) key)) d)))))
 
-(func set (d :list key val)
+(func set (d :dict key val)
     (if (has? d key)
         (map (lambda (x) (if (eq? key (first x)) (list (first x) val) x)) d)
         (append d (list key val))))
 
-(func keys (d :list) (map first d))
+(func keys (d :dict) (map first d))
 
-(func drop (d :list key)
+(func drop (d :dict key)
     (filter (lambda (x) (not (eq? (first x) key))) d))