From c59a0ec774bbbd2cf6ad9e6154ffc93ff3ffde3f Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Sun, 15 Jan 2012 14:56:58 -0800 Subject: [PATCH] rustdoc: Move parse module to its own file --- src/rustdoc/parse.rs | 21 +++++++++++++++++++++ src/rustdoc/rustdoc.rc | 2 ++ src/rustdoc/rustdoc.rs | 24 ------------------------ 3 files changed, 23 insertions(+), 24 deletions(-) create mode 100644 src/rustdoc/parse.rs diff --git a/src/rustdoc/parse.rs b/src/rustdoc/parse.rs new file mode 100644 index 00000000000..2969c423b73 --- /dev/null +++ b/src/rustdoc/parse.rs @@ -0,0 +1,21 @@ +export from_file, from_str; + +fn new_parse_sess() -> parser::parse_sess { + let cm = codemap::new_codemap(); + let sess = @{ + cm: cm, + mutable next_id: 0, + diagnostic: diagnostic::mk_handler(cm, none) + }; + ret sess; +} + +fn from_file(file: str) -> @ast::crate { + parser::parse_crate_from_source_file( + file, [], new_parse_sess()) +} + +fn from_str(source: str) -> @ast::crate { + parser::parse_crate_from_source_str( + "-", source, [], new_parse_sess()) +} diff --git a/src/rustdoc/rustdoc.rc b/src/rustdoc/rustdoc.rc index f6e8be863c5..668edbe6e33 100644 --- a/src/rustdoc/rustdoc.rc +++ b/src/rustdoc/rustdoc.rc @@ -6,3 +6,5 @@ #[desc = "The Rust documentation generator"]; #[license = "MIT"]; #[crate_type = "bin"]; + +mod parse; \ No newline at end of file diff --git a/src/rustdoc/rustdoc.rs b/src/rustdoc/rustdoc.rs index c71b3493e25..154d4ff2e4c 100755 --- a/src/rustdoc/rustdoc.rs +++ b/src/rustdoc/rustdoc.rs @@ -177,30 +177,6 @@ fn doc_header(rd: rustdoc, name: str) { rd.w.write_line("# Crate " + name); } -mod parse { - export from_file, from_str; - - fn new_parse_sess() -> parser::parse_sess { - let cm = codemap::new_codemap(); - let sess = @{ - cm: cm, - mutable next_id: 0, - diagnostic: diagnostic::mk_handler(cm, none) - }; - ret sess; - } - - fn from_file(file: str) -> @ast::crate { - parser::parse_crate_from_source_file( - file, [], new_parse_sess()) - } - - fn from_str(source: str) -> @ast::crate { - parser::parse_crate_from_source_str( - "-", source, [], new_parse_sess()) - } -} - #[doc( brief = "Main function.", desc = "Command-line arguments: