nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-01 15:01:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve bracket display

Browse Source
This commit is contained in:
Oliver Schneider 2016-03-23 12:49:16 +01:00
parent 93d097eb12
commit 57faa5a9f5
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/booleans.rs
View File

@ -81,7 +81,7 @@ impl<'tcx> Hir2Qmm<'tcx> {
} }
fn suggest(cx: &LateContext, suggestion: &Bool, terminals: &[&Expr]) -> String { fn suggest(cx: &LateContext, suggestion: &Bool, terminals: &[&Expr]) -> String {
fn recurse(cx: &LateContext, suggestion: &Bool, terminals: &[&Expr], mut s: String) -> String { fn recurse(brackets: bool, cx: &LateContext, suggestion: &Bool, terminals: &[&Expr], mut s: String) -> String {
use quine_mc_cluskey::Bool::*; use quine_mc_cluskey::Bool::*;
match *suggestion { match *suggestion {
True => { True => {
@ -94,21 +94,33 @@ fn suggest(cx: &LateContext, suggestion: &Bool, terminals: &[&Expr]) -> String {
}, },
Not(ref inner) => { Not(ref inner) => {
s.push('!'); s.push('!');
recurse(cx, inner, terminals, s) recurse(true, cx, inner, terminals, s)
}, },
And(ref v) => { And(ref v) => {
s = recurse(cx, &v[0], terminals, s); if brackets {
s.push('(');
}
s = recurse(true, cx, &v[0], terminals, s);
for inner in &v[1..] { for inner in &v[1..] {
s.extend(" && ".chars()); s.extend(" && ".chars());
s = recurse(cx, inner, terminals, s); s = recurse(true, cx, inner, terminals, s);
}
if brackets {
s.push(')');
} }
s s
}, },
Or(ref v) => { Or(ref v) => {
s = recurse(cx, &v[0], terminals, s); if brackets {
s.push('(');
}
s = recurse(true, cx, &v[0], terminals, s);
for inner in &v[1..] { for inner in &v[1..] {
s.extend(" || ".chars()); s.extend(" || ".chars());
s = recurse(cx, inner, terminals, s); s = recurse(true, cx, inner, terminals, s);
}
if brackets {
s.push(')');
} }
s s
}, },
@ -118,7 +130,7 @@ fn suggest(cx: &LateContext, suggestion: &Bool, terminals: &[&Expr]) -> String {
} }
} }
} }
recurse(cx, suggestion, terminals, String::new()) recurse(false, cx, suggestion, terminals, String::new())
} }
impl<'a, 'tcx> NonminimalBoolVisitor<'a, 'tcx> { impl<'a, 'tcx> NonminimalBoolVisitor<'a, 'tcx> {