OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fmt: simplify parse_flags

This commit is contained in:
Andrew Paseltiner 2013-01-07 14:39:45 -05:00
parent 51b141e3e4
commit f4bc9e6d57
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/libcore/extfmt.rs
View File

@ -243,31 +243,24 @@ pub mod ct {
}
pub fn parse_flags(s: &str, i: uint, lim: uint) ->
Parsed<~[Flag]> {
let noflags: ~[Flag] = ~[];
if i >= lim { return Parsed::new(move noflags, i); }
let mut i = i;
let mut flags = ~[];
fn more(f: Flag, s: &str, i: uint, lim: uint) ->
Parsed<~[Flag]> {
let next = parse_flags(s, i + 1u, lim);
let rest = copy next.val;
let j = next.next;
let curr: ~[Flag] = ~[f];
return Parsed::new(vec::append(move curr, rest), j);
while i < lim {
let f = match s[i] {
'-' as u8 => FlagLeftJustify,
'0' as u8 => FlagLeftZeroPad,
' ' as u8 => FlagSpaceForSign,
'+' as u8 => FlagSignAlways,
'#' as u8 => FlagAlternate,
_ => break
};
flags.push(f);
i += 1;
}
// Unfortunate, but because s is borrowed, can't use a closure
// fn more(f: Flag, s: &str) { more_(f, s, i, lim); }
let f = s[i];
return if f == '-' as u8 {
more(FlagLeftJustify, s, i, lim)
} else if f == '0' as u8 {
more(FlagLeftZeroPad, s, i, lim)
} else if f == ' ' as u8 {
more(FlagSpaceForSign, s, i, lim)
} else if f == '+' as u8 {
more(FlagSignAlways, s, i, lim)
} else if f == '#' as u8 {
more(FlagAlternate, s, i, lim)
} else { Parsed::new(move noflags, i) };
Parsed::new(flags, i)
}
pub fn parse_count(s: &str, i: uint, lim: uint)
-> Parsed<Count> {