loot/loot-condition-interpreter
0
0
Fork 0
mirror of https://github.com/loot/loot-condition-interpreter.git synced 2026-07-27 14:16:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

Run rustfmt (Rust 1.31.1)

Browse Source
This commit is contained in:
Oliver Hamlet
2018-12-22 22:50:16 +00:00
parent 5e1ba5709b
commit 9ef82fe886
6 changed files with 128 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/function/parse.rs
+76 -74
View File
@@ -15,13 +15,14 @@ impl ComparisonOperator {
input,
operator:
alt!(
tag!("==") => { |_| ComparisonOperator::Equal } |
tag!("!=") => { |_| ComparisonOperator::NotEqual } |
tag!("<=") => { |_| ComparisonOperator::LessThanOrEqual } |
tag!(">=") => { |_| ComparisonOperator::GreaterThanOrEqual } |
tag!("<") => { |_| ComparisonOperator::LessThan } |
tag!(">") => { |_| ComparisonOperator::GreaterThan }
) >> (operator)
tag!("==") => { |_| ComparisonOperator::Equal } |
tag!("!=") => { |_| ComparisonOperator::NotEqual } |
tag!("<=") => { |_| ComparisonOperator::LessThanOrEqual } |
tag!(">=") => { |_| ComparisonOperator::GreaterThanOrEqual } |
tag!("<") => { |_| ComparisonOperator::LessThan } |
tag!(">") => { |_| ComparisonOperator::GreaterThan }
)
>> (operator)
)
}
}
@@ -180,74 +181,75 @@ impl Function {
input,
function:
alt!(
delimited!(
fix_error!(ParsingError, tag!("file(\"")),
call!(parse_non_regex_path),
fix_error!(ParsingError, tag!("\")"))
) => {
|path| Function::FilePath(path)
} |
delimited!(
fix_error!(ParsingError, tag!("file(\"")),
call!(parse_regex_path),
fix_error!(ParsingError, tag!("\""))
) => {
|(p, r)| Function::FileRegex(p, r)
} |
delimited!(
fix_error!(ParsingError, tag!("active(\"")),
call!(parse_non_regex_path),
fix_error!(ParsingError, tag!("\")"))
) => {
|path| Function::ActivePath(path)
} |
delimited!(
fix_error!(ParsingError, tag!("active(\"")),
flat_map!(fix_error!(ParsingError, is_not!(INVALID_REGEX_PATH_CHARS)), parse_regex),
fix_error!(ParsingError, tag!("\""))
) => {
|r| Function::ActiveRegex(r)
} |
delimited!(
fix_error!(ParsingError, tag!("many(\"")),
call!(parse_regex_path),
fix_error!(ParsingError, tag!("\""))
) => {
|(p, r)| Function::Many(p, r)
} |
delimited!(
fix_error!(ParsingError, tag!("many_active(\"")),
flat_map!(fix_error!(ParsingError, is_not!(INVALID_REGEX_PATH_CHARS)), parse_regex),
fix_error!(ParsingError, tag!("\""))
) => {
|r| Function::ManyActive(r)
} |
delimited!(
fix_error!(ParsingError, tag!("version(")),
call!(parse_version_args),
fix_error!(ParsingError, tag!(")"))
) => {
|(path, version, comparator)| {
Function::Version(path, version, comparator)
delimited!(
fix_error!(ParsingError, tag!("file(\"")),
call!(parse_non_regex_path),
fix_error!(ParsingError, tag!("\")"))
) => {
|path| Function::FilePath(path)
} |
delimited!(
fix_error!(ParsingError, tag!("file(\"")),
call!(parse_regex_path),
fix_error!(ParsingError, tag!("\""))
) => {
|(p, r)| Function::FileRegex(p, r)
} |
delimited!(
fix_error!(ParsingError, tag!("active(\"")),
call!(parse_non_regex_path),
fix_error!(ParsingError, tag!("\")"))
) => {
|path| Function::ActivePath(path)
} |
delimited!(
fix_error!(ParsingError, tag!("active(\"")),
flat_map!(fix_error!(ParsingError, is_not!(INVALID_REGEX_PATH_CHARS)), parse_regex),
fix_error!(ParsingError, tag!("\""))
) => {
|r| Function::ActiveRegex(r)
} |
delimited!(
fix_error!(ParsingError, tag!("many(\"")),
call!(parse_regex_path),
fix_error!(ParsingError, tag!("\""))
) => {
|(p, r)| Function::Many(p, r)
} |
delimited!(
fix_error!(ParsingError, tag!("many_active(\"")),
flat_map!(fix_error!(ParsingError, is_not!(INVALID_REGEX_PATH_CHARS)), parse_regex),
fix_error!(ParsingError, tag!("\""))
) => {
|r| Function::ManyActive(r)
} |
delimited!(
fix_error!(ParsingError, tag!("version(")),
call!(parse_version_args),
fix_error!(ParsingError, tag!(")"))
) => {
|(path, version, comparator)| {
Function::Version(path, version, comparator)
}
} |
delimited!(
fix_error!(ParsingError, tag!("product_version(")),
call!(parse_version_args),
fix_error!(ParsingError, tag!(")"))
) => {
|(path, version, comparator)| {
Function::ProductVersion(path, version, comparator)
}
} |
delimited!(
fix_error!(ParsingError, tag!("checksum(")),
call!(parse_checksum_args),
fix_error!(ParsingError, tag!(")"))
) => {
|(path, crc)| Function::Checksum(path, crc)
}
} |
delimited!(
fix_error!(ParsingError, tag!("product_version(")),
call!(parse_version_args),
fix_error!(ParsingError, tag!(")"))
) => {
|(path, version, comparator)| {
Function::ProductVersion(path, version, comparator)
}
} |
delimited!(
fix_error!(ParsingError, tag!("checksum(")),
call!(parse_checksum_args),
fix_error!(ParsingError, tag!(")"))
) => {
|(path, crc)| Function::Checksum(path, crc)
}
) >> (function)
)
>> (function)
)
}
}