Thanks to visit codestin.com
Credit goes to github.com

Skip to content

feat: fn meta evaluates #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
erdos merged 2 commits into from
Jan 16, 2022
Merged

feat: fn meta evaluates #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afc2031
feat: fn forms have meta
erdos Jan 16, 2022
cc9b68e
restrict meta keys
erdos Jan 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions src/uclj/core.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,13 @@
fn*
(let [[fname & bodies] (parsed-fn expanded)
&env (if fname (add-env &env fname) &env)]
(concat '[fn*]
(with-meta
(concat '[fn*]
(when fname [fname])
(for [[args & bodies] bodies
:let [&env (reduce add-env &env args)]]
(list* args (map (partial iter &env) bodies)))))
(list* args (map (partial iter &env) bodies))))
(meta exp)))

;; else
(map (partial iter &env) expanded))
Expand Down Expand Up @@ -316,9 +318,8 @@
;; else
(let [butlast-body (doall (butlast bodies))
last-body (last bodies)]
(gen-eval-node
(do (doseq [x butlast-body] (evalme x &b))
(evalme last-body &b))))))))
(gen-eval-node (do (doseq [x butlast-body] (evalme x &b))
(evalme last-body &b))))))))

(defmethod seq->eval-node 'letfn* seq-eval-letfn [iden->idx recur-indices [_ bindings & bodies :as form]]
(let [promises (for [[k f] (partition 2 bindings)
Expand Down Expand Up @@ -398,8 +399,10 @@
(::fn-sym-introduced (meta def)))
(range))
recur-indices (mapv iden->idx (::symbol-loop (meta def)))]]
[arity (->eval-node iden->idx recur-indices (list* 'do bodies))]))]
(make-fn-body fname symbol-used arity->body-node arity->symbols-introduced iden->idx vararg-arity)))
[arity (->eval-node iden->idx recur-indices (list* 'do bodies))]))
meta-node (->eval-node iden->idx nil (::meta-exp (meta form)))]
(cond-> (make-fn-body fname symbol-used arity->body-node arity->symbols-introduced iden->idx vararg-arity)
meta-node (-> (evalme &b) (with-meta (evalme meta-node &b)) (gen-eval-node)))))

(def ^:const max-let-bindings 32)

Expand Down Expand Up @@ -707,10 +710,13 @@
::fn-sym-introduced (-> symbol-loop ;; arguments + let vars
(into (set (mapcat (comp ::symbol-introduced meta) bodies))))
::symbol-loop symbol-loop
#_(set (keys new-acc-1))}))]
#_(set (keys new-acc-1))}))
meta-map (-> (meta fn-expression) (dissoc :line :column :file) (not-empty))
meta-exp (enhance-code sym->iden meta-map)]
(with-meta (if fname (list* 'fn* fname fbodies) (list* 'fn* fbodies))
;; symbol-introduced is nil because it is a new closure!
{::symbol-used (set (mapcat (comp ::symbol-used meta) fbodies))})))
{::meta-exp meta-exp
::symbol-used (set (mapcat (comp ::symbol-used meta) fbodies))})))

(defmethod enhance-code 'try [sym->iden [_ & xs]]
(let [bodies (remove (fn [x] (and (seq? x) ('#{finally catch} (first x)))) xs)
Expand Down
4 changes: 4 additions & 0 deletions test/uclj/core_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@
(testing "Function name is used"
(is (fn? (evaluator '((fn f [] f))))))

(testing "Meta is evaluated on fn"
(is (= {:a 1} (meta (evaluator '(do ^{:a (inc 0)} (fn []))))))
(is (= "1" (evaluator '(with-out-str ^{:a (print 1)} (fn ^{:b (print 2)} x []))))))

(testing "Recur with single arg"
(is (= :b (evaluator '((fn [a] (if (pos? a) (recur (dec a)) :b)) 4)))))

Expand Down