diff options
Diffstat (limited to 'src/fexpr')
-rw-r--r-- | src/fexpr/grammar.lalrpop | 13 | ||||
-rw-r--r-- | src/fexpr/mod.rs | 4 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/fexpr/grammar.lalrpop b/src/fexpr/grammar.lalrpop index 654722b..f91da19 100644 --- a/src/fexpr/grammar.lalrpop +++ b/src/fexpr/grammar.lalrpop @@ -3,6 +3,7 @@ use super::{ FErrorKind, FightOutcome, filters, + PlayerClass, SearchField, }; use evtclib::Boss; @@ -77,6 +78,8 @@ PlayerPredicate: Box<dyn filters::player::PlayerFilter> = { filters::player::account(<>.clone()) | filters::player::character(<>), + "-class" <Comma<PlayerClass>> => filters::player::class(<>), + "(" <PlayerFilter> ")", } @@ -135,6 +138,16 @@ Boss: Boss = { }), } +PlayerClass: PlayerClass = { + <l:@L> <w:word> =>? w.parse().map_err(|_| ParseError::User { + error: FError { + location: l, + data: w.into(), + kind: FErrorKind::InvalidClass, + } + }), +} + Date: DateTime<Utc> = { <l:@L> <d:datetime> =>? Local.datetime_from_str(d, "%Y-%m-%d %H:%M:%S") .map_err(|error| ParseError::User { diff --git a/src/fexpr/mod.rs b/src/fexpr/mod.rs index 2bdbfe7..452d66c 100644 --- a/src/fexpr/mod.rs +++ b/src/fexpr/mod.rs @@ -3,7 +3,7 @@ //! This module contains methods to parse a given string into an abstract filter tree, check its //! type and convert it to a [`Filter`][super::filters::Filter]. // Make it available in the grammar mod. -use super::{filters, FightOutcome, SearchField}; +use super::{filters, playerclass::PlayerClass, FightOutcome, SearchField}; use std::{error, fmt}; @@ -44,6 +44,8 @@ pub enum FErrorKind { InvalidTimestamp(#[from] chrono::format::ParseError), #[error("invalid boss name")] InvalidBoss, + #[error("invalid class name")] + InvalidClass, } /// Shortcut to create a new parser and parse the given input. |