Skip to content

Quoted key value optionals #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 7, 2021
Merged

Quoted key value optionals #90

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a1bf5c
add support for quoted values in key value optionals
technetos Jun 17, 2021
5d3935f
revert to just ={} and support both quoted and unquoted syntax on kv …
technetos Jun 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 36 additions & 7 deletions src/commands.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ impl Commands {
info!("Adding command {}", &command);
let mut state = 0;

let mut opt_lambda_state = None;
let mut reused_space_state = None;
let mut opt_final_states = vec![];

let handler = Arc::new(Command {
Expand All @@ -79,21 +79,31 @@ impl Commands {
.enumerate()
.for_each(|(i, segment)| {
if let Some(name) = key_value_pair(segment) {
if let Some(lambda) = opt_lambda_state {
if let Some(lambda) = reused_space_state {
state = self.add_key_value(name, lambda);
self.state_machine.add_next_state(state, lambda);
opt_final_states.push(state);

state = self.add_quoted_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);
reused_space_state = Some(state);

state = self.add_key_value(name, state);
self.state_machine
.add_next_state(state, opt_lambda_state.unwrap());
.add_next_state(state, reused_space_state.unwrap());
opt_final_states.push(state);

state = self.add_quoted_key_value(name, reused_space_state.unwrap());
self.state_machine
.add_next_state(state, reused_space_state.unwrap());
opt_final_states.push(state);
}
} else {
opt_lambda_state = None;
reused_space_state = None;
opt_final_states.truncate(0);
let last_state = state;
state = self.add_space(state, i);
Expand Down Expand Up @@ -122,7 +132,7 @@ impl Commands {
}
});

if opt_lambda_state.is_some() {
if reused_space_state.is_some() {
opt_final_states.iter().for_each(|state| {
self.state_machine.set_final_state(*state);
self.state_machine.set_handler(*state, handler.clone());
Expand Down Expand Up @@ -322,12 +332,31 @@ impl Commands {
state = self.state_machine.add(state, CharacterSet::from_char('='));

let mut char_set = CharacterSet::any();
char_set.remove(&[' ', '\n']);
char_set.remove(&[' ', '\n', '"']);
state = self.state_machine.add(state, char_set);
self.state_machine.add_next_state(state, state);
self.state_machine.start_parse(state, name);
self.state_machine.end_parse(state);

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('"'));

let mut char_set = CharacterSet::any();
char_set.remove(&['"']);
state = self.state_machine.add(state, char_set);
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
}
}
Expand Down