Rename signed in numeric tokens to has_sign.

Author: SimonSapin

src/nth.rs

@@ -57,7 +57,7 @@ fn parse_b(input: &mut Parser, a: i32) -> Result<(i32, i32), ()> {
     match input.next() {
         Ok(Token::Delim('+')) => parse_signless_b(input, a, 1),
         Ok(Token::Delim('-')) => parse_signless_b(input, a, -1),
-        Ok(Token::Number(ref value)) if value.signed => {
+        Ok(Token::Number(ref value)) if value.has_sign => {
             Ok((a, try!(value.int_value.ok_or(())) as i32))
         }
         _ => {
@@ -69,7 +69,7 @@ fn parse_b(input: &mut Parser, a: i32) -> Result<(i32, i32), ()> {
 
 fn parse_signless_b(input: &mut Parser, a: i32, b_sign: i32) -> Result<(i32, i32), ()> {
     match try!(input.next()) {
-        Token::Number(ref value) if !value.signed => {
+        Token::Number(ref value) if !value.has_sign => {
             Ok((a, b_sign * (try!(value.int_value.ok_or(())) as i32)))
         }
         _ => Err(())

src/serializer.rs

@@ -49,7 +49,7 @@ pub trait ToCss {
 fn write_numeric<W>(value: NumericValue, dest: &mut W) -> text_writer::Result
 where W: TextWriter {
     // `value.value >= 0` is true for negative 0.
-    if value.signed && value.value.is_positive() {
+    if value.has_sign && value.value.is_positive() {
         try!(dest.write_str("+"));
     }
 
@@ -94,11 +94,11 @@ impl<'a> ToCss for Token<'a> {
             Token::Delim(value) => try!(dest.write_char(value)),
 
             Token::Number(value) => try!(write_numeric(value, dest)),
-            Token::Percentage(PercentageValue { unit_value, int_value, signed }) => {
+            Token::Percentage(PercentageValue { unit_value, int_value, has_sign }) => {
                 let value = NumericValue {
                     value: unit_value * 100.,
                     int_value: int_value,
-                    signed: signed,
+                    has_sign: has_sign,
                 };
                 try!(write_numeric(value, dest));
                 try!(dest.write_char('%'));

src/tests.rs

@@ -545,11 +545,11 @@ fn one_component_value_to_json(token: Token, input: &mut Parser) -> Json {
         Token::Delim(value) => value.to_string().to_json(),
 
         Token::Number(value) => Json::Array(vec!["number".to_json()] + numeric(value).as_slice()),
-        Token::Percentage(PercentageValue { unit_value, int_value, signed }) => Json::Array(
+        Token::Percentage(PercentageValue { unit_value, int_value, has_sign }) => Json::Array(
             vec!["percentage".to_json()] + numeric(NumericValue {
                 value: unit_value * 100.,
                 int_value: int_value,
-                signed: signed,
+                has_sign: has_sign,
             }).as_slice()),
         Token::Dimension(value, unit) => Json::Array(
             vec!["dimension".to_json()] + numeric(value).as_slice() + [unit.to_json()].as_slice()),

src/tokenizer.rs

@@ -170,7 +170,7 @@ pub struct NumericValue {
     /// Whether the number had a `+` or `-` sign.
     ///
     /// This is used is some cases like the <An+B> micro syntax. (See the `parse_nth` function.)
-    pub signed: bool,
+    pub has_sign: bool,
 }
 
 
@@ -184,7 +184,7 @@ pub struct PercentageValue {
     pub int_value: Option<i32>,
 
     /// Whether the number had a `+` or `-` sign.
-    pub signed: bool,
+    pub has_sign: bool,
 }
 
 
@@ -653,8 +653,8 @@ fn consume_numeric<'a>(tokenizer: &mut Tokenizer<'a>) -> Token<'a> {
     // But this is always called so that there is at least one digit in \d*(\.\d+)?
     let start_pos = tokenizer.position();
     let mut is_integer = true;
-    let signed = matches!(tokenizer.next_char(), '-' | '+');
-    if signed {
+    let has_sign = matches!(tokenizer.next_char(), '-' | '+');
+    if has_sign {
         tokenizer.advance(1);
     }
     consume_digits(tokenizer);
@@ -696,13 +696,13 @@ fn consume_numeric<'a>(tokenizer: &mut Tokenizer<'a>) -> Token<'a> {
         return Percentage(PercentageValue {
             unit_value: value / 100.,
             int_value: int_value,
-            signed: signed,
+            has_sign: has_sign,
         })
     }
     let value = NumericValue {
         value: value,
         int_value: int_value,
-        signed: signed,
+        has_sign: has_sign,
     };
     if is_ident_start(tokenizer) { Dimension(value, consume_name(tokenizer)) }
     else { Number(value) }