Refactor plan parser

Author: strika

src/plan/parser.janet

@@ -15,32 +15,42 @@
                    ,plan/build-plan)
     :title (* "# " :text-line "\n")
     :text-line (capture (some (if-not "\n" 1)))
-    :inbox (* :inbox-title (? "\n") :tasks (? "\n"))
-    :inbox-title (* "## Inbox" (? "\n"))
-    :days (group (any :day))
-    :day (replace (* :day-title (? "\n") :events :tasks (? "\n")) ,day/build-day)
-    :day-title (* "## " :date ", " :week-day (? "\n"))
-    :date (replace (capture (* :d :d :d :d "-" :d :d "-" :d :d)) ,d/parse)
-    :week-day (+ "Monday" "Tuesday" "Wednesday" "Thursday" "Friday" "Saturday" "Sunday")
-    :events (group (any :event))
-    :event (replace (* :event-begin :text-line (? "\n")) ,event/build-event)
-    :event-begin (* "- " (if-not "[" 0))
-    :tasks (group (any :task))
-    :task (replace (* (constant :done) :task-begin
-                      " "
-                      (constant :title) (capture (some (if-not (+ "\n" " (missed on") 1)))
-                      (? :task-missed-on-date)
-                      (? "\n")
-                      (constant :body) :task-body
-                      (? "\n"))
-                   ,struct)
-    :task-begin (* "- " :checkbox)
-    :checkbox (+ :checkbox-done :checkbox-pending)
-    :checkbox-done (* (+ "[x]" "[X]") (constant true))
-    :checkbox-pending (* "[ ]" (constant false))
-    :task-body (group (any :task-body-line))
-    :task-body-line (* "  " :text-line (? "\n"))
-    :task-missed-on-date (* " (missed on " (constant :missed-on) :date ")")})
+    :inbox
+      {:main (* :inbox-title (? "\n") :tasks (? "\n"))
+       :inbox-title (* "## Inbox" (? "\n"))}
+    :days
+      {:main (group (any :day))
+       :day
+         {:main (replace (* :day-title (? "\n") :events :tasks (? "\n")) ,day/build-day)
+          :day-title (* "## " :date ", " :week-day (? "\n"))
+          :week-day (+ "Monday" "Tuesday" "Wednesday" "Thursday" "Friday" "Saturday" "Sunday")
+          :events
+            {:main (group (any :event))
+             :event
+               {:main (replace (* :event-begin :text-line (? "\n")) ,event/build-event)
+                :event-begin (* "- " (if-not "[" 0))}}}}
+    :tasks
+      {:main (group (any :task))
+       :task
+         {:main (replace (* (constant :done) :task-begin
+                            " "
+                            (constant :title) (capture (some (if-not (+ "\n" " (missed on") 1)))
+                            (? :task-missed-on-date)
+                            (? "\n")
+                            (constant :body) :task-body
+                            (? "\n"))
+                         ,struct)
+          :task-begin
+            {:main (* "- " :checkbox)
+             :checkbox
+               {:main (+ :checkbox-done :checkbox-pending)
+                :checkbox-done (* (+ "[x]" "[X]") (constant true))
+                :checkbox-pending (* "[ ]" (constant false))}}
+          :task-missed-on-date (* " (missed on " (constant :missed-on) :date ")")
+          :task-body
+            {:main (group (any :task-body-line))
+             :task-body-line (* "  " :text-line (? "\n"))}}}
+    :date (replace (capture (* :d :d :d :d "-" :d :d "-" :d :d)) ,d/parse)})
 
 (defn- lines-count [plan-string &opt options]
   (default options {:ignore-whitespace true})