Skip to content
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

Jump to bottom

Optimize more forms #188

Merged
merged 1 commit into from
Mar 22, 2018
Merged

Optimize more forms #188

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions CHANGELOG.org
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
* Changelog
** Unreleased

- [[https://github.com/r0man/sablono/pull/188/files][#188]] Optimize more forms.
- [[https://github.com/r0man/sablono/pull/185][#185]] Fix test-element-meta test.

** 0.8.3

- [[https://github.com/r0man/sablono/pull/181][#181]] Update React to =16.2.0=.
Expand Down
21 changes: 21 additions & 0 deletions benchmark/sablono/benchmark.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,4 +123,25 @@
(defcase :compile-attributes-children :reagent []
#(render (reagent/as-element [:div {:class "a"} "b" 1 2 3])))



(defgoal :compile-when-form
"Render element with literal attributes and children")

(defcase :compile-when-form :sablono []
#(render (html [:div {:class "a"}
(when true [:div [:div]])])))

(defcase :compile-when-form :react []
#(render (js/React.createElement
"div" #js {:className "a"}
(when true
(js/React.createElement
"div" nil (js/React.createElement "div"))))))

(defcase :compile-when-form :reagent []
#(render (reagent/as-element
[:div {:class "a"}
(when true [:div [:div]])])))

(perf/run-goals)
46 changes: 46 additions & 0 deletions src/sablono/compiler.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,32 @@
{:private true}
form-name)

(defmethod compile-form "case"
[[_ v & cases]]
`(case ~v
~@(doall (mapcat
(fn [[test hiccup]]
(if hiccup
[test (compile-html hiccup)]
[(compile-html test)]))
(partition-all 2 cases)))))

(defmethod compile-form "cond"
[[_ & clauses]]
`(cond ~@(mapcat
(fn [[check expr]] [check (compile-html expr)])
(partition 2 clauses))))

(defmethod compile-form "condp"
[[_ f v & cases]]
`(condp ~f ~v
~@(doall (mapcat
(fn [[test hiccup]]
(if hiccup
[test (compile-html hiccup)]
[(compile-html test)]))
(partition-all 2 cases)))))

(defmethod compile-form "do"
[[_ & forms]]
`(do ~@(butlast forms) ~(compile-html (last forms))))
Expand All @@ -136,6 +162,26 @@
[[_ condition & body]]
`(if ~condition ~@(for [x body] (compile-html x))))

(defmethod compile-form "if-not"
[[_ bindings & body]]
`(if-not ~bindings ~@(doall (for [x body] (compile-html x)))))

(defmethod compile-form "if-some"
[[_ bindings & body]]
`(if-some ~bindings ~@(doall (for [x body] (compile-html x)))))

(defmethod compile-form "when"
[[_ bindings & body]]
`(when ~bindings ~@(doall (for [x body] (compile-html x)))))

(defmethod compile-form "when-not"
[[_ bindings & body]]
`(when-not ~bindings ~@(doall (for [x body] (compile-html x)))))

(defmethod compile-form "when-some"
[[_ bindings & body]]
`(when-some ~bindings ~@(butlast body) ~(compile-html (last body))))

(defmethod compile-form :default
[expr]
(if (:inline (meta expr))
Expand Down
87 changes: 84 additions & 3 deletions test/sablono/compiler_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,9 +450,7 @@
(deftest test-issue-90
(is (=== (compile [:div nil (case :a :a "a")])
'(js/React.createElement
"div" nil nil
(sablono.interpreter/interpret
(case :a :a "a"))))))
"div" nil nil (clojure.core/case :a :a "a")))))

(deftest test-compile-attr-class
(are [form expected]
Expand Down Expand Up @@ -495,12 +493,70 @@
js/React.createElement "li"
(sablono.interpreter/attributes attrs) nil))))))))

(deftest test-compile-case
(is (=== (compile [:div {:class "a"}
(case "a"
"a" [:div "a"]
"b" [:div "b"]
[:div "else"])])
'(js/React.createElement
"div" #j {:className "a"}
(clojure.core/case "a"
"a" (js/React.createElement "div" nil "a")
"b" (js/React.createElement "div" nil "b")
(js/React.createElement "div" nil "else"))))))

(deftest test-compile-cond
(is (=== (compile [:div {:class "a"}
(condp = "a"
"a" [:div "a"]
"b" [:div "b"]
[:div "else"])])
'(js/React.createElement
"div" #j {:className "a"}
(clojure.core/condp = "a"
"a" (js/React.createElement "div" nil "a")
"b" (js/React.createElement "div" nil "b")
(js/React.createElement "div" nil "else"))))))

(deftest test-compile-condp
(is (=== (compile [:div {:class "a"}
(cond
(= "a" "a") [:div "a"]
(= "b" "b") [:div "b"]
:else [:div "else"])])
'(js/React.createElement
"div" #j {:className "a"}
(clojure.core/cond
(= "a" "a")
(js/React.createElement "div" nil "a")
(= "b" "b")
(js/React.createElement "div" nil "b")
:else
(js/React.createElement "div" nil "else"))))))

(deftest test-optimize-if
(is (=== (compile (if true [:span "foo"] [:span "bar"]) )
'(if true
(js/React.createElement "span" nil "foo")
(js/React.createElement "span" nil "bar")))))

(deftest test-compile-if-not
(is (=== (compile [:div {:class "a"} (if-not false [:div [:div]])])
'(js/React.createElement
"div" #j {:className "a"}
(clojure.core/if-not false
(js/React.createElement
"div" nil (js/React.createElement "div" nil)))))))

(deftest test-compile-if-some
(is (=== (compile [:div {:class "a"} (if-some [x true] [:div [:div]])])
'(js/React.createElement
"div" #j {:className "a"}
(clojure.core/if-some [x true]
(js/React.createElement
"div" nil (js/React.createElement "div" nil)))))))

(deftest test-issue-115
(is (=== (compile [:a {:id :XY}])
'(js/React.createElement "a" #j {:id "XY"}))))
Expand Down Expand Up @@ -534,3 +590,28 @@
"div" #j {:style (sablono.interpreter/attributes
(merge {:margin-left "2rem"}
(when focused? {:color "red"})))}))))


(deftest test-compile-when
(is (=== (compile [:div {:class "a"} (when true [:div [:div]])])
'(js/React.createElement
"div" #j {:className "a"}
(clojure.core/when true
(js/React.createElement
"div" nil (js/React.createElement "div" nil)))))))

(deftest test-compile-when-not
(is (=== (compile [:div {:class "a"} (when-not false [:div [:div]])])
'(js/React.createElement
"div" #j {:className "a"}
(clojure.core/when-not false
(js/React.createElement
"div" nil (js/React.createElement "div" nil)))))))

(deftest test-compile-when-some
(is (=== (compile [:div {:class "a"} (when-some [x true] [:div [:div]])])
'(js/React.createElement
"div" #j {:className "a"}
(clojure.core/when-some [x true]
(js/React.createElement
"div" nil (js/React.createElement "div" nil)))))))