From 106c9faa59c1a605d7e0d67da5b45d24863ec009 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Thu, 29 Mar 2012 13:48:05 -0700 Subject: [PATCH] rustc: Move ext to librustsyntax --- .../ext/auto_serialize.rs | 9 ++++++++- .../syntax => librustsyntax}/ext/base.rs | 4 ++-- .../syntax => librustsyntax}/ext/build.rs | 2 +- .../ext/concat_idents.rs | 1 - src/{rustc/syntax => librustsyntax}/ext/env.rs | 0 .../syntax => librustsyntax}/ext/expand.rs | 17 ++++++----------- src/{rustc/syntax => librustsyntax}/ext/fmt.rs | 2 +- .../ext/ident_to_str.rs | 1 - .../syntax => librustsyntax}/ext/log_syntax.rs | 1 - .../syntax => librustsyntax}/ext/qquote.rs | 18 +++++++++--------- .../syntax => librustsyntax}/ext/simplext.rs | 0 src/librustsyntax/rustsyntax.rc | 17 ++++++++++++++++- src/rustc/rustc.rc | 18 +----------------- src/rustc/syntax.rs | 1 + 14 files changed, 45 insertions(+), 46 deletions(-) rename src/{rustc/syntax => librustsyntax}/ext/auto_serialize.rs (99%) rename src/{rustc/syntax => librustsyntax}/ext/base.rs (98%) rename src/{rustc/syntax => librustsyntax}/ext/build.rs (98%) rename src/{rustc/syntax => librustsyntax}/ext/concat_idents.rs (97%) rename src/{rustc/syntax => librustsyntax}/ext/env.rs (100%) rename src/{rustc/syntax => librustsyntax}/ext/expand.rs (93%) rename src/{rustc/syntax => librustsyntax}/ext/fmt.rs (99%) rename src/{rustc/syntax => librustsyntax}/ext/ident_to_str.rs (97%) rename src/{rustc/syntax => librustsyntax}/ext/log_syntax.rs (95%) rename src/{rustc/syntax => librustsyntax}/ext/qquote.rs (97%) rename src/{rustc/syntax => librustsyntax}/ext/simplext.rs (100%) diff --git a/src/rustc/syntax/ext/auto_serialize.rs b/src/librustsyntax/ext/auto_serialize.rs similarity index 99% rename from src/rustc/syntax/ext/auto_serialize.rs rename to src/librustsyntax/ext/auto_serialize.rs index 678f745a155..bc11f23d892 100644 --- a/src/rustc/syntax/ext/auto_serialize.rs +++ b/src/librustsyntax/ext/auto_serialize.rs @@ -73,10 +73,17 @@ import base::*; import codemap::span; import std::map; import std::map::hashmap; -import syntax::attr; export expand; +// Transitional reexports so qquote can find the paths it is looking for +mod syntax { + import ext; + export ext; + import parse; + export parse; +} + type ser_tps_map = map::hashmap [@ast::stmt]>; type deser_tps_map = map::hashmap @ast::expr>; diff --git a/src/rustc/syntax/ext/base.rs b/src/librustsyntax/ext/base.rs similarity index 98% rename from src/rustc/syntax/ext/base.rs rename to src/librustsyntax/ext/base.rs index a0d4a2d288f..bd1f9ccd17b 100644 --- a/src/rustc/syntax/ext/base.rs +++ b/src/librustsyntax/ext/base.rs @@ -1,6 +1,6 @@ import std::map::hashmap; -import syntax::parse::parser; -import driver::diagnostic::span_handler; +import parse::parser; +import diagnostic::span_handler; import codemap::{codemap, span, expn_info, expanded_from}; import std::map::str_hash; diff --git a/src/rustc/syntax/ext/build.rs b/src/librustsyntax/ext/build.rs similarity index 98% rename from src/rustc/syntax/ext/build.rs rename to src/librustsyntax/ext/build.rs index 99dd6410d12..238cf40a685 100644 --- a/src/rustc/syntax/ext/build.rs +++ b/src/librustsyntax/ext/build.rs @@ -1,5 +1,5 @@ import codemap::span; -import syntax::ext::base::ext_ctxt; +import base::ext_ctxt; // NOTE: Moved from fmt.rs which had this fixme: // FIXME: Cleanup the naming of these functions diff --git a/src/rustc/syntax/ext/concat_idents.rs b/src/librustsyntax/ext/concat_idents.rs similarity index 97% rename from src/rustc/syntax/ext/concat_idents.rs rename to src/librustsyntax/ext/concat_idents.rs index f461458c21a..f7bc95bd181 100644 --- a/src/rustc/syntax/ext/concat_idents.rs +++ b/src/librustsyntax/ext/concat_idents.rs @@ -1,5 +1,4 @@ import base::*; -import syntax::ast; fn expand_syntax_ext(cx: ext_ctxt, sp: codemap::span, arg: ast::mac_arg, _body: ast::mac_body) -> @ast::expr { diff --git a/src/rustc/syntax/ext/env.rs b/src/librustsyntax/ext/env.rs similarity index 100% rename from src/rustc/syntax/ext/env.rs rename to src/librustsyntax/ext/env.rs diff --git a/src/rustc/syntax/ext/expand.rs b/src/librustsyntax/ext/expand.rs similarity index 93% rename from src/rustc/syntax/ext/expand.rs rename to src/librustsyntax/ext/expand.rs index 56241486501..cfda606c30e 100644 --- a/src/rustc/syntax/ext/expand.rs +++ b/src/librustsyntax/ext/expand.rs @@ -1,16 +1,11 @@ -import driver::session; -import driver::session::session; - import std::map::hashmap; -import syntax::attr; - -import syntax::ast::{crate, expr_, expr_mac, mac_invoc}; -import syntax::fold::*; -import syntax::ext::base::*; -import syntax::ext::qquote::{qq_helper}; -import syntax::parse::parser; -import syntax::parse::parser::parse_expr_from_source_str; +import ast::{crate, expr_, expr_mac, mac_invoc}; +import fold::*; +import ext::base::*; +import ext::qquote::{qq_helper}; +import parse::parser; +import parse::parser::parse_expr_from_source_str; import codemap::{span, expanded_from}; diff --git a/src/rustc/syntax/ext/fmt.rs b/src/librustsyntax/ext/fmt.rs similarity index 99% rename from src/rustc/syntax/ext/fmt.rs rename to src/librustsyntax/ext/fmt.rs index cd30efbbfb8..24657f8634b 100644 --- a/src/rustc/syntax/ext/fmt.rs +++ b/src/librustsyntax/ext/fmt.rs @@ -8,7 +8,7 @@ import extfmt::ct::*; import base::*; import codemap::span; -import syntax::ext::build::*; +import ext::build::*; export expand_syntax_ext; fn expand_syntax_ext(cx: ext_ctxt, sp: span, arg: ast::mac_arg, diff --git a/src/rustc/syntax/ext/ident_to_str.rs b/src/librustsyntax/ext/ident_to_str.rs similarity index 97% rename from src/rustc/syntax/ext/ident_to_str.rs rename to src/librustsyntax/ext/ident_to_str.rs index 2bb6dac7f2a..cb7c604a489 100644 --- a/src/rustc/syntax/ext/ident_to_str.rs +++ b/src/librustsyntax/ext/ident_to_str.rs @@ -1,5 +1,4 @@ import base::*; -import syntax::ast; fn expand_syntax_ext(cx: ext_ctxt, sp: codemap::span, arg: ast::mac_arg, _body: ast::mac_body) -> @ast::expr { diff --git a/src/rustc/syntax/ext/log_syntax.rs b/src/librustsyntax/ext/log_syntax.rs similarity index 95% rename from src/rustc/syntax/ext/log_syntax.rs rename to src/librustsyntax/ext/log_syntax.rs index 23364adb744..4ae212047f3 100644 --- a/src/rustc/syntax/ext/log_syntax.rs +++ b/src/librustsyntax/ext/log_syntax.rs @@ -1,5 +1,4 @@ import base::*; -import syntax::ast; import io::writer_util; fn expand_syntax_ext(cx: ext_ctxt, sp: codemap::span, arg: ast::mac_arg, diff --git a/src/rustc/syntax/ext/qquote.rs b/src/librustsyntax/ext/qquote.rs similarity index 97% rename from src/rustc/syntax/ext/qquote.rs rename to src/librustsyntax/ext/qquote.rs index 50d70ffa8d0..a8294f9bae0 100644 --- a/src/rustc/syntax/ext/qquote.rs +++ b/src/librustsyntax/ext/qquote.rs @@ -1,13 +1,13 @@ -import syntax::ast::{crate, expr_, mac_invoc, +import ast::{crate, expr_, mac_invoc, mac_aq, mac_var}; -import syntax::fold::*; -import syntax::visit::*; -import syntax::ext::base::*; -import syntax::ext::build::*; -import syntax::parse::parser; -import syntax::parse::parser::{parser, parse_from_source_str}; +import fold::*; +import visit::*; +import ext::base::*; +import ext::build::*; +import parse::parser; +import parse::parser::{parser, parse_from_source_str}; -import syntax::print::*; +import print::*; import io::*; import codemap::span; @@ -127,7 +127,7 @@ fn visit_aq_ty(node: @ast::ty, &&cx: aq_ctxt, v: vt) { } fn is_space(c: char) -> bool { - syntax::parse::lexer::is_whitespace(c) + parse::lexer::is_whitespace(c) } fn expand_ast(ecx: ext_ctxt, _sp: span, diff --git a/src/rustc/syntax/ext/simplext.rs b/src/librustsyntax/ext/simplext.rs similarity index 100% rename from src/rustc/syntax/ext/simplext.rs rename to src/librustsyntax/ext/simplext.rs diff --git a/src/librustsyntax/rustsyntax.rc b/src/librustsyntax/rustsyntax.rc index 1a321f91554..51b5ef1c32c 100644 --- a/src/librustsyntax/rustsyntax.rc +++ b/src/librustsyntax/rustsyntax.rc @@ -26,4 +26,19 @@ mod parse { mod print { mod pp; mod pprust; -} \ No newline at end of file +} + +mod ext { + mod base; + mod expand; + mod qquote; + mod build; + + mod fmt; + mod env; + mod simplext; + mod concat_idents; + mod ident_to_str; + mod log_syntax; + mod auto_serialize; +} diff --git a/src/rustc/rustc.rc b/src/rustc/rustc.rc index 837a28e5d00..5a19efb005b 100644 --- a/src/rustc/rustc.rc +++ b/src/rustc/rustc.rc @@ -68,23 +68,7 @@ mod middle { } } - -mod syntax { - mod ext { - mod base; - mod expand; - mod qquote; - mod build; - - mod fmt; - mod env; - mod simplext; - mod concat_idents; - mod ident_to_str; - mod log_syntax; - mod auto_serialize; - } -} +mod syntax; mod front { mod config; diff --git a/src/rustc/syntax.rs b/src/rustc/syntax.rs index 08a038df59f..0b149b2f582 100644 --- a/src/rustc/syntax.rs +++ b/src/rustc/syntax.rs @@ -26,4 +26,5 @@ export util; import rustsyntax::attr; export attr; +import rustsyntax::ext; export ext;