Capitalized css style types, removed redundant pretty-printing.

3 files changed, 27 insertions, 28 deletions

diff --git a/src/servo/parser/css_builder.rs b/src/servo/parser/css_builder.rs
index aa8e2ebe493..ffead37313e 100644
--- a/src/servo/parser/css_builder.rs
+++ b/src/servo/parser/css_builder.rs
@@ -3,7 +3,8 @@
 // TODO: fail according to the css spec instead of failing when things
 // are not as expected
 
-import dom::style::*;
+import dom::style;
+import style::{DisInline, DisBlock, DisNone, Display, TextColor, BackgroundColor, FontSize};
 import parser::css_lexer::{Token, StartDescription, EndDescription,
                            Descendant, Child, Sibling,
                            Comma, Element, Attr, Description,
@@ -28,12 +29,12 @@ impl methods for TokenReader {
     }
 }
 
-fn parse_element(reader : TokenReader) -> option<~selector> {
+fn parse_element(reader : TokenReader) -> option<~style::Selector> {
     // Get the current element type
     let elmt_name = alt reader.get() {
       Element(tag)  { copy tag }
-      Eof        { ret none; }
-      _             { fail "Expected an element" }
+      Eof  { ret none; }
+      _  { fail "Expected an element" }
     };
 
     let mut attr_list = [];
@@ -55,10 +56,10 @@ fn parse_element(reader : TokenReader) -> option<~selector> {
         }
     }
         
-    ret some(~element(elmt_name, attr_list));
+    ret some(~style::Element(elmt_name, attr_list));
 }
 
-fn parse_rule(reader : TokenReader) -> option<~rule> {
+fn parse_rule(reader : TokenReader) -> option<~style::Rule> {
     let mut sel_list = [];
     let mut desc_list = [];
 
@@ -79,7 +80,7 @@ fn parse_rule(reader : TokenReader) -> option<~rule> {
                   some(elmt)   { 
                     let built_sel <- cur_sel;
                     let new_sel = copy elmt;
-                    cur_sel <- ~descendant(built_sel, new_sel)
+                    cur_sel <- ~style::Descendant(built_sel, new_sel)
                   }
                   none         { ret none; }
                 }
@@ -89,7 +90,7 @@ fn parse_rule(reader : TokenReader) -> option<~rule> {
                   some(elmt)   { 
                     let built_sel <- cur_sel;
                     let new_sel = copy elmt;
-                    cur_sel <- ~child(built_sel, new_sel)
+                    cur_sel <- ~style::Child(built_sel, new_sel)
                   }
                   none         { ret none; }
                 }
@@ -99,7 +100,7 @@ fn parse_rule(reader : TokenReader) -> option<~rule> {
                   some(elmt)   { 
                     let built_sel <- cur_sel;
                     let new_sel = copy elmt;
-                    cur_sel <- ~sibling(built_sel, new_sel)
+                    cur_sel <- ~style::Sibling(built_sel, new_sel)
                   }
                   none         { ret none; }
                 }
@@ -145,24 +146,24 @@ fn parse_rule(reader : TokenReader) -> option<~rule> {
                 let num = val.substr(0u, val.len() - 2u);
                 
                 alt uint::from_str(num) {
-                  some(n)    { desc_list += [font_size(n)]; }
+                  some(n)    { desc_list += [FontSize(n)]; }
                   none       { fail "Nonnumber provided as font size"; }
                 }
               }
               "display" {
                 alt val {
-                  "inline"   { desc_list += [display(di_inline)]; }
-                  "block"    { desc_list += [display(di_block)]; }
-                  "none"     { desc_list += [display(di_none)]; }
+                  "inline"   { desc_list += [Display(DisInline)]; }
+                  "block"    { desc_list += [Display(DisBlock)]; }
+                  "none"     { desc_list += [Display(DisNone)]; }
                   _          { #debug["Recieved unknown display value '%s'",
                                       val]; }
                 }
               }
               "color" {
-                desc_list += [text_color(parse_color(val))];
+                desc_list += [TextColor(parse_color(val))];
               }
               "background-color" {
-                desc_list += [background_color(parse_color(val))];
+                desc_list += [BackgroundColor(parse_color(val))];
               }
               _          { #debug["Recieved unknown style property '%s'",
                                   val]; }
@@ -179,7 +180,7 @@ fn parse_rule(reader : TokenReader) -> option<~rule> {
     ret some(~(sel_list, desc_list));
 }
 
-fn build_stylesheet(stream : port<Token>) -> [~rule] {
+fn build_stylesheet(stream : port<Token>) -> [~style::Rule] {
     let mut rule_list = [];
     let reader = {stream : stream, mut lookahead : none};
 
diff --git a/src/servo/parser/css_lexer.rs b/src/servo/parser/css_lexer.rs
index 3f56300e4b2..4f41ce202b5 100644
--- a/src/servo/parser/css_lexer.rs
+++ b/src/servo/parser/css_lexer.rs
@@ -25,7 +25,7 @@ enum Token {
     Sibling,
     Comma,
     Element(str),
-    Attr(style::attr), 
+    Attr(style::Attr), 
     Description(str, str),
     Eof
 }
@@ -105,10 +105,8 @@ impl css_methods for CssLexer {
         }
         
         alt ch {
-          '.' as u8 { ret Attr(
-              style::includes("class", self.input_state.parse_ident())); }
-          '#' as u8 { ret Attr(
-              style::includes("id", self.input_state.parse_ident())); }
+          '.' as u8 { ret Attr(style::Includes("class", self.input_state.parse_ident())); }
+          '#' as u8 { ret Attr(style::Includes("id", self.input_state.parse_ident())); }
           '[' as u8 {
             let attr_name = self.input_state.parse_ident();
             
@@ -118,21 +116,21 @@ impl css_methods for CssLexer {
             }
 
             if ch == ']' as u8 {
-                ret Attr(style::exists(attr_name));
+                ret Attr(style::Exists(attr_name));
             } else if ch == '=' as u8 {
                 let attr_val = self.input_state.parse_ident();
                 self.input_state.expect(']' as u8);
-                ret Attr(style::exact(attr_name, attr_val));
+                ret Attr(style::Exact(attr_name, attr_val));
             } else if ch == '~' as u8 {
                 self.input_state.expect('=' as u8);
                 let attr_val = self.input_state.parse_ident();
                 self.input_state.expect(']' as u8);
-                ret Attr(style::includes(attr_name, attr_val));
+                ret Attr(style::Includes(attr_name, attr_val));
             } else if ch == '|' as u8 {
                 self.input_state.expect('=' as u8);
                 let attr_val = self.input_state.parse_ident();
                 self.input_state.expect(']' as u8);
-                ret Attr(style::starts_with(attr_name, attr_val));
+                ret Attr(style::StartsWith(attr_name, attr_val));
             }
             
             fail #fmt("Unexpected symbol %c in attribute", ch as char);
diff --git a/src/servo/parser/html_builder.rs b/src/servo/parser/html_builder.rs
index 661ea650f01..e984a63c2a4 100644
--- a/src/servo/parser/html_builder.rs
+++ b/src/servo/parser/html_builder.rs
@@ -9,7 +9,7 @@ import gfx::geometry;
 import gfx::geometry::au;
 import parser = parser::html_lexer;
 import parser::Token;
-import dom::style::stylesheet;
+import dom::style::Stylesheet;
 
 import dvec::extensions;
 
@@ -86,7 +86,7 @@ spawned, collates them, and sends them to the given result channel.
 * `from_parent` - A port on which to receive new links.
 
 "]
-fn css_link_listener(to_parent : chan<stylesheet>, from_parent : port<css_message>) {
+fn css_link_listener(to_parent : chan<Stylesheet>, from_parent : port<css_message>) {
     let mut result_vec = [];
 
     loop {
@@ -121,7 +121,7 @@ fn css_link_listener(to_parent : chan<stylesheet>, from_parent : port<css_messag
 }
 
 #[warn(no_non_implicitly_copyable_typarams)]
-fn build_dom(scope: NodeScope, stream: port<Token>) -> (Node, port<stylesheet>) {
+fn build_dom(scope: NodeScope, stream: port<Token>) -> (Node, port<Stylesheet>) {
     // The current reference node.
     let mut cur_node = scope.new_node(Element(ElementData("html", ~HTMLDivElement)));
     // We will spawn a separate task to parse any css that is