M-Labs/ionpak-thermostat
7
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

command_parser: unnest the grammar definition

Browse Source
This commit is contained in:
Astro 2019-09-13 01:10:31 +02:00
parent 3fd1b2265d
commit f2dcb8b08d
1 changed files with 28 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
firmware/src/command_parser.rs
View File

@ -84,8 +84,8 @@ impl Command {
$block
}
)*
Token::End => Err(Error::UnexpectedEnd),
_ => Err(Error::UnexpectedToken(lexer.token))
Token::End => return Err(Error::UnexpectedEnd),
_ => return Err(Error::UnexpectedToken(lexer.token))
}
};
}
@ -94,7 +94,7 @@ impl Command {
($result: expr) => {
match lexer.token {
Token::End => Ok($result),
_ => Err(Error::UnexpectedToken(lexer.token)),
_ => return Err(Error::UnexpectedToken(lexer.token)),
}
};
}
@ -111,42 +111,31 @@ impl Command {
],
End => Ok(Command::Report(ReportMode::Once)),
],
Channel => choice![
Channel => {
let channel = choice![
Number => {
let channel = CHANNEL_IDS.iter()
.position(|id| *id == lexer.slice());
match channel {
Some(channel) => {
CHANNEL_IDS.iter()
.position(|id| *id == lexer.slice())
.ok_or(Error::NoSuchChannel)
},
]? as u8;
choice![
Enable => Ok(Command::Channel(
channel as u8,
ChannelCommand::Enable
)),
Disable => Ok(Command::Channel(
channel as u8,
ChannelCommand::Enable
)),
Setup => choice![
Enable =>
Ok(Command::Channel(channel, ChannelCommand::Enable)),
Disable =>
Ok(Command::Channel(channel, ChannelCommand::Enable)),
Setup => {
let setup = choice![
Number => {
let setup = SETUP_IDS.iter()
.position(|id| *id == lexer.slice());
match setup {
Some(setup) =>
end!(Command::Channel(
channel as u8,
ChannelCommand::Setup(setup as u8)
)),
None =>
Err(Error::NoSuchSetup)
}
SETUP_IDS.iter()
.position(|id| *id == lexer.slice())
.ok_or(Error::NoSuchSetup)
},
]? as u8;
end!(Command::Channel(channel, ChannelCommand::Setup(setup)))
},
],
]
}
None => Err(Error::NoSuchChannel)
}
},
],
]
}
}