1 files changed, 35 insertions, 2 deletions

diff --git a/src/fexpr/grammar.lalrpop b/src/fexpr/grammar.lalrpop
index 45f4fde..c2df097 100644
--- a/src/fexpr/grammar.lalrpop
+++ b/src/fexpr/grammar.lalrpop
@@ -4,12 +4,15 @@ use super::{
     FightOutcome,
     filters,
     PlayerClass,
+
+    DateProducer,
+    DurationProducer,
 };
 use evtclib::Boss;
 use std::collections::HashSet;
 use lalrpop_util::ParseError;
 
-use chrono::{DateTime, Local, TimeZone, Utc, Weekday};
+use chrono::{DateTime, Local, TimeZone, Utc, Weekday, Duration};
 use regex::{Regex, RegexBuilder};
 
 grammar;
@@ -68,6 +71,9 @@ LogPredicate: Box<dyn filters::log::LogFilter> = {
     "any" "(" "player" ":" <PlayerFilter> ")" => filters::player::any(<>),
     "exists" "(" "player" ":" <PlayerFilter> ")" => filters::player::any(<>),
 
+    <Comparison<DateProducer>>,
+    <Comparison<DurationProducer>>,
+
     "(" <LogFilter> ")",
 }
 
@@ -175,6 +181,22 @@ Date: DateTime<Utc> = {
         .map(|d| d.with_timezone(&Utc)),
 }
 
+Duration: Duration = {
+    duration => Duration::seconds(<>[..<>.len() - 1].parse().unwrap()),
+}
+
+CompOp: filters::values::CompOp = {
+    "<" => filters::values::CompOp::Less,
+    "<=" => filters::values::CompOp::LessEqual,
+    "=" => filters::values::CompOp::Equal,
+    ">=" => filters::values::CompOp::GreaterEqual,
+    ">" => filters::values::CompOp::Greater,
+}
+
+Comparison<T>: Box<dyn filters::log::LogFilter> = {
+    <lhs:T> <op:CompOp> <rhs:T> => filters::values::comparison(lhs, op, rhs),
+}
+
 Comma<T>: HashSet<T> = {
     <v:(<T> ",")*> <e:T> => {
         let mut result = v.into_iter().collect::<HashSet<_>>();
@@ -183,6 +205,16 @@ Comma<T>: HashSet<T> = {
     },
 }
 
+DateProducer: Box<dyn DateProducer> = {
+    <Date> => filters::values::constant(<>),
+    "-time" => filters::values::time(),
+}
+
+DurationProducer: Box<dyn DurationProducer> = {
+    <Duration> => filters::values::constant(<>),
+    "-duration" => filters::values::duration(),
+}
+
 match {
     "player" => "player",
     "not" => "not",
@@ -194,7 +226,8 @@ match {
 
     r"\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d" => datetime,
     r"\d\d\d\d-\d\d-\d\d" => date,
-    r"[\w]+" => word,
+    r"\d+s" => duration,
+    r"[[:alpha:]][\w]*" => word,
     r#""[^"]*""# => string,
 
     _