Implement built-in native modules as an alternative to intrinsics

Issue #1981

2 files changed, 6 insertions, 1 deletions

diff --git a/src/rustc/syntax/ast.rs b/src/rustc/syntax/ast.rs
index 93f60519114..0776ec3dfbd 100644
--- a/src/rustc/syntax/ast.rs
+++ b/src/rustc/syntax/ast.rs
@@ -557,6 +557,7 @@ type _mod = {view_items: [@view_item], items: [@item]};
 #[auto_serialize]
 enum native_abi {
     native_abi_rust_intrinsic,
+    native_abi_rust_builtin,
     native_abi_cdecl,
     native_abi_stdcall,
 }
@@ -702,7 +703,8 @@ enum native_item_ {
 #[auto_serialize]
 enum inlined_item {
     ii_item(@item),
-    ii_method(def_id /* impl id */, @method)
+    ii_method(def_id /* impl id */, @method),
+    ii_native(@native_item),
 }
 
 //
diff --git a/src/rustc/syntax/ast_util.rs b/src/rustc/syntax/ast_util.rs
index 0fbc723ed8d..57dbfacbfbb 100644
--- a/src/rustc/syntax/ast_util.rs
+++ b/src/rustc/syntax/ast_util.rs
@@ -454,6 +454,7 @@ impl inlined_item_methods for inlined_item {
     fn ident() -> ident {
         alt self {
           ii_item(i) { i.ident }
+          ii_native(i) { i.ident }
           ii_method(_, m) { m.ident }
         }
     }
@@ -461,6 +462,7 @@ impl inlined_item_methods for inlined_item {
     fn id() -> ast::node_id {
         alt self {
           ii_item(i) { i.id }
+          ii_native(i) { i.id }
           ii_method(_, m) { m.id }
         }
     }
@@ -468,6 +470,7 @@ impl inlined_item_methods for inlined_item {
     fn accept<E>(e: E, v: visit::vt<E>) {
         alt self {
           ii_item(i) { v.visit_item(i, e, v) }
+          ii_native(i) { v.visit_native_item(i, e, v) }
           ii_method(_, m) { visit::visit_method_helper(m, e, v) }
         }
     }