diff options
| author | Andrey Orst <andreyorst@gmail.com> | 2020-11-09 21:30:17 +0300 |
|---|---|---|
| committer | Andrey Orst <andreyorst@gmail.com> | 2020-11-09 21:30:17 +0300 |
| commit | 40eeb480099fe238ae03566ae7167003789ea4c7 (patch) | |
| tree | d97a73b7565358622b4b7905201c4ae310d0d80d /macros/core.fnl | |
| parent | 695dc4050697afdd4d7b106cbba8a43afc256a13 (diff) | |
fix(macros): fix multimethods which use tables as the dispatch value
Diffstat (limited to 'macros/core.fnl')
| -rw-r--r-- | macros/core.fnl | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/macros/core.fnl b/macros/core.fnl index df3f8b8..ad555fb 100644 --- a/macros/core.fnl +++ b/macros/core.fnl @@ -179,6 +179,21 @@ `(let [(res# fennel#) (pcall require :fennel)] (if res# (. fennel#.metadata ,v))))) +(fn eq-fn [] + `(fn eq# [a# b#] + (if (and (= (type a#) :table) (= (type b#) :table)) + (do (var [res# count-a# count-b#] [true 0 0]) + (each [k# v# (pairs a#)] + (set res# (eq# v# (. b# k#))) + (set count-a# (+ count-a# 1)) + (when (not res#) (lua :break))) + (when res# + (each [_# _# (pairs b#)] + (set count-b# (+ count-b# 1))) + (set res# (and res# (= count-a# count-b#)))) + res#) + (= a# b#)))) + (fn* core.defmulti [name & opts] (let [docstring (if (string? (first opts)) (first opts)) @@ -193,14 +208,25 @@ {:__call (fn [_# ...] ,docstring - (let [dispatch-value# (,dispatch-fn ...)] + (let [dispatch-value# (,dispatch-fn ...) + (res# view#) (pcall require :fennelview)] ((or (. multimethods# dispatch-value#) (. multimethods# :default) (error (.. "No method in multimethod '" ,(tostring name) "' for dispatch value: " - dispatch-value#) 2)) ...))) - :multimethods multimethods#})))))) + ((if res# view# tostring) dispatch-value#)) + 2)) ...))) + :multimethods (setmetatable multimethods# + {:__index + (fn [tbl# key#] + (let [eq# ,(eq-fn)] + (var res# nil) + (each [k# v# (pairs tbl#)] + (when (eq# k# key#) + (set res# v#) + (lua :break))) + res#))})})))))) (fn* core.defmethod [multifn dispatch-val & fn-tail] |