Merge pull request #105 from hackberrydev/plan-parser-errors

Return array of errors from plan parser

Author: strika

src/alas.janet

@@ -45,10 +45,10 @@
     (print-errors errors)
     (let [plan-string (load-file-result :text)
           parse-result (plan_parser/parse plan-string)
-          parse-error (parse-result :error)
+          parse-errors (parse-result :errors)
           plan (parse-result :plan)]
-      (if parse-error
-        (print parse-error)
+      (if parse-errors
+        (print-errors parse-errors)
         (let [serialize-empty-inbox (plan_parser/serialize-empty-inbox? plan-string)
               new-plan (run-commands plan file-path arguments)
               new-plan-string (plan_serializer/serialize

src/plan/parser.janet

@@ -69,6 +69,6 @@
                                {:serialize-empty-inbox serialize-empty-inbox})]
       (if (= (lines-count parsed-plan-string) (lines-count plan-string))
         {:plan plan}
-        {:error (string "Plan can not be parsed: last parsed line is line "
-                        (lines-count parsed-plan-string {:ignore-whitespace false}))}))
-    {:error "Plan can not be parsed"}))
+        {:errors [(string "Plan can not be parsed: last parsed line is line "
+                          (lines-count parsed-plan-string {:ignore-whitespace false}))]}))
+    {:errors ["Plan can not be parsed"]}))

test/plan/parser_test.janet

@@ -191,8 +191,8 @@
     - [O] Talk to Mike
     ```)
   (def parse-result (parse plan-string))
-  (is (parse-result :error))
-  (is (= "Plan can not be parsed" (parse-result :error))))
+  (is (parse-result :errors))
+  (is (= "Plan can not be parsed" (first (parse-result :errors)))))
 
 (deftest parse-when-plan-can-partially-be-parsed
   (def plan-string
@@ -206,8 +206,8 @@
     ## Tomorrow
     ```)
   (def parse-result (parse plan-string))
-  (is (parse-result :error))
+  (is (parse-result :errors))
   (is (= "Plan can not be parsed: last parsed line is line 6"
-         (parse-result :error))))
+         (first (parse-result :errors)))))
 
 (run-tests!)