mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Move parse_integer and parse_unsigned_integer from util::str to style::attr
This commit is contained in:
parent
f0d4c03bd9
commit
43d527fcc8
3 changed files with 49 additions and 49 deletions
|
@ -5,12 +5,13 @@
|
|||
use app_units::Au;
|
||||
use cssparser::{self, Color, RGBA};
|
||||
use euclid::num::Zero;
|
||||
use num::ToPrimitive;
|
||||
use std::ascii::AsciiExt;
|
||||
use std::ops::Deref;
|
||||
use string_cache::{Atom, Namespace};
|
||||
use url::Url;
|
||||
use util::str::{DOMString, LengthOrPercentageOrAuto, WHITESPACE, parse_unsigned_integer, parse_length};
|
||||
use util::str::{split_html_space_chars, str_join, parse_integer};
|
||||
use util::str::{DOMString, LengthOrPercentageOrAuto, HTML_SPACE_CHARACTERS, WHITESPACE};
|
||||
use util::str::{parse_length, read_numbers, split_html_space_chars, str_join};
|
||||
use values::specified::{Length};
|
||||
|
||||
// Duplicated from script::dom::values.
|
||||
|
@ -29,6 +30,48 @@ pub enum AttrValue {
|
|||
Url(DOMString, Option<Url>),
|
||||
}
|
||||
|
||||
/// Shared implementation to parse an integer according to
|
||||
/// <https://html.spec.whatwg.org/multipage/#rules-for-parsing-integers> or
|
||||
/// <https://html.spec.whatwg.org/multipage/#rules-for-parsing-non-negative-integers>
|
||||
fn do_parse_integer<T: Iterator<Item=char>>(input: T) -> Option<i64> {
|
||||
let mut input = input.skip_while(|c| {
|
||||
HTML_SPACE_CHARACTERS.iter().any(|s| s == c)
|
||||
}).peekable();
|
||||
|
||||
let sign = match input.peek() {
|
||||
None => return None,
|
||||
Some(&'-') => {
|
||||
input.next();
|
||||
-1
|
||||
},
|
||||
Some(&'+') => {
|
||||
input.next();
|
||||
1
|
||||
},
|
||||
Some(_) => 1,
|
||||
};
|
||||
|
||||
let value = read_numbers(input);
|
||||
|
||||
value.and_then(|value| value.checked_mul(sign))
|
||||
}
|
||||
|
||||
/// Parse an integer according to
|
||||
/// <https://html.spec.whatwg.org/multipage/#rules-for-parsing-integers>.
|
||||
pub fn parse_integer<T: Iterator<Item=char>>(input: T) -> Option<i32> {
|
||||
do_parse_integer(input).and_then(|result| {
|
||||
result.to_i32()
|
||||
})
|
||||
}
|
||||
|
||||
/// Parse an integer according to
|
||||
/// <https://html.spec.whatwg.org/multipage/#rules-for-parsing-non-negative-integers>
|
||||
pub fn parse_unsigned_integer<T: Iterator<Item=char>>(input: T) -> Option<u32> {
|
||||
do_parse_integer(input).and_then(|result| {
|
||||
result.to_u32()
|
||||
})
|
||||
}
|
||||
|
||||
impl AttrValue {
|
||||
pub fn from_serialized_tokenlist(tokens: DOMString) -> AttrValue {
|
||||
let atoms =
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue