remove manual main definitions

kiss/template/src/template/Main.kiss

@@ -1,2 +1 @@
-(function :Void main []
-    (print "Hello world!"))
+(print "Hello world!")

projects/aoc/src/Main.kiss

@@ -1,6 +1,6 @@
 (load "UtilMacros.kiss")
-(function :Void main []
-    (year 2018
-        (Solutions2018.run))
-    (year 2020
-        (Solutions2020.run)))
+
+(year 2018
+    (Solutions2018.run))
+(year 2020
+    (Solutions2020.run))

projects/asciilib2/src/Main.kiss

@@ -1,2 +1 @@
-(function :Void main []
-    (print "Hello world!"))
+(print "Hello world!")

projects/bump-version/src/bump_version/Main.kiss

@@ -1,16 +1,15 @@
-(function :Void main []
-    (let [[jsonFile workingDir]
-                (Sys.args)
-            json
-                (Json.parse
-                    (File.getContent (joinPath workingDir jsonFile)))
-            oldVersion
-                json.version
-            :kiss.List<Int> versionParts
-                (.map (oldVersion.split ".") Std.parseInt)]
-        (+= (nth versionParts -1) 1)
-        (let [newVersion
-                    (versionParts.join ".")]
-            (print "Bumping version of $jsonFile from $oldVersion -> $newVersion")
-            (set json.version newVersion)
-            (File.saveContent (joinPath workingDir jsonFile) (Json.stringify json "\t")))))
+(let [[jsonFile workingDir]
+            (Sys.args)
+        json
+            (Json.parse
+                (File.getContent (joinPath workingDir jsonFile)))
+        oldVersion
+            json.version
+        :kiss.List<Int> versionParts
+            (.map (oldVersion.split ".") Std.parseInt)]
+    (+= (nth versionParts -1) 1)
+    (let [newVersion
+                (versionParts.join ".")]
+        (print "Bumping version of $jsonFile from $oldVersion -> $newVersion")
+        (set json.version newVersion)
+        (File.saveContent (joinPath workingDir jsonFile) (Json.stringify json "\t"))))

projects/nat-archive-tool/src/nat/CLI.kiss

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

projects/nat-archive-tool/src/test/TestMain.kiss

@@ -1,35 +1,30 @@
-// TODO external programs need to be able to find and (load) this path to get the macros:
-// ^ 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?
+// External programs can load Lib.kiss with (loadFrom "nat-archive-tool" "src/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 (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"]))
-    //trace(error);
-    (let [archive
-                (new Archive "src/test/example-archive")
-            song1
-                (dictGet archive.entries "song1")
-            song2
-                (dictGet archive.entries "song2")]
+    (assert (hasComponent song1 Tags))
+    (assert (hasComponent song2 Tags))
+    (assert (componentsMatch song1 "(and Name Author)"))
+    (assert (componentsMatch song2 "(and Name Author)"))
+    (assert (tagsMatch archive song1 "(and song western)"))
+    (assert !(tagsMatch archive song1 "(and song religious)"))
+    (assert (tagsMatch archive song2 "(and song religious)"))
+    (assert !(tagsMatch archive song2 "(and song western)"))
 
-        (assert (hasComponent song1 Tags))
-        (assert (hasComponent song2 Tags))
-        (assert (componentsMatch song1 "(and Name Author)"))
-        (assert (componentsMatch song2 "(and Name Author)"))
-        (assert (tagsMatch archive song1 "(and song western)"))
-        (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")))))
+    (withWritableComponents archive song1
+        [author Author
+            name Name]
+        (assert (= author "Rafael Krux"))
+        (assert (= name "Adventure"))))

projects/pdf-salad/src/Main.kiss

@@ -13,16 +13,15 @@
 // TODO add sequentialPerPDF argument (which, when used, .shift()s pages from the beginning of PDFs)
 // TODO add chunkSize argument (default 1, which specifies how many pages in order to pull from a random PDF. value of -1 means take the whole PDF, and remove it from the list)
 // TODO make output page limit optional
-(function :Void main []
-    (let [[sourceDir numPages] (Sys.args)]
-        (loadAll (for file (Fs.readdirSync sourceDir) (+ sourceDir "/" file))
-            (lambda [:Array<PDFDocument> inputPdfs]
-                (awaitLet [saladPdf (PDFDocument.create)
-                            pages (Promise.all
-                                (for _ (range 0 (Std.parseInt numPages))
-                                    (let [:PDFDocument pdf (nth inputPdfs (Std.random inputPdfs.length))
-                                            page (Std.random (pdf.getPageCount))]
-                                        (saladPdf.copyPages pdf [page]))))]
-                    (doFor page pages (saladPdf.addPage (first page)))
-                    (awaitLet [bytesOut (saladPdf.save)]
-                        (Fs.writeFileSync "out.pdf" bytesOut)))))))
+(let [[sourceDir numPages] (Sys.args)]
+    (loadAll (for file (Fs.readdirSync sourceDir) (+ sourceDir "/" file))
+        (lambda [:Array<PDFDocument> inputPdfs]
+            (awaitLet [saladPdf (PDFDocument.create)
+                        pages (Promise.all
+                            (for _ (range 0 (Std.parseInt numPages))
+                                (let [:PDFDocument pdf (nth inputPdfs (Std.random inputPdfs.length))
+                                        page (Std.random (pdf.getPageCount))]
+                                    (saladPdf.copyPages pdf [page]))))]
+                (doFor page pages (saladPdf.addPage (first page)))
+                (awaitLet [bytesOut (saladPdf.save)]
+                    (Fs.writeFileSync "out.pdf" bytesOut))))))