Merge pull request #124 from hackberrydev/refactor-parsers

Refactor parsers

Author: strika

src/plan/parser.janet

@@ -14,7 +14,7 @@
                       (constant :days) :days)
                    ,plan/build-plan)
     :title (* "# " :text-line "\n")
-    :text-line (capture (some (if-not "\n" 1)))
+    :text-line (capture (to (+ "\n" -1)))
     :inbox
       {:main (* :inbox-title (? "\n") :tasks (? "\n"))
        :inbox-title (* "## Inbox" (? "\n"))}
@@ -28,7 +28,7 @@
             {:main (group (any :event))
              :event
                {:main (replace (* :event-begin :text-line (? "\n")) ,event/build-event)
-                :event-begin (* "- " (if-not "[" 0))}}}}
+                :event-begin (* "- " (not "["))}}}}
     :tasks
       {:main (group (any :task))
        :task

src/schedule_parser.janet

@@ -12,7 +12,7 @@
        :task
          {:main (replace (* "- " (line) :task-title :task-schedule (? "\n"))
                          ,task/build-scheduled-task)
-          :task-title (replace (capture (some (if-not (+ "(" "\n") 1))) ,string/trim)
+          :task-title (replace (capture (some (to (+ "(" "\n")))) ,string/trim)
           :task-schedule (* "(" (replace (capture (some (+ :w+ :s+ "-"))) ,string/trim) ")")}}})
 
 (defn- task-lines-count