Flatten the exported API

Author: SimonSapin

cssparser.rc

@@ -7,10 +7,15 @@
 
 extern mod extra;
 
-pub mod tokenizer;
-pub mod parser;
-pub mod ast;
-pub mod color;
+pub use ast::*;
+pub use tokenizer::*;
+pub use parser::*;
+pub use color::*;
+
+mod ast;
+mod tokenizer;
+mod parser;
+mod color;
 
 #[cfg(test)]
 mod tests;

parser.rs

@@ -23,7 +23,7 @@ use ast::*;
 /// Parse top-level of a CSS stylesheet.
 /// Return a Iterator<Result<Rule, ErrorReason>>
 #[inline]
-pub fn parse_stylesheet<T: Iterator<Node>>(iter: T) -> StylesheetParser<T> {
+pub fn parse_stylesheet_rules<T: Iterator<Node>>(iter: T) -> StylesheetParser<T> {
     StylesheetParser(iter)
 }
 

tests.rs

@@ -6,10 +6,7 @@ use std::{io, os, str, run, task};
 use extra::{tempfile, json};
 use extra::json::ToJson;
 
-use ast::*;
-use tokenizer::tokenize;
-use parser::*;
-use color::*;
+use super::*;
 
 
 fn write_whole_file(path: &Path, data: &str) {
@@ -119,7 +116,7 @@ fn rule_list() {
 #[test]
 fn stylesheet() {
     do run_json_tests(include_str!("css-parsing-tests/stylesheet.json")) |input| {
-        parse_stylesheet(tokenize(input)).to_owned_vec()
+        parse_stylesheet_rules(tokenize(input)).to_owned_vec()
     }
 }
 

tokenizer.rs

@@ -47,11 +47,11 @@ fn test_preprocess() {
 
 
 struct Parser {
-    input: ~str,
-    length: uint,  // All counted in bytes, not characters
-    position: uint,  // All counted in bytes, not characters
-    line: uint,
-    last_line_start: uint,  // All counted in bytes, not characters
+    priv input: ~str,
+    priv length: uint,  // All counted in bytes, not characters
+    priv position: uint,  // All counted in bytes, not characters
+    priv line: uint,
+    priv last_line_start: uint,  // All counted in bytes, not characters
 }