src/expand.clj

@@ -49,9 +49,7 @@
 
 (s/def ::syntax scm/syntax?)
 
-(s/def ::identifier
-  (s/and ::syntax
-         #(symbol? (scm/syntax-e %))))
+(s/def ::identifier scm/identifier?)
 
 (s/fdef expand
   :args (s/cat :stx ::syntax
@@ -64,6 +62,11 @@
                :env ::environment
                :store ::store))
 
+(s/fdef nearest
+  :args (s/cat :ctx ::context
+               :ss (s/coll-of ::context))
+  :ret (s/coll-of ::context :kind set?))
+
 
 
 (defn- store-scopes
@@ -74,11 +77,11 @@
               scopes)))
 
 (defn nearest [ctx ss]
-  (when-some [xs (->> ss
-                      (filter #(set/subset? % ctx))
-                      (group-by count)
-                      seq)]
-    (second (apply max-key first xs))))
+  (let [xs (->> ss
+                (filter #(set/subset? % ctx))
+                (group-by count)
+                seq)]
+    (set (some->> xs (apply max-key first) second))))
 
 (defn lookup [ident env store]
   (let [sym (scm/syntax-e ident)