[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 71cdc0a 027/135: Fixed parsing bug
From: |
Ian Dunn |
Subject: |
[elpa] master 71cdc0a 027/135: Fixed parsing bug |
Date: |
Mon, 17 Feb 2020 10:52:47 -0500 (EST) |
branch: master
commit 71cdc0a7e789d2816ee14ca61d064ad6db8e9902
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] master 3a4cca9 003/135: Added Makefile., (continued)
- [elpa] master 3a4cca9 003/135: Added Makefile., Ian Dunn, 2020/02/17
- [elpa] master 01c50c0 002/135: Make all finders return lists of markers, Ian Dunn, 2020/02/17
- [elpa] master 5010097 005/135: Added initial documentation, Ian Dunn, 2020/02/17
- [elpa] master 18814ca 001/135: Initial Commit., Ian Dunn, 2020/02/17
- [elpa] master 1fb6dcf 013/135: Added chain action, Ian Dunn, 2020/02/17
- [elpa] master ad75461 017/135: Use existing org-xor instead of new function, Ian Dunn, 2020/02/17
- [elpa] master adbff7e 019/135: Remove duplicate targets, Ian Dunn, 2020/02/17
- [elpa] master 6886b8a 026/135: Fixed chain-find, Ian Dunn, 2020/02/17
- [elpa] master 55283ff 015/135: Renamed to Org-Edna., Ian Dunn, 2020/02/17
- [elpa] master d348102 025/135: Added file for tests, Ian Dunn, 2020/02/17
- [elpa] master 71cdc0a 027/135: Fixed parsing bug,
Ian Dunn <=
- [elpa] master 6b9a676 031/135: Added documentation for each condition, Ian Dunn, 2020/02/17
- [elpa] master 71e00e4 036/135: Fixed consideration handling, Ian Dunn, 2020/02/17
- [elpa] master 9f27779 014/135: Clarified use of case-fold-search in `org-bat--handle-planning', Ian Dunn, 2020/02/17
- [elpa] master 13e752b 021/135: Fix uses of substring, Ian Dunn, 2020/02/17
- [elpa] master 3937f31 009/135: Fixed headings condition, Ian Dunn, 2020/02/17
- [elpa] master 975da4b 010/135: Improved org-bat-parse-form to handle new argument types, Ian Dunn, 2020/02/17
- [elpa] master 029bc2e 012/135: Cleaned up condition handling, Ian Dunn, 2020/02/17
- [elpa] master 602ad6d 011/135: Added tests for org-bat-parse-form, Ian Dunn, 2020/02/17
- [elpa] master a70f9ac 016/135: Fixed bug in Makefile, Ian Dunn, 2020/02/17
- [elpa] master abb0083 018/135: Fixed up indenting, Ian Dunn, 2020/02/17