add support for quoted values in key value optionals

Author: technetos

src/commands.rs

@@ -78,16 +78,22 @@ impl Commands {
             .filter(|segment| segment.len() > 0)
             .enumerate()
             .for_each(|(i, segment)| {
-                if let Some(name) = key_value_pair(segment) {
+                if let Some(kv_pair) = key_value_pair(segment) {
                     if let Some(lambda) = opt_lambda_state {
-                        state = self.add_key_value(name, lambda);
+                        state = match kv_pair {
+                            KeyValuePair::Quoted(name) => self.add_quoted_key_value(name, lambda),
+                            KeyValuePair::Unquoted(name) => self.add_key_value(name, lambda),
+                        };
                         self.state_machine.add_next_state(state, lambda);
                         opt_final_states.push(state);
                     } else {
                         opt_final_states.push(state);
                         state = self.add_space(state, i);
                         opt_lambda_state = Some(state);
-                        state = self.add_key_value(name, state);
+                        state = match kv_pair {
+                            KeyValuePair::Quoted(name) => self.add_quoted_key_value(name, state),
+                            KeyValuePair::Unquoted(name) => self.add_key_value(name, state),
+                        };
                         self.state_machine
                             .add_next_state(state, opt_lambda_state.unwrap());
                         opt_final_states.push(state);
@@ -330,18 +336,45 @@ impl Commands {
 
         state
     }
+
+    fn add_quoted_key_value(&mut self, name: &'static str, mut state: usize) -> usize {
+        name.chars().for_each(|c| {
+            state = self.state_machine.add(state, CharacterSet::from_char(c));
+        });
+        state = self.state_machine.add(state, CharacterSet::from_char('='));
+        state = self.state_machine.add(state, CharacterSet::from_char('"'));
+
+        state = self.state_machine.add(state, CharacterSet::any());
+        self.state_machine.add_next_state(state, state);
+        self.state_machine.start_parse(state, name);
+        self.state_machine.end_parse(state);
+
+        state = self.state_machine.add(state, CharacterSet::from_char('"'));
+
+        state
+    }
+}
+
+enum KeyValuePair {
+    Quoted(&'static str),
+    Unquoted(&'static str),
 }
 
-fn key_value_pair(s: &'static str) -> Option<&'static str> {
-    s.match_indices("={}")
-        .next()
-        .map(|pair| {
-            let name = &s[0..pair.0];
-            if name.len() > 0 {
-                Some(name)
-            } else {
-                None
-            }
-        })
-        .flatten()
+fn key_value_pair(s: &'static str) -> Option<KeyValuePair> {
+    let len = s.len();
+
+    if len <= 3 {
+        return None;
+    }
+
+    let delim = &s[len - 3..];
+    let key = &s[..len - 3];
+
+    if delim == "={}" {
+        Some(KeyValuePair::Unquoted(key))
+    } else if delim == "=[]" {
+        Some(KeyValuePair::Quoted(key))
+    } else {
+        None
+    }
 }