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

fmt: simplify parse_parameter

This commit is contained in:
Andrew Paseltiner 2013-01-07 14:47:06 -05:00
parent 4550cb0562
commit af298deff7
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libcore/extfmt.rs
View File

@ -229,17 +229,11 @@ pub mod ct {
pub fn parse_parameter(s: &str, i: uint, lim: uint) -> pub fn parse_parameter(s: &str, i: uint, lim: uint) ->
Parsed<Option<uint>> { Parsed<Option<uint>> {
if i >= lim { return Parsed::new(None, i); } if i >= lim { return Parsed::new(None, i); }
let num = peek_num(s, i, lim); match peek_num(s, i, lim) {
return match num { Some(num) if num.next < lim && s[num.next] == '$' as u8 =>
None => Parsed::new(None, i), Parsed::new(Some(num.val), num.next + 1),
Some(t) => { _ => Parsed::new(None, i)
let n = t.val;
let j = t.next;
if j < lim && s[j] == '$' as u8 {
Parsed::new(Some(n), j + 1)
} else { Parsed::new(None, i) }
} }
};
} }
pub fn parse_flags(s: &str, i: uint, lim: uint) -> pub fn parse_flags(s: &str, i: uint, lim: uint) ->
Parsed<~[Flag]> { Parsed<~[Flag]> {