Merge branch 'gamemode-filters'

1 files changed, 16 insertions, 1 deletions

diff --git a/src/fexpr/grammar.lalrpop b/src/fexpr/grammar.lalrpop
index ce78396..bca7691 100644
--- a/src/fexpr/grammar.lalrpop
+++ b/src/fexpr/grammar.lalrpop
@@ -9,7 +9,7 @@ use super::{
     DurationProducer,
     CountProducer,
 };
-use evtclib::Encounter;
+use evtclib::{Encounter, GameMode};
 use std::collections::HashSet;
 use lalrpop_util::ParseError;
 
@@ -64,6 +64,12 @@ LogPredicate: Box<dyn filters::log::LogFilter> = {
     "-boss" <Comma<Encounter>> => filters::log::encounter(<>),
     "-cm" => filters::log::challenge_mote(),
 
+    "-raid" => filters::log::game_mode([GameMode::Raid].into()),
+    "-fractal" => filters::log::game_mode([GameMode::Fractal].into()),
+    "-strike" => filters::log::game_mode([GameMode::Strike].into()),
+    "-wvw" => filters::log::game_mode([GameMode::WvW].into()),
+    "-gamemode" <Comma<GameMode>> => filters::log::game_mode(<>),
+
     "-include" => filters::constant(true),
     "-exclude" => filters::constant(false),
 
@@ -150,6 +156,15 @@ Encounter: Encounter = {
     }),
 }
 
+GameMode: GameMode = {
+    <l:@L> <w:word> =>? w.parse().map_err(|_| ParseError::User {
+        error: FError {
+            location: l,
+            kind: FErrorKind::GameMode,
+        }
+    }),
+}
+
 PlayerClass: PlayerClass = {
     <l:@L> <w:word> =>? w.parse().map_err(|_| ParseError::User {
         error: FError {