kiss-lang/nat-archive-tool
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

remove manual main definitions

Browse Source
This commit is contained in:
Nat Quayle Nelson
2021-07-25 21:10:15 -06:00
parent d7ff5fc9c2
commit 3fa3439a1d
2 changed files with 39 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/nat/CLI.kiss
View File

@@ -1,18 +1,18 @@
// External programs can load Lib.kiss with (loadFrom "nat-archive-tool" "src/nat/Lib.kiss")
(load "Lib.kiss") (load "Lib.kiss")
(function :Void main [] (let [[archiveDir] (Sys.args)
(let [[archiveDir] (Sys.args) controller
controller (new ArchiveController
(new ArchiveController (new Archive archiveDir)
(new Archive archiveDir) (new CLI))]
(new CLI))] (loop
(loop (Sys.print ">> ")
(Sys.print ">> ") (let [command
(let [command (.trim (.toString (.readLine (Sys.stdin))))]
(.trim (.toString (.readLine (Sys.stdin))))] (if (controller.commands.exists command)
(if (controller.commands.exists command) (controller.runCommand (dictGet controller.commands command))
(controller.runCommand (dictGet controller.commands command)) (Sys.println "$command is not a valid command")))))
(Sys.println "$command is not a valid command"))))))
(defNew []) (defNew [])

57
src/test/TestMain.kiss
View File

@@ -1,35 +1,30 @@
// TODO external programs need to be able to find and (load) this path to get the macros: // External programs can load Lib.kiss with (loadFrom "nat-archive-tool" "src/nat/Lib.kiss")
// ^ That should be solved by allowing an optional first argument to load that is a symbol
// of a library name that can be used to resolve the source dir in the user's Haxelib maybe?
(load "../nat/Lib.kiss") (load "../nat/Lib.kiss")
(assert (BoolExpInterp.eval "true" []))
(assert !(BoolExpInterp.eval "false" []))
(assert !(BoolExpInterp.eval "flag" []))
(assert (BoolExpInterp.eval "flag" ["flag"]))
(assert !(BoolExpInterp.eval "(and flag false)" ["flag"]))
(assert (BoolExpInterp.eval "(or flag otherFlag)" ["otherFlag"]))
(let [archive
(new Archive "src/test/example-archive")
song1
(dictGet archive.entries "song1")
song2
(dictGet archive.entries "song2")]
(function :Void main [] (assert (hasComponent song1 Tags))
(assert (BoolExpInterp.eval "true" [])) (assert (hasComponent song2 Tags))
(assert !(BoolExpInterp.eval "false" [])) (assert (componentsMatch song1 "(and Name Author)"))
(assert !(BoolExpInterp.eval "flag" [])) (assert (componentsMatch song2 "(and Name Author)"))
(assert (BoolExpInterp.eval "flag" ["flag"])) (assert (tagsMatch archive song1 "(and song western)"))
(assert !(BoolExpInterp.eval "(and flag false)" ["flag"])) (assert !(tagsMatch archive song1 "(and song religious)"))
(assert (BoolExpInterp.eval "(or flag otherFlag)" ["otherFlag"])) (assert (tagsMatch archive song2 "(and song religious)"))
//trace(error); (assert !(tagsMatch archive song2 "(and song western)"))
(let [archive
(new Archive "src/test/example-archive")
song1
(dictGet archive.entries "song1")
song2
(dictGet archive.entries "song2")]
(assert (hasComponent song1 Tags)) (withWritableComponents archive song1
(assert (hasComponent song2 Tags)) [author Author
(assert (componentsMatch song1 "(and Name Author)")) name Name]
(assert (componentsMatch song2 "(and Name Author)")) (assert (= author "Rafael Krux"))
(assert (tagsMatch archive song1 "(and song western)")) (assert (= name "Adventure"))))
(assert !(tagsMatch archive song1 "(and song religious)"))
(assert (tagsMatch archive song2 "(and song religious)"))
(assert !(tagsMatch archive song2 "(and song western)"))
(withWritableComponents archive song1
[author Author
name Name]
(assert (= author "Rafael Krux"))
(assert (= name "Adventure")))))