patrick/foliage-rs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor renaming

Browse Source
This commit is contained in:
Patrick Lühne 2020-04-28 02:36:38 +02:00
parent a12acae633
commit 451b887019
Signed by: patrick
GPG Key ID: 05F3611E97A70ABF
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/parse/formulas.rs
View File

@ -352,18 +352,18 @@ impl std::fmt::Debug for Quantifier
} }
// TODO: refactor // TODO: refactor
fn implication_left_to_right_inner<'i, T>(mut logical_connective_iterator: T, level: usize) fn implication_left_to_right_inner<'i, T>(mut argument_iterator: T, level: usize)
-> Result<Option<crate::Formula>, crate::parse::Error> -> Result<Option<crate::Formula>, crate::parse::Error>
where where
T: std::iter::Iterator<Item = Result<&'i str, crate::parse::Error>> T: std::iter::Iterator<Item = Result<&'i str, crate::parse::Error>>
{ {
match logical_connective_iterator.next() match argument_iterator.next()
{ {
Some(argument) => Some(argument) =>
{ {
// TODO: improve error handling if antecedent cannot be parsed // TODO: improve error handling if antecedent cannot be parsed
let argument = FormulaStr::new(argument?).parse(level)?; let argument = FormulaStr::new(argument?).parse(level)?;
match implication_left_to_right_inner(logical_connective_iterator, level)? match implication_left_to_right_inner(argument_iterator, level)?
{ {
Some(next_argument) => Ok(Some(crate::Formula::implies( Some(next_argument) => Ok(Some(crate::Formula::implies(
crate::ImplicationDirection::LeftToRight, Box::new(argument), crate::ImplicationDirection::LeftToRight, Box::new(argument),
@ -375,18 +375,18 @@ where
} }
} }
fn implication_left_to_right<'i, T>(mut logical_connective_iterator: T, level: usize) fn implication_left_to_right<'i, T>(mut argument_iterator: T, level: usize)
-> Result<crate::Formula, crate::parse::Error> -> Result<crate::Formula, crate::parse::Error>
where where
T: std::iter::Iterator<Item = Result<&'i str, crate::parse::Error>> T: std::iter::Iterator<Item = Result<&'i str, crate::parse::Error>>
{ {
match logical_connective_iterator.next() match argument_iterator.next()
{ {
Some(argument) => Some(argument) =>
{ {
// TODO: improve error handling if antecedent cannot be parsed // TODO: improve error handling if antecedent cannot be parsed
let argument = FormulaStr::new(argument?).parse(level)?; let argument = FormulaStr::new(argument?).parse(level)?;
match implication_left_to_right_inner(logical_connective_iterator, level)? match implication_left_to_right_inner(argument_iterator, level)?
{ {
Some(next_argument) => Ok(crate::Formula::implies( Some(next_argument) => Ok(crate::Formula::implies(
crate::ImplicationDirection::LeftToRight, Box::new(argument), crate::ImplicationDirection::LeftToRight, Box::new(argument),