jiri/org-ql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP

Browse source
This commit is contained in:
Adam Porter 2020-11-22 16:53:32 -06:00
parent 5b3312ebae
commit a87058b440
1 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

29
org-ql.el
View file

@ -779,7 +779,10 @@ PREDICATES should be the value of `org-ql-predicates'."
(fset 'org-ql--normalize-query (fset 'org-ql--normalize-query
(byte-compile (byte-compile
`(lambda (query) `(lambda (query)
"FIXME" "Return normalized form of QUERY expression.
This function is defined by calling
`org-ql--define-normalize-query-fn', which uses normalizer forms
defined in `org-ql-predicates' by calling `org-ql-defpred'."
(cl-labels ((rec (element) (cl-labels ((rec (element)
(pcase element (pcase element
(`(or . ,clauses) `(or ,@(mapcar #'rec clauses))) (`(or . ,clauses) `(or ,@(mapcar #'rec clauses)))
@ -817,7 +820,24 @@ PREDICATES should be the value of `org-ql-predicates'."
predicates))))) predicates)))))
(fset 'org-ql--query-preamble (fset 'org-ql--query-preamble
`(lambda (query) `(lambda (query)
"FIXME" "Return preamble data plist for QUERY.
The plist has the following keys:
:preamble Regexp to search the Org buffer for to find potential
matches. If the regexp doesn't guarantee a match to
QUERY, the :query key should be an appropriate query
expression to test against the heading (i.e. usually
QUERY again).
:preamble-case-fold What to bind variable `case-fold-search' to
around the regexp search.
:query The query expression to use instead of QUERY (or QUERY
again, when appropriate).
This function is defined by calling
`org-ql--define-query-preamble-fn', which uses preamble forms
defined in `org-ql-predicates' by calling `org-ql-defpred'."
(pcase org-ql-use-preamble (pcase org-ql-use-preamble
('nil (list :query query :preamble nil)) ('nil (list :query query :preamble nil))
(_ (let ((preamble-case-fold t) (_ (let ((preamble-case-fold t)
@ -831,10 +851,6 @@ PREDICATES should be the value of `org-ql-predicates'."
,@preamble-patterns ,@preamble-patterns
;; (`(clocked . ,_)
;; (setq org-ql-preamble org-ql-clock-regexp)
;; element)
(`(and . ,rest) (`(and . ,rest)
(let ((clauses (mapcar #'rec rest))) (let ((clauses (mapcar #'rec rest)))
`(and ,@(-non-nil clauses)))) `(and ,@(-non-nil clauses))))
@ -892,6 +908,7 @@ to variables bound in the pattern:
:regexp Regular expression which searches directly to a :regexp Regular expression which searches directly to a
potential match. potential match.
:case-fold Bound to `case-fold-search' around the regexp search. :case-fold Bound to `case-fold-search' around the regexp search.
:query Expression which should replace the query expression, :query Expression which should replace the query expression,