dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2229 from LaurentMazare/master 

Simplify the boolean expression suggestion function
This commit is contained in:
Oliver Schneider 2017-11-17 09:29:09 +01:00 committed by GitHub
parent 7ce3b74288 87f5b1f043
commit 2d005b58c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 52 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
clippy_lints/src/booleans.rs
View File

@ -159,6 +159,31 @@ impl<'a, 'tcx, 'v> Hir2Qmm<'a, 'tcx, 'v> {
}
}
fn simplify_not(expr: &Expr, cx: &LateContext) -> Option<String> {
let snip = |e: &Expr| snippet_opt(cx, e.span).expect("don't try to improve booleans created by macros");
match expr.node {
ExprBinary(binop, ref lhs, ref rhs) => {
match binop.node {
BiEq => Some(" != "),
BiNe => Some(" == "),
BiLt => Some(" >= "),
BiGt => Some(" <= "),
BiLe => Some(" > "),
BiGe => Some(" < "),
_ => None,
}.map(|op| format!("{}{}{}", &snip(lhs), op, &snip(rhs)))
},
ExprMethodCall(ref path, _, ref args) if args.len() == 1 => {
METHODS_WITH_NEGATION
.iter().cloned()
.flat_map(|(a, b)| vec![(a, b), (b, a)])
.find(|&(a, _)| a == path.name.as_str())
.map(|(_, neg_method)| format!("{}.{}()", &snip(&args[0]), neg_method))
},
_ => None,
}
}
// The boolean part of the return indicates whether some simplifications have been applied.
fn suggest(cx: &LateContext, suggestion: &Bool, terminals: &[&Expr]) -> (String, bool) {
fn recurse(
@ -166,68 +191,33 @@ fn suggest(cx: &LateContext, suggestion: &Bool, terminals: &[&Expr]) -> (String,
cx: &LateContext,
suggestion: &Bool,
terminals: &[&Expr],
mut s: String,
s: &mut String,
simplified: &mut bool,
) -> String {
) {
use quine_mc_cluskey::Bool::*;
let snip = |e: &Expr| snippet_opt(cx, e.span).expect("don't try to improve booleans created by macros");
match *suggestion {
True => {
s.push_str("true");
s
},
False => {
s.push_str("false");
s
},
Not(ref inner) => match **inner {
And(_) | Or(_) => {
s.push('!');
recurse(true, cx, inner, terminals, s, simplified)
},
Term(n) => match terminals[n as usize].node {
ExprBinary(binop, ref lhs, ref rhs) => {
let op = match binop.node {
BiEq => " != ",
BiNe => " == ",
BiLt => " >= ",
BiGt => " <= ",
BiLe => " > ",
BiGe => " < ",
_ => {
s.push('!');
return recurse(true, cx, inner, terminals, s, simplified);
},
};
Term(n) => {
if let Some(str) = simplify_not(terminals[n as usize], cx) {
*simplified = true;
s.push_str(&snip(lhs));
s.push_str(op);
s.push_str(&snip(rhs));
s
},
ExprMethodCall(ref path, _, ref args) if args.len() == 1 => {
let negation = METHODS_WITH_NEGATION
.iter().cloned()
.flat_map(|(a, b)| vec![(a, b), (b, a)])
.find(|&(a, _)| a == path.name.as_str());
if let Some((_, negation_method)) = negation {
*simplified = true;
s.push_str(&snip(&args[0]));
s.push('.');
s.push_str(negation_method);
s.push_str("()");
s
} else {
s.push('!');
recurse(false, cx, inner, terminals, s, simplified)
}
},
_ => {
s.push_str(&str)
} else {
s.push('!');
recurse(false, cx, inner, terminals, s, simplified)
},
}
},
_ => {
True | False | Not(_) => {
s.push('!');
recurse(false, cx, inner, terminals, s, simplified)
},
@ -236,56 +226,52 @@ fn suggest(cx: &LateContext, suggestion: &Bool, terminals: &[&Expr]) -> (String,
if brackets {
s.push('(');
}
if let Or(_) = v[0] {
s = recurse(true, cx, &v[0], terminals, s, simplified);
} else {
s = recurse(false, cx, &v[0], terminals, s, simplified);
}
for inner in &v[1..] {
s.push_str(" && ");
for (index, inner) in v.iter().enumerate() {
if index > 0 {
s.push_str(" && ");
}
if let Or(_) = *inner {
s = recurse(true, cx, inner, terminals, s, simplified);
recurse(true, cx, inner, terminals, s, simplified);
} else {
s = recurse(false, cx, inner, terminals, s, simplified);
recurse(false, cx, inner, terminals, s, simplified);
}
}
if brackets {
s.push(')');
}
s
},
Or(ref v) => {
if brackets {
s.push('(');
}
s = recurse(false, cx, &v[0], terminals, s, simplified);
for inner in &v[1..] {
s.push_str(" || ");
s = recurse(false, cx, inner, terminals, s, simplified);
for (index, inner) in v.iter().enumerate() {
if index > 0 {
s.push_str(" || ");
}
recurse(false, cx, inner, terminals, s, simplified);
}
if brackets {
s.push(')');
}
s
},
Term(n) => {
let brackets = brackets && match terminals[n as usize].node {
ExprBinary(..) => true,
_ => false,
};
if brackets {
if let ExprBinary(..) = terminals[n as usize].node {
s.push('(');
}
s.push('(');
}
s.push_str(&snip(terminals[n as usize]));
if brackets {
if let ExprBinary(..) = terminals[n as usize].node {
s.push(')');
}
s.push(')');
}
s
},
}
}
let mut simplified = false;
let s = recurse(false, cx, suggestion, terminals, String::new(), &mut simplified);
let mut s = String::new();
recurse(false, cx, suggestion, terminals, &mut s, &mut simplified);
(s, simplified)
}