[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/org-edna bb284dc 27/72: Fixed parsing bug
From: |
Ian Dunn |
Subject: |
[elpa] scratch/org-edna bb284dc 27/72: Fixed parsing bug |
Date: |
Sun, 21 May 2017 21:11:22 -0400 (EDT) |
branch: scratch/org-edna
commit bb284dc7e62f774980c2770d0e3b5acf6e0fb03d
Author: Ian D <address@hidden>
Commit: Ian D <address@hidden>
Fixed parsing bug
* org-edna.el (org-edna-parse-form): Check for whitespace in between forms.
---
org-edna.el | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/org-edna.el b/org-edna.el
index 0ffc997..529900b 100644
--- a/org-edna.el
+++ b/org-edna.el
@@ -32,6 +32,7 @@ properties used during actions or conditions."
(signal 'invalid-read-syntax (substring form pos)))
;; Check for either end of string or an opening parenthesis
(unless (or (equal pos (length form))
+ (equal (string-match-p "\\s-" form pos) pos)
(equal (string-match-p "(" form pos) pos))
(signal 'invalid-read-syntax (substring form pos (1+ pos))))
;; Parse arguments if we have any
@@ -63,6 +64,9 @@ properties used during actions or conditions."
(when (string-match "^\\([!]\\)\\(.*\\)" (symbol-name token))
(setq modifier (intern (match-string 1 (symbol-name token))))
(setq token (intern (match-string 2 (symbol-name token)))))
+ ;; Move across any whitespace
+ (when (string-match "\\s-+" form pos)
+ (setq pos (match-end 0)))
(list token args modifier pos)))
(defconst org-edna--types
- [elpa] scratch/org-edna ef34291 26/72: Fixed chain-find, (continued)
- [elpa] scratch/org-edna ef34291 26/72: Fixed chain-find, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna 6cd8a40 28/72: Added test for parsing multiple forms, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna 3e1ed0c 29/72: Added re-search condition, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna c49aeba 36/72: Fixed consideration handling, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna 1dfc66f 01/72: Initial Commit., Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna f05cf5e 23/72: Created finders for compatibility with org-depend, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna e8fc9d5 33/72: Added test for todo action, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna 70f949c 35/72: Added note about quoting file names to documentation., Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna 24a2837 38/72: Added tests for considerations, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna 4b91a43 25/72: Added file for tests, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna bb284dc 27/72: Fixed parsing bug,
Ian Dunn <=
- [elpa] scratch/org-edna d248565 21/72: Fix uses of substring, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna 7978874 24/72: Added tests for ids and match finders, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna 6448307 30/72: Added test for empty argument list, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna 9e4d833 32/72: Fixed error in re-search, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna d022d2f 40/72: Added copyright and licensing information to all files, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna 991782f 31/72: Added documentation for each condition, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna d527569 48/72: Handle all errors in Edna forms, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna f27a89f 45/72: Use example instead of src to make HTML export prettier, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna cc3cd47 22/72: Added configuration option to use inheritance, Ian Dunn, 2017/05/21
- [elpa] scratch/org-edna 3cc0913 34/72: Added some more test headings, Ian Dunn, 2017/05/21