From 87972b1755e759148c4f412ffe3768804a27d45f Mon Sep 17 00:00:00 2001
From: Himadri Bhattacharjee <107522312+lavafroth@users.noreply.github.com>
Date: Mon, 22 Jul 2024 11:35:08 +0530
Subject: [PATCH] fix: eagerly remove omission modifier after cartesian product

---
 src/lib.rs   | 6 +++++-
 src/token.rs | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 1bd5fe7..3897f5f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -422,7 +422,7 @@ fn binding_parser(pair: Pair<'_, Rule>) -> Result<Vec<Binding>, ParseError> {
         return Err(Box::new(err).into());
     }
 
-    let bindings = bind_cartesian_product
+    let mut bindings: Vec<Binding> = bind_cartesian_product
         .into_iter()
         .zip(command_cartesian_product)
         .map(|(definition, command)| Binding {
@@ -435,5 +435,9 @@ fn binding_parser(pair: Pair<'_, Rule>) -> Result<Vec<Binding>, ParseError> {
                 .collect(),
         })
         .collect();
+
+    for binding in bindings.iter_mut() {
+        binding.definition.modifiers.remove(&Modifier::Omission);
+    }
     Ok(bindings)
 }
diff --git a/src/token.rs b/src/token.rs
index 1a9cddf..75f6e03 100644
--- a/src/token.rs
+++ b/src/token.rs
@@ -23,6 +23,7 @@ pub enum Modifier {
     Control,
     Shift,
     Any,
+    Omission,
 }
 
 impl From<ModifierRepr> for Modifier {
@@ -37,7 +38,8 @@ impl From<ModifierRepr> for Modifier {
             "mod5" => Modifier::Altgr,
             "shift" => Modifier::Shift,
             "any" => Modifier::Any,
-            _ => panic!("that's not a modifier"),
+            "_" => Modifier::Omission,
+            _ => panic!("{:?} is not a modifier", value),
         }
     }
 }