rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "Encode meta tags in the crate and start sketching enhanced logic for resolving crate "use" directives." due to tree bustage

Browse Source 
This reverts commit ab3635eebe.
This commit is contained in:
Patrick Walton
2011-06-09 18:15:13 -07:00
parent 60706f1e35
commit 40e3a9fcbc
6 changed files with 35 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/comp/front/parser.rs
View File

@@ -1992,26 +1992,20 @@ fn parse_native_mod_items(&parser p, &str native_name,
items=items);
}
fn default_native_lib_naming(session::session sess)
-> rec(str prefix, str suffix) {
fn default_native_name(session::session sess, str id) -> str {
alt (sess.get_targ_cfg().os) {
case (session::os_win32) {
ret rec(prefix="", suffix=".dll");
ret id + ".dll";
}
case (session::os_macos) {
ret rec(prefix="lib", suffix=".dylib");
ret "lib" + id + ".dylib";
}
case (session::os_linux) {
ret rec(prefix="lib", suffix=".so");
ret "lib" + id + ".so";
}
}
}
fn default_native_name(session::session sess, str id) -> str {
auto n = default_native_lib_naming(sess);
ret n.prefix + id + n.suffix;
}
fn parse_item_native_mod(&parser p) -> @ast::item {
auto lo = p.get_last_lo_pos();
auto abi = ast::native_abi_cdecl;
@@ -2200,7 +2194,7 @@ fn parse_meta_item(&parser p) -> @ast::meta_item {
case (token::LIT_STR(?s)) {
auto hi = p.get_hi_pos();
p.bump();
ret @spanned(lo, hi, rec(key = ident,
ret @spanned(lo, hi, rec(name = ident,
value = p.get_str(s)));
}
case (_) {