---

yaml
---
r: 6288
b: refs/heads/master
c: 88f29aa
h: refs/heads/master
v: v3

Author: lht

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a9b66db631478b7f42cdbfae52f96d5e7bb0a1f
+refs/heads/master: 88f29aab27bf56bda4cf7062cb53af0be4b5c251

trunk/src/comp/front/config.rs

@@ -45,8 +45,7 @@ fn fold_native_mod(cfg: ast::crate_cfg, nm: ast::native_mod,
                    fld: fold::ast_fold) -> ast::native_mod {
     let filter = bind filter_native_item(cfg, _);
     let filtered_items = vec::filter_map(filter, nm.items);
-    ret {native_name: nm.native_name,
-         abi: nm.abi,
+    ret {abi: nm.abi,
          view_items: vec::map(fld.fold_view_item, nm.view_items),
          items: filtered_items};
 }

trunk/src/comp/lib/llvm.rs

@@ -110,7 +110,9 @@ const LLVMRealULE: uint = 13u;
 const LLVMRealUNE: uint = 14u;
 
 #[link_args = "-Lrustllvm"]
-native "cdecl" mod llvm = "rustllvm" {
+#[link_name = "rustllvm"]
+#[abi = "cdecl"]
+native mod llvm {
 
     type ModuleRef;
     type ContextRef;

trunk/src/comp/metadata/creader.rs

@@ -54,7 +54,12 @@ fn visit_item(e: env, i: @ast::item) {
             ret;
         }
         let cstore = e.sess.get_cstore();
-        if !cstore::add_used_library(cstore, m.native_name) { ret; }
+        let native_name = i.ident;
+        alt attr::get_meta_item_value_str_by_name(i.attrs, "link_name") {
+          some(nn) { native_name = nn; }
+          none. { }
+        }
+        if !cstore::add_used_library(cstore, native_name) { ret; }
         for a: ast::attribute in
             attr::find_attrs_by_name(i.attrs, "link_args") {
 

trunk/src/comp/syntax/ast.rs

@@ -432,7 +432,7 @@ tag native_abi {
 }
 
 type native_mod =
-    {native_name: str,
+    {// FIXME: Removing abi from AST. Depends on Issue #1179.
      abi: native_abi,
      view_items: [@view_item],
      items: [@native_item]};

trunk/src/comp/syntax/fold.rs

@@ -452,8 +452,7 @@ fn noop_fold_mod(m: _mod, fld: ast_fold) -> _mod {
 }
 
 fn noop_fold_native_mod(nm: native_mod, fld: ast_fold) -> native_mod {
-    ret {native_name: nm.native_name,
-         abi: nm.abi,
+    ret {abi: nm.abi,
          view_items: vec::map(fld.fold_view_item, nm.view_items),
          items: vec::map(fld.fold_native_item, nm.items)}
 }

trunk/src/comp/syntax/parse/parser.rs

@@ -1978,7 +1978,7 @@ fn parse_native_item(p: parser, attrs: [ast::attribute]) ->
     } else { unexpected(p, p.peek()); }
 }
 
-fn parse_native_mod_items(p: parser, native_name: str, abi: ast::native_abi,
+fn parse_native_mod_items(p: parser, abi: ast::native_abi,
                           first_item_attrs: [ast::attribute]) ->
    ast::native_mod {
     // Shouldn't be any view items since we've already parsed an item attr
@@ -1993,63 +1993,37 @@ fn parse_native_mod_items(p: parser, native_name: str, abi: ast::native_abi,
         initial_attrs = [];
         items += [parse_native_item(p, attrs)];
     }
-    ret {native_name: native_name,
-         abi: abi,
+    ret {abi: abi,
          view_items: view_items,
          items: items};
 }
 
 fn parse_item_native_mod(p: parser, attrs: [ast::attribute]) -> @ast::item {
     let lo = p.get_last_lo_pos();
-    let abi = ast::native_abi_cdecl;
-    if !is_word(p, "mod") {
-        let t = parse_str(p);
-        if str::eq(t, "rust-intrinsic") {
-            abi = ast::native_abi_rust_intrinsic;
-        } else if str::eq(t, "cdecl") {
-            abi = ast::native_abi_cdecl;
-        } else if str::eq(t, "stdcall") {
-            abi = ast::native_abi_stdcall;
-        } else {
-            p.fatal("unsupported abi: " + t);
-        }
-    } else {
-        abi =
-            alt attr::get_meta_item_value_str_by_name(attrs, "abi") {
-              none. { ast::native_abi_cdecl }
-              some("rust-intrinsic") {
-                ast::native_abi_rust_intrinsic
-              }
-              some("cdecl") {
-                ast::native_abi_cdecl
-              }
-              some("stdcall") {
-                ast::native_abi_stdcall
-              }
-              some(t) {
-                p.fatal("unsupported abi: " + t);
-              }
-            };
-    }
     expect_word(p, "mod");
     let id = parse_ident(p);
-    let native_name;
-    if p.peek() == token::EQ {
-        expect(p, token::EQ);
-        native_name = parse_str(p);
-    } else {
-        native_name =
-            alt attr::get_meta_item_value_str_by_name(attrs, "link_name") {
-              none. { id }
-              some(nn) { nn }
-            };
-    }
     expect(p, token::LBRACE);
     let more_attrs = parse_inner_attrs_and_next(p);
     let inner_attrs = more_attrs.inner;
     let first_item_outer_attrs = more_attrs.next;
-    let m =
-        parse_native_mod_items(p, native_name, abi, first_item_outer_attrs);
+    let abi =
+        alt attr::get_meta_item_value_str_by_name(
+                attrs + inner_attrs, "abi") {
+          none. { ast::native_abi_cdecl }
+          some("rust-intrinsic") {
+            ast::native_abi_rust_intrinsic
+          }
+          some("cdecl") {
+            ast::native_abi_cdecl
+          }
+          some("stdcall") {
+            ast::native_abi_stdcall
+          }
+          some(t) {
+            p.fatal("unsupported abi: " + t);
+          }
+        };
+    let m = parse_native_mod_items(p, abi, first_item_outer_attrs);
     let hi = p.get_hi_pos();
     expect(p, token::RBRACE);
     ret mk_item(p, lo, hi, id, ast::item_native_mod(m), attrs + inner_attrs);

trunk/src/comp/syntax/print/pprust.rs

@@ -395,24 +395,8 @@ fn print_item(s: ps, &&item: @ast::item) {
       }
       ast::item_native_mod(nmod) {
         head(s, "native");
-        alt nmod.abi {
-          ast::native_abi_rust_intrinsic. {
-            word_nbsp(s, "\"rust-intrinsic\"");
-          }
-          ast::native_abi_cdecl. {
-            word_nbsp(s, "\"cdecl\"");
-          }
-          ast::native_abi_stdcall. {
-            word_nbsp(s, "\"stdcall\"");
-          }
-        }
         word_nbsp(s, "mod");
         word_nbsp(s, item.ident);
-        if !str::eq(nmod.native_name, item.ident) {
-            word_space(s, "=");
-            print_string(s, nmod.native_name);
-            nbsp(s);
-        }
         bopen(s);
         print_native_mod(s, nmod, item.attrs);
         bclose(s, item.span);

trunk/src/lib/comm.rs

@@ -34,7 +34,8 @@ export recv;
 export chan;
 export port;
 
-native "cdecl" mod rustrt {
+#[abi = "cdecl"]
+native mod rustrt {
     type void;
     type rust_port;
 
@@ -48,7 +49,8 @@ native "cdecl" mod rustrt {
     fn rust_port_size(po: *rust_port) -> ctypes::size_t;
 }
 
-native "rust-intrinsic" mod rusti {
+#[abi = "rust-intrinsic"]
+native mod rusti {
     fn recv<uniq T>(port: *rustrt::rust_port) -> T;
 }
 

trunk/src/lib/dbg.rs

@@ -8,7 +8,8 @@
  * logging.
  */
 
-native "cdecl" mod rustrt {
+#[abi = "cdecl"]
+native mod rustrt {
     fn debug_tydesc(td: *sys::type_desc);
     fn debug_opaque<T>(td: *sys::type_desc, x: T);
     fn debug_box<T>(td: *sys::type_desc, x: @T);

trunk/src/lib/fs.rs

@@ -7,7 +7,8 @@ File system manipulation
 import os::getcwd;
 import os_fs;
 
-native "cdecl" mod rustrt {
+#[abi = "cdecl"]
+native mod rustrt {
     fn rust_file_is_dir(path: str::sbuf) -> int;
 }
 

trunk/src/lib/io.rs

@@ -1,5 +1,6 @@
 
-native "cdecl" mod rustrt {
+#[abi = "cdecl"]
+native mod rustrt {
     fn rust_get_stdin() -> os::libc::FILE;
     fn rust_get_stdout() -> os::libc::FILE;
     fn rust_get_stderr() -> os::libc::FILE;

trunk/src/lib/linux_os.rs

@@ -6,7 +6,9 @@ TODO: Restructure and document
 
 // FIXME Somehow merge stuff duplicated here and macosx_os.rs. Made difficult
 // by https://github.com/graydon/rust/issues#issue/268
-native "cdecl" mod libc = "" {
+#[link_name = ""]
+#[abi = "cdecl"]
+native mod libc {
     fn read(fd: int, buf: *u8, count: uint) -> int;
     fn write(fd: int, buf: *u8, count: uint) -> int;
     fn fread(buf: *u8, size: uint, n: uint, f: libc::FILE) -> uint;
@@ -81,7 +83,8 @@ fn waitpid(pid: int) -> int {
     ret status;
 }
 
-native "cdecl" mod rustrt {
+#[abi = "cdecl"]
+native mod rustrt {
     fn rust_getcwd() -> str;
 }
 

trunk/src/lib/macos_os.rs

@@ -1,5 +1,7 @@
 
-native "cdecl" mod libc = "" {
+#[link_name = ""]
+#[abi = "cdecl"]
+native mod libc {
     fn read(fd: int, buf: *u8, count: uint) -> int;
     fn write(fd: int, buf: *u8, count: uint) -> int;
     fn fread(buf: *u8, size: uint, n: uint, f: libc::FILE) -> uint;
@@ -74,7 +76,8 @@ fn waitpid(pid: int) -> int {
     ret status;
 }
 
-native "cdecl" mod rustrt {
+#[abi = "cdecl"]
+native mod rustrt {
     fn rust_getcwd() -> str;
 }
 

trunk/src/lib/math.rs

@@ -1,6 +1,8 @@
 /* Module: math */
 
-native "cdecl" mod libc = "" {
+#[link_name = ""]
+#[abi = "cdecl"]
+native mod libc {
     fn sqrt(n: float) -> float;
     fn sin(n: float) -> float;
     fn asin(n: float) -> float;

trunk/src/lib/posix_fs.rs

@@ -1,4 +1,5 @@
-native "cdecl" mod rustrt {
+#[abi = "cdecl"]
+native mod rustrt {
     fn rust_list_files(path: str) -> [str];
 }
 

trunk/src/lib/ptr.rs

@@ -3,7 +3,8 @@ Module: ptr
 
 Unsafe pointer utility functions
 */
-native "rust-intrinsic" mod rusti {
+#[abi = "rust-intrinsic"]
+native mod rusti {
     fn addr_of<T>(val: T) -> *T;
     fn ptr_offset<T>(ptr: *T, count: uint) -> *T;
 }

trunk/src/lib/rand.rs

@@ -3,7 +3,8 @@ Module: rand
 
 Random number generation
 */
-native "cdecl" mod rustrt {
+#[abi = "cdecl"]
+native mod rustrt {
     type rctx;
     fn rand_new() -> rctx;
     fn rand_next(c: rctx) -> u32;

trunk/src/lib/run_program.rs

@@ -12,7 +12,8 @@ export program_output;
 export spawn_process;
 export waitpid;
 
-native "cdecl" mod rustrt {
+#[abi = "cdecl"]
+native mod rustrt {
     fn rust_run_program(argv: *sbuf, in_fd: int, out_fd: int, err_fd: int) ->
        int;
 }

trunk/src/lib/str.rs

@@ -16,7 +16,8 @@ export eq, lteq, hash, is_empty, is_not_empty, is_whitespace, byte_len,
        contains, iter_chars, loop_chars, loop_chars_sub,
        escape;
 
-native "cdecl" mod rustrt {
+#[abi = "cdecl"]
+native mod rustrt {
     fn rust_str_push(&s: str, ch: u8);
 }
 

trunk/src/lib/sys.rs

@@ -7,7 +7,8 @@ tag type_desc {
     type_desc(@type_desc);
 }
 
-native "cdecl" mod rustrt {
+#[abi = "cdecl"]
+native mod rustrt {
     // Explicitly re-export native stuff we want to be made
     // available outside this crate. Otherwise it's
     // visible-in-crate, but not re-exported.
@@ -19,7 +20,8 @@ native "cdecl" mod rustrt {
     fn unsupervise();
 }
 
-native "rust-intrinsic" mod rusti {
+#[abi = "rust-intrinsic"]
+native mod rusti {
     fn get_type_desc<T>() -> *type_desc;
 }
 

trunk/src/lib/task.rs

@@ -50,12 +50,15 @@ export spawn;
 export spawn_notify;
 export spawn_joinable;
 
-native "rust-intrinsic" mod rusti {
+#[abi = "rust-intrinsic"]
+native mod rusti {
     // these must run on the Rust stack so that they can swap stacks etc:
     fn task_sleep(time_in_us: uint);
 }
 
-native "cdecl" mod rustrt = "rustrt" {
+#[link_name = "rustrt"]
+#[abi = "cdecl"]
+native mod rustrt {
     // these can run on the C stack:
     fn pin_task();
     fn unpin_task();

trunk/src/lib/test.rs

@@ -25,7 +25,8 @@ export default_test_to_task;
 export configure_test_task;
 export joinable;
 
-native "cdecl" mod rustrt {
+#[abi = "cdecl"]
+native mod rustrt {
     fn sched_threads() -> uint;
 }
 

trunk/src/lib/time.rs

@@ -4,7 +4,8 @@ Module: time
 
 // FIXME: Document what these functions do
 
-native "cdecl" mod rustrt {
+#[abi = "cdecl"]
+native mod rustrt {
     fn get_time(&sec: u32, &usec: u32);
     fn nano_time(&ns: u64);
 }

trunk/src/lib/unicode.rs

@@ -148,7 +148,9 @@ mod icu {
     // FIXME: should be -1, change when compiler supports negative
     // constants
 
-    native "cdecl" mod libicu = "icuuc" {
+    #[link_name = "icuuc"]
+    #[abi = "cdecl"]
+    native mod libicu {
         fn u_hasBinaryProperty(c: UChar32, which: UProperty) -> UBool;
     }
 }