Commit 2bc53cca authored by ransome1's avatar ransome1
Browse files

Merge branch 'zerodat-master' into develop

parents 26546199 1b3e39eb
......@@ -64,14 +64,14 @@ priorityKeyword
= "pri" ("o" ("r" ("i" ("t" "y"?)?)?)?)?
dueComparison
= "due" _ op:compareOp _ right:dateExpr { return ["due"].concat(right, [op]); }
/ "due:" right:dateStr { return ["duestr", right]; }
/ "due" { return ["due"]; }
= "due:" _ op:compareOp _ right:dateExpr { return ["due"].concat(right, [op]); }
/ "due:" right:dateStr { return ["duestr", right]; } // this does string prefix match
/ "due:" { return ["due"]; } // this tests for the presence of any due date
thresholdComparison
= "t" _ op:compareOp _ right:dateExpr { return ["threshold"].concat(right, [op]); }
/ "t:" right:dateStr { return ["tstr", right]; }
/ "t" { return ["threshold"]; }
= "t:" _ op:compareOp _ right:dateExpr { return ["threshold"].concat(right, [op]); }
/ "t:" right:dateStr { return ["tstr", right]; } // this does string prefix match
/ "t:" { return ["threshold"]; } // this tests for the presence of any due date
dateExpr
= left:dateLiteral _ op:dateOp _ count:number unit:[dbwmy] {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment