---

yaml
---
r: 35263
b: refs/heads/master
c: 61cfec3
h: refs/heads/master
i:
  35261: 09a0869
  35259: 0367dcb
  35255: 3b63ff5
  35247: 24b8558
  35231: c082bee
  35199: e5801a3
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: d2d6d955f45682399bce2a270e1ffaf2908fe0b0
+refs/heads/master: 61cfec3c52d3ac316b627c4b20c9c6e81e7521f2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024

trunk/src/librustc/front/config.rs

@@ -75,6 +75,7 @@ fn fold_foreign_mod(cx: ctxt, nm: ast::foreign_mod,
                                               |a| filter_view_item(cx, *a));
     return {
         sort: nm.sort,
+        abi: nm.abi,
         view_items: vec::map(filtered_view_items, |x| fld.fold_view_item(*x)),
         items: filtered_items
     };

trunk/src/libsyntax/ast.rs

@@ -1861,6 +1861,7 @@ impl foreign_abi : cmp::Eq {
 #[auto_deserialize]
 type foreign_mod =
     {sort: foreign_mod_sort,
+     abi: ident,
      view_items: ~[@view_item],
      items: ~[@foreign_item]};
 

trunk/src/libsyntax/fold.rs

@@ -546,8 +546,9 @@ fn noop_fold_mod(m: _mod, fld: ast_fold) -> _mod {
 
 fn noop_fold_foreign_mod(nm: foreign_mod, fld: ast_fold) -> foreign_mod {
     return {sort: nm.sort,
-         view_items: vec::map(nm.view_items, |x| fld.fold_view_item(*x)),
-         items: vec::map(nm.items, |x| fld.fold_foreign_item(*x))}
+            abi: nm.abi,
+            view_items: vec::map(nm.view_items, |x| fld.fold_view_item(*x)),
+            items: vec::map(nm.items, |x| fld.fold_foreign_item(*x))}
 }
 
 fn noop_fold_variant(v: variant_, fld: ast_fold) -> variant_ {

trunk/src/libsyntax/parse/parser.rs

@@ -3043,8 +3043,9 @@ impl Parser {
     }
 
     fn parse_foreign_mod_items(sort: ast::foreign_mod_sort,
-                               +first_item_attrs: ~[attribute]) ->
-        foreign_mod {
+                               +abi: ast::ident,
+                               +first_item_attrs: ~[attribute])
+                            -> foreign_mod {
         // Shouldn't be any view items since we've already parsed an item attr
         let {attrs_remaining, view_items, items: _, foreign_items} =
             self.parse_items_and_view_items(first_item_attrs,
@@ -3058,8 +3059,12 @@ impl Parser {
             initial_attrs = ~[];
             items.push(self.parse_foreign_item(attrs));
         }
-        return {sort: sort, view_items: view_items,
-            items: items};
+        return {
+            sort: sort,
+            abi: move abi,
+            view_items: view_items,
+            items: items
+        };
     }
 
     fn parse_item_foreign_mod(lo: BytePos,
@@ -3068,6 +3073,18 @@ impl Parser {
                               items_allowed: bool)
                            -> item_or_view_item {
 
+        // Parse the ABI.
+        let abi_opt;
+        match self.token {
+            token::LIT_STR(copy found_abi) => {
+                self.bump();
+                abi_opt = Some(found_abi);
+            }
+            _ => {
+                abi_opt = None;
+            }
+        }
+
         let mut must_be_named_mod = false;
         if self.is_keyword(~"mod") {
             must_be_named_mod = true;
@@ -3096,16 +3113,33 @@ impl Parser {
 
         // extern mod { ... }
         if items_allowed && self.eat(token::LBRACE) {
+            let abi;
+            match move abi_opt {
+                Some(move found_abi) => abi = move found_abi,
+                None => abi = special_idents::c_abi,
+            }
+
             let extra_attrs = self.parse_inner_attrs_and_next();
-            let m = self.parse_foreign_mod_items(sort, extra_attrs.next);
+            let m = self.parse_foreign_mod_items(sort,
+                                                 move abi,
+                                                 extra_attrs.next);
             self.expect(token::RBRACE);
+
             return iovi_item(self.mk_item(lo, self.last_span.hi, ident,
                                           item_foreign_mod(m), visibility,
                                           maybe_append(attrs,
                                                        Some(extra_attrs.
                                                             inner))));
         }
 
+        match abi_opt {
+            None => {}  // OK.
+            Some(_) => {
+                self.span_err(copy self.span, ~"an ABI may not be specified \
+                                                here");
+            }
+        }
+
         // extern mod foo;
         let metadata = self.parse_optional_meta();
         self.expect(token::SEMI);

trunk/src/libsyntax/parse/token.rs

@@ -322,6 +322,7 @@ mod special_idents {
     const intrinsic : ident = ident { repr: 32u };
     const clownshoes_foreign_mod: ident = ident { repr: 33 };
     const unnamed_field: ident = ident { repr: 34 };
+    const c_abi: ident = ident { repr: 35 };
 }
 
 struct ident_interner {
@@ -368,7 +369,8 @@ fn mk_ident_interner() -> @ident_interner {
                     @~"str", @~"TyVisitor", @~"arg", @~"descrim",
                     @~"__rust_abi", @~"__rust_stack_shim", @~"TyDesc",
                     @~"dtor", @~"main", @~"<opaque>", @~"blk", @~"static",
-                    @~"intrinsic", @~"__foreign_mod__"
+                    @~"intrinsic", @~"__foreign_mod__", @~"__field__",
+                    @~"C"
                 ];
 
                 let rv = @ident_interner {

trunk/src/libsyntax/print/pprust.rs

@@ -485,6 +485,7 @@ fn print_item(s: ps, &&item: @ast::item) {
       }
       ast::item_foreign_mod(nmod) => {
         head(s, visibility_qualified(item.vis, ~"extern"));
+        print_string(s, *s.intr.get(nmod.abi));
         match nmod.sort {
             ast::named => {
                 word_nbsp(s, ~"mod");

trunk/src/test/run-pass/extern-mod-abi.rs

@@ -0,0 +1,6 @@
+extern "C" {
+    fn pow(x: f64, y: f64) -> f64;
+}
+
+fn main() {}
+