Skip to content

feat: optimize self-evaluating forms #1

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

Open
erdos wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: optimize self-evaluating forms #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 22 additions & 3 deletions src/uclj/core.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,12 +542,31 @@
(throw (ex-info (str "Cannot access symbol! " expr) {:symbol expr})))
(throw (ex-info (str "Cannot resolve symbol! " expr) {:symbol expr}))))))

(defn- self-evaluating? [expr]
(cond (seq? expr) (= 'quote (first expr))
(map? expr) (and (every? self-evaluating? (keys expr)) (every? self-evaluating? (vals expr)))
(coll? expr) (every? self-evaluating? expr) ;; set or vec
((some-fn string? number? boolean? nil? char? keyword?) expr) true
(instance? java.util.regex.Pattern expr) true
:else false))

(defn- unwrap-self-evaluating [expr]
(cond (seq? expr) (second expr) ;; unquote
(map? expr) (zipmap (map unwrap-self-evaluating (keys expr)) (map unwrap-self-evaluating (vals expr)))
(coll? expr) (into (empty expr) (map unwrap-self-evaluating expr)) ;; set or vec
:else expr))

(defn ->eval-node [&a expr]
(cond (seq? expr) (seq->eval-node &a expr)
(map? expr) (persistent! (reduce-kv (fn [a k v] (assoc! a (->eval-node &a k) (->eval-node &a v))) (transient (empty expr)) expr))
(coll? expr) (into (empty expr) (map (partial ->eval-node &a) expr))
(map? expr) (if (self-evaluating? expr)
(gen-eval-node (unwrap-self-evaluating expr))
(persistent! (reduce-kv (fn [a k v] (assoc! a (->eval-node &a k) (->eval-node &a v)))
(transient (empty expr)) expr)))
;; set or vector
(coll? expr) (if (self-evaluating? expr)
(gen-eval-node (unwrap-self-evaluating expr))
(into (empty expr) (map (partial ->eval-node &a) expr)))

;; TODO: statically lookup common core symbols! check that symbol is not yet bound!!!!!
(symbol? expr) (sym->eval-node &a expr)
:else expr))

Expand Down