Check membership

Author: chrisrink10

src/basilisp/core.lpy

@@ -6853,13 +6853,21 @@
   "Generate a proxy class with the given bases."
   [bases]
   (let [methods      (apply hash-map (mapcat proxy-base-methods bases))
+        method-names (set (map munge (keys methods)))
         base-methods {"__init__"               (fn __init__ [self proxy-mappings & args]
                                                  (apply (.- (python/super (.- self __class__) self) __init__) args)
-                                                 (set! (.- self -proxy-mappings) proxy-mappings)
+                                                 (. self (_set_proxy_mappings proxy-mappings))
                                                  nil)
                       "_get_proxy_mappings"    (fn _get_proxy_mappings [self]
                                                  (.- self -proxy-mappings))
                       "_set_proxy_mappings"    (fn _set_proxy_mappings [self proxy-mappings]
+                                                 (let [provided-methods (set (keys proxy-mappings))]
+                                                   (when-not (.issubset provided-methods method-names)
+                                                     (throw
+                                                      (ex-info "Proxy override methods must correspond to methods on the declared supertypes"
+                                                               {:expected method-names
+                                                                :given    provided-methods
+                                                                :diff     (.difference provided-methods method-names)}))))
                                                  (set! (.- self -proxy-mappings) proxy-mappings)
                                                  nil)
                       "_update_proxy_mappings" (fn _update_proxy_mappings [self proxy-mappings]
@@ -6876,9 +6884,7 @@
 
         ;; Remove Python ``object`` from the bases if it is present to avoid errors
         ;; about creating a consistent MRO for the given bases
-        proxy-bases  (concat (remove #{python/object} bases) [basilisp.lang.interfaces/IProxy])]
-    #_(doseq [[method-name method] methods]
-      (println method-name method))
+        proxy-bases (concat (remove #{python/object} bases) [basilisp.lang.interfaces/IProxy])]
     (python/type (basilisp.lang.util/genname "Proxy")
                  (python/tuple proxy-bases)
                  (python/dict (merge methods base-methods)))))
@@ -6962,7 +6968,6 @@
       (. proxy (_update-proxy-mappings mappings))
       proxy)))
 
-;; TODO: check interface/superclass method membership
 (defmacro proxy
   "Create a new proxy class instance.
 
@@ -7033,7 +7038,6 @@
                                       (assoc m method-name method)))
                                   {}
                                   methods)]
-    #_(println methods)
     `((get-proxy-class ~@class-and-interfaces) ~method-map ~@args)))
 
 (defmacro proxy-super

tests/basilisp/test_proxies.lpy

@@ -42,6 +42,11 @@
                           (describe-me [] "I'm a proxy")
                           (describe-me [] "Proxy"))))))
 
+  (testing "disallows overriding non-superclass methods"
+    (is (thrown? basilisp.lang.exception/ExceptionInfo
+                 (proxy [Describable] []
+                   (other-method [] "Proxy")))))
+
   (testing "multi-arity interface methods"
     (let [p (proxy [ConcreteToString] [1]
               (to-string