Skip to content

Parse to AST and use printers to go from AST to specific targets #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

Merged
merged 8 commits into from
Jul 13, 2017
Merged

Parse to AST and use printers to go from AST to specific targets #1

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7ae887b
Refactor clj-parse.el
volrath Jul 5, 2017
1b2b221
Add AST to Elisp and Clojure/EDN printers
volrath Jul 5, 2017
a838160
Refactor clj-parse-test.
volrath Jul 5, 2017
43f59dc
Avoid dropping whitespaces, handling them while reducing
volrath Jul 7, 2017
553f861
Rework `clj-parse-deftest` macro
volrath Jul 7, 2017
0702332
Merge branch 'master' of https://github.com/lambdaisland/clj-parse
volrath Jul 7, 2017
7733985
DESIGN.md-related adjustments
volrath Jul 9, 2017
c906de3
Rewrite all tests, and add new tests for the AST "printer"
volrath Jul 9, 2017
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rework clj-parse-deftest macro
  • Loading branch information
@volrath
volrath committed Jul 7, 2017
commit 553f8618e1ecb37190c26b93225b7b5b27b50c99
316 changes: 153 additions & 163 deletions clj-parse-test.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,184 +25,174 @@
(require 'clj-parse)
(require 'ert)

(defmacro clj-parse-deftest (name parse-to-fn test-string expected)
(declare (indent defun))
`(ert-deftest ,name ()
(with-temp-buffer
(insert ,test-string)
(goto-char 1)
(should (equal (,parse-to-fn) ,expected)))))
(defmacro clj-parse-eq-test (parse-to-fn test-string expected)
`(with-temp-buffer
(insert ,test-string)
(goto-char 1)
(should (equal (,parse-to-fn) ,expected))))


;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; To Elisp code, ala edn.el

(clj-parse-deftest clj-parse-to-elisp-simple-list
clj-parse-to-elisp
"(1 2 3)"
'((1 2 3)))

(clj-parse-deftest clj-parse-to-elisp-empty-list
clj-parse-to-elisp
"()"
'(()))

(clj-parse-deftest clj-parse-to-elisp-list-size-1
clj-parse-to-elisp
"(1)"
'((1)))

(clj-parse-deftest clj-parse-to-elisp-leafs
clj-parse-to-elisp
"(nil true false hello-world)"
'((nil t nil hello-world)))

(clj-parse-deftest clj-parse-to-elisp-qualified-symbol
clj-parse-to-elisp
"clojure.string/join"
'(clojure.string/join))

(clj-parse-deftest clj-parse-to-elisp-nested-lists
clj-parse-to-elisp
"((.9 abc (true) (hello)))"
'(((0.9 abc (t) (hello)))))

(clj-parse-deftest clj-parse-to-elisp-strings-1
clj-parse-to-elisp
"\"abc hello \\t\\\"x\""
'("abc hello \t\"x"))

(clj-parse-deftest clj-parse-to-elisp-strings-2
clj-parse-to-elisp
"(\"---\\f---\\\"-'\\'-\\\\-\\r\\n\")"
'(("---\f---\"-''-\\-\r\n")))

(clj-parse-deftest clj-parse-to-elisp-chars-1
clj-parse-to-elisp
"(\\newline \\return \\space \\tab \\a \\b \\c \\u0078 \\o171)"
'((?\n ?\r ?\ ?\t ?a ?b ?c ?x ?y)))

(clj-parse-deftest clj-parse-to-elisp-chars-2
clj-parse-to-elisp
"\"\\u0078 \\o171\""
'("x y"))

(clj-parse-deftest clj-parse-to-elisp-keywords
clj-parse-to-elisp
":foo-bar"
'(:foo-bar))

(clj-parse-deftest clj-parse-to-elisp-vector
clj-parse-to-elisp
"[123]"
'([123]))

(clj-parse-deftest clj-parse-to-elisp-map
clj-parse-to-elisp
"{:count 123}"
'(((:count . 123))))

(clj-parse-deftest clj-parse-to-elisp-set
clj-parse-to-elisp
"#{:x}"
'((:x)))

(clj-parse-deftest clj-parse-to-elisp-discarded
clj-parse-to-elisp
"(10 #_11 12 #_#_ 13 14)"
'((10 12 14)))
(ert-deftest clj-parse-to-elisp-simple-list ()
(clj-parse-eq-test clj-parse-to-elisp
"(1 2 3)"
'((1 2 3))))
Copy link
Member Author

@volrath volrath Jul 7, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tbh I don't know if this is the best way to indent this.

(ert-deftest clj-parse-to-elisp-empty-list ()
(clj-parse-eq-test clj-parse-to-elisp
"()"
'(())))

(ert-deftest clj-parse-to-elisp-list-size-1 ()
(clj-parse-eq-test clj-parse-to-elisp
"(1)"
'((1))))

(ert-deftest clj-parse-to-elisp-leafs ()
(clj-parse-eq-test clj-parse-to-elisp
"(nil true false hello-world)"
'((nil t nil hello-world))))

(ert-deftest clj-parse-to-elisp-qualified-symbol ()
(clj-parse-eq-test clj-parse-to-elisp
"clojure.string/join"
'(clojure.string/join)))

(ert-deftest clj-parse-to-elisp-nested-lists ()
(clj-parse-eq-test clj-parse-to-elisp
"((.9 abc (true) (hello)))"
'(((0.9 abc (t) (hello))))))

(ert-deftest clj-parse-to-elisp-strings ()
(clj-parse-eq-test clj-parse-to-elisp
"\"abc hello \\t\\\"x\""
'("abc hello \t\"x"))
(clj-parse-eq-test clj-parse-to-elisp
"(\"---\\f---\\\"-'\\'-\\\\-\\r\\n\")"
'(("---\f---\"-''-\\-\r\n"))))

(ert-deftest clj-parse-to-elisp-chars ()
(clj-parse-eq-test clj-parse-to-elisp
"(\\newline \\return \\space \\tab \\a \\b \\c \\u0078 \\o171)"
'((?\n ?\r ?\ ?\t ?a ?b ?c ?x ?y)))
(clj-parse-eq-test clj-parse-to-elisp
"\"\\u0078 \\o171\""
'("x y")))

(ert-deftest clj-parse-to-elisp-keywords ()
(clj-parse-eq-test clj-parse-to-elisp
":foo-bar"
'(:foo-bar)))

(ert-deftest clj-parse-to-elisp-vector ()
(clj-parse-eq-test clj-parse-to-elisp
"[123]"
'([123])))

(ert-deftest clj-parse-to-elisp-map ()
(clj-parse-eq-test clj-parse-to-elisp
"{:count 123}"
'(((:count . 123)))))

(ert-deftest clj-parse-to-elisp-set ()
(clj-parse-eq-test clj-parse-to-elisp
"#{:x}"
'((:x))))

(ert-deftest clj-parse-to-elisp-discarded ()
(clj-parse-eq-test clj-parse-to-elisp
"(10 #_11 12 #_#_ 13 14)"
'((10 12 14))))


;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; To Clojure/EDN string

(clj-parse-deftest clj-parse-to-string-simple-list
clj-parse-to-string
"( 1 2 3)"
"(1 2 3)")

(clj-parse-deftest clj-parse-to-string-empty-list
clj-parse-to-string
"()"
"()")

(clj-parse-deftest clj-parse-to-string-list-size-1
clj-parse-to-string
"(1)"
"(1)")

(clj-parse-deftest clj-parse-to-string-leafs
clj-parse-to-string
"(nil true false hello-world)"
"(nil true false hello-world)")

(clj-parse-deftest clj-parse-to-string-qualified-symbol
clj-parse-to-string
"clojure.string/join"
"clojure.string/join")

(clj-parse-deftest clj-parse-to-string-nested-lists
clj-parse-to-string
"((.9 abc (true) (hello)))"
"((.9 abc (true) (hello)))")

(clj-parse-deftest clj-parse-to-string-strings-1
clj-parse-to-string
"\"abc hello \\t\\\"x\""
"\"abc hello \\t\\\"x\"")

(clj-parse-deftest clj-parse-to-string-strings-2
clj-parse-to-string
"(\"---\\f---\\\"-'\\'-\\\\-\\r\\n\")"
"(\"---\\f---\\\"-'\\'-\\\\-\\r\\n\")")

(clj-parse-deftest clj-parse-to-string-chars-1
clj-parse-to-string
"(\\newline \\return \\space \\tab \\a \\b \\c \\u0078 \\o171)"
"(\\newline \\return \\space \\tab \\a \\b \\c \\u0078 \\o171)")

(clj-parse-deftest clj-parse-to-string-chars-2
clj-parse-to-string
"\"\\u0078 \\o171\""
"\"\\u0078 \\o171\"")

(clj-parse-deftest clj-parse-to-string-keywords
clj-parse-to-string
":foo-bar"
":foo-bar")

(clj-parse-deftest clj-parse-to-string-vector
clj-parse-to-string
"[123]"
"[123]")

(clj-parse-deftest clj-parse-to-string-map
clj-parse-to-string
"{:count 123}"
"{:count 123}")

(clj-parse-deftest clj-parse-to-string-set
clj-parse-to-string
"#{:x}"
"#{:x}")

(clj-parse-deftest clj-parse-to-string-discarded
clj-parse-to-string
"(10 #_11 12 #_#_ 13 14)"
"(10 12 14)")
(ert-deftest clj-parse-to-string-simple-list ()
(clj-parse-eq-test clj-parse-to-string
"( 1 2 3)"
"(1 2 3)"))

(ert-deftest clj-parse-to-string-empty-list ()
(clj-parse-eq-test clj-parse-to-string
"()"
"()"))

(ert-deftest clj-parse-to-string-list-size-1 ()
(clj-parse-eq-test clj-parse-to-string
"(1)"
"(1)"))

(ert-deftest clj-parse-to-string-leafs ()
(clj-parse-eq-test clj-parse-to-string
"(nil true false hello-world)"
"(nil true false hello-world)"))

(ert-deftest clj-parse-to-string-qualified-symbol ()
(clj-parse-eq-test clj-parse-to-string
"clojure.string/join"
"clojure.string/join"))

(ert-deftest clj-parse-to-string-nested-lists ()
(clj-parse-eq-test clj-parse-to-string
"((.9 abc (true) (hello)))"
"((.9 abc (true) (hello)))"))

(ert-deftest clj-parse-to-string-strings ()
(clj-parse-eq-test clj-parse-to-string
"\"abc hello \\t\\\"x\""
"\"abc hello \\t\\\"x\"")
(clj-parse-eq-test clj-parse-to-string
"(\"---\\f---\\\"-'\\'-\\\\-\\r\\n\")"
"(\"---\\f---\\\"-'\\'-\\\\-\\r\\n\")"))

(ert-deftest clj-parse-to-string-chars ()
(clj-parse-eq-test clj-parse-to-string
"(\\newline \\return \\space \\tab \\a \\b \\c \\u0078 \\o171)"
"(\\newline \\return \\space \\tab \\a \\b \\c \\u0078 \\o171)")
(clj-parse-eq-test clj-parse-to-string
"\"\\u0078 \\o171\""
"\"\\u0078 \\o171\""))

(ert-deftest clj-parse-to-string-keywords ()
(clj-parse-eq-test clj-parse-to-string
":foo-bar"
":foo-bar"))

(ert-deftest clj-parse-to-string-vector ()
(clj-parse-eq-test clj-parse-to-string
"[123]"
"[123]"))

(ert-deftest clj-parse-to-string-map ()
(clj-parse-eq-test clj-parse-to-string
"{:count 123}"
"{:count 123}"))

(ert-deftest clj-parse-to-string-set ()
(clj-parse-eq-test clj-parse-to-string
"#{:x}"
"#{:x}"))

(ert-deftest clj-parse-to-string-discarded ()
(clj-parse-eq-test clj-parse-to-string
"(10 #_11 12 #_#_ 13 14)"
"(10 12 14)"))


;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; AST

(clj-parse-deftest clj-parse-ast-simple-list
clj-parse
"(1 2 3)"
'((type . :root)
(subnodes . (((type . :list)
(subnodes . (((type . :number) (form . "1") (pos . 2))
((type . :number) (form . "2") (pos . 4))
((type . :number) (form . "3") (pos . 6)))))))))
(ert-deftest clj-parse-ast-simple-list ()
(clj-parse-eq-test clj-parse
"(1 2 3)"
'((type . :root)
(subnodes . (((type . :list)
(subnodes . (((type . :number) (form . "1") (pos . 2))
((type . :number) (form . "2") (pos . 4))
((type . :number) (form . "3") (pos . 6))))))))))

(provide 'clj-parse-test)

Expand Down