Add #rgb and #rrggbb color parsing.

Only functional colors are missing now: (rgb|hsl)a?

Author: SimonSapin

color.rs

@@ -14,18 +14,67 @@ pub enum Color {
 
 
 // Return None on invalid/unsupported value (not a color)
-pub fn parse_color(component_value: ComponentValue) -> Option<Color> {
-    match component_value {
-        Ident(value) => {
-            let lower_value = to_ascii_lower(value);
-            match COLOR_KEYWORDS.bsearch_elem(&lower_value.as_slice()) {
-                Some(index) => Some(COLOR_VALUES[index]),
-                None => {
-                    if "currentcolor" == lower_value { Some(CurrentColor) }
-                    else { None }
-                }
+pub fn parse_color(component_value: &ComponentValue) -> Option<Color> {
+    match *component_value {
+        Hash(ref value) | IDHash(ref value) => parse_hash_color(*value),
+        Ident(ref value) => parse_keyword_color(*value),
+        Function(ref name, ref arguments) => parse_function_color(*name, *arguments),
+        _ => None
+    }
+}
+
+
+#[inline]
+fn parse_keyword_color(value: &str) -> Option<Color> {
+    let lower_value = to_ascii_lower(value);
+    match COLOR_KEYWORDS.bsearch_elem(&lower_value.as_slice()) {
+        Some(index) => Some(COLOR_VALUES[index]),
+        None => if "currentcolor" == lower_value { Some(CurrentColor) }
+                else { None }
+    }
+}
+
+
+#[inline]
+fn parse_hash_color(value: &str) -> Option<Color> {
+    macro_rules! from_hex(
+        ($c: expr) => {{
+            let c = $c;
+            match c as char {
+                '0' .. '9' => c - ('0' as u8),
+                'a' .. 'f' => c - ('a' as u8) + 10,
+                'A' .. 'F' => c - ('A' as u8) + 10,
+                _ => return None  // Not a valid color
             }
-        }
+        }};
+    )
+    macro_rules! to_rgba(
+        ($r: expr, $g: expr, $b: expr,) => {
+            Some(RGBA($r as ColorFloat / 255., $g as ColorFloat / 255.,
+                      $b as ColorFloat / 255., 1.))
+        };
+    )
+
+    match value.len() {
+        6 => to_rgba!(
+            from_hex!(value[0]) * 16 + from_hex!(value[1]),
+            from_hex!(value[2]) * 16 + from_hex!(value[3]),
+            from_hex!(value[4]) * 16 + from_hex!(value[5]),
+        ),
+        3 => to_rgba!(
+            from_hex!(value[0]) * 17,
+            from_hex!(value[1]) * 17,
+            from_hex!(value[2]) * 17,
+        ),
         _ => None
     }
 }
+
+
+#[inline]
+fn parse_function_color(name: &str, arguments: &[(ComponentValue, SourceLocation)])
+                        -> Option<Color> {
+    let _lower_name = to_ascii_lower(name);
+    let _iter = arguments.iter();
+    None  // TODO
+}

make_color_data.py

@@ -1,4 +1,4 @@
-ALL_COLORS = sorted([
+COLORS = sorted([
     ('transparent', (0, 0, 0, 0)),
 
     ('black', (0, 0, 0, 1)),
@@ -171,14 +171,11 @@
 // This file is generated by make_color_data.py
 // This is to make sure that COLOR_KEYWORDS is sorted, to allow binary search.
 
-use super::{Color, RGBA, ColorFloat};
+use super::{Color, RGBA};
 
 macro_rules! RGBA(
     ($r:expr, $g:expr, $b:expr, $a:expr) => {
-        RGBA(($r as ColorFloat) / (255 as ColorFloat),
-             ($g as ColorFloat) / (255 as ColorFloat),
-             ($b as ColorFloat) / (255 as ColorFloat),
-             ($a as ColorFloat))
+        RGBA($r / 255., $g / 255., $b / 255., $a)
     };
 )
 
@@ -190,6 +187,6 @@
 %s
 ];
 ''' % (
-    '\n'.join('    "%s",' % name for name, _ in ALL_COLORS),
-    '\n'.join('    RGBA!(%s, %s, %s, %s),' % rgba for _, rgba in ALL_COLORS),
+    '\n'.join('    "%s",' % keyword for keyword, _ in COLORS),
+    '\n'.join('    RGBA!(%s., %s., %s., %s.),' % rgba for _, rgba in COLORS),
 ))

tests.rs

@@ -20,8 +20,22 @@ fn write_whole_file(path: &Path, data: &str) {
 }
 
 
+fn almost_equals(a: &json::Json, b: &json::Json) -> bool {
+    match (a, b) {
+        (&json::Number(a), &json::Number(b)) => (a - b).abs() < 1e-10,
+        (&json::String(ref a), &json::String(ref b)) => a == b,
+        (&json::Boolean(a), &json::Boolean(b)) => a == b,
+        (&json::List(ref a), &json::List(ref b))
+            => a.iter().zip(b.iter()).all(|(ref a, ref b)| almost_equals(*a, *b)),
+        (&json::Object(_), &json::Object(_)) => fail!(~"Not implemented"),
+        (&json::Null, &json::Null) => true,
+        _ => false,
+    }
+}
+
+
 fn assert_json_eq(results: json::Json, expected: json::Json, message: ~str) {
-    if results != expected {
+    if !almost_equals(&results, &expected) {
         let temp = tempfile::mkdtemp(&os::tmpdir(), "rust-cssparser-tests").get();
         let temp_ = copy temp;
         let results = json::to_pretty_str(&results) + "\n";
@@ -138,17 +152,17 @@ fn one_rule() {
 fn run_color_tests(json_data: &str, to_json: &fn(result: Option<Color>) -> json::Json) {
     do run_json_tests(json_data) |input| {
         match parse_one_component_value(&mut ComponentValueIterator::from_str(input)) {
-            Ok((component_value, _location)) => to_json(parse_color(component_value)),
+            Ok((component_value, _location)) => to_json(parse_color(&component_value)),
             Err(_reason) => json::Null,
         }
     }
 }
 
 
-//#[test]
-//fn color3() {
-//    run_color_tests(include_str!("css-parsing-tests/color3.json"), |c| c.to_json())
-//}
+#[test]
+fn color3() {
+    run_color_tests(include_str!("css-parsing-tests/color3.json"), |c| c.to_json())
+}
 
 
 //#[test]
@@ -157,12 +171,12 @@ fn run_color_tests(json_data: &str, to_json: &fn(result: Option<Color>) -> json:
 //}
 
 
+/// color3_keywords.json is different: R, G and B are in 0..255 rather than 0..1
 #[test]
 fn color3_keywords() {
     do run_color_tests(include_str!("css-parsing-tests/color3_keywords.json")) |c| {
-        let m = 255 as ColorFloat;
         match c {
-            Some(RGBA(r, g, b, a)) => (~[r * m, g * m, b * m, a]).to_json(),
+            Some(RGBA(r, g, b, a)) => (~[r * 255., g * 255., b * 255., a]).to_json(),
             Some(CurrentColor) => json::String(~"currentColor"),
             None => json::Null,
         }