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

Camel case core::intrinsic

Browse Source
This commit is contained in:
Brian Anderson
2012-09-02 15:19:52 -07:00
parent 80c4f74c29
commit 7fb1a4e2d1
4 changed files with 70 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/rustc/front/intrinsic.rs
View File

@@ -4,23 +4,22 @@
mod intrinsic {
import rusti::visit_tydesc;
export ty_visitor, get_tydesc, visit_tydesc, tydesc;
export TyVisitor, get_tydesc, visit_tydesc, TyDesc;
// FIXME (#2712): remove this when the interface has settled and the
// version in sys is no longer present.
fn get_tydesc<T>() -> *tydesc {
rusti::get_tydesc::<T>() as *tydesc
fn get_tydesc<T>() -> *TyDesc {
rusti::get_tydesc::<T>() as *TyDesc
}
#[allow(non_camel_case_types)]
enum tydesc = {
enum TyDesc = {
first_param: **u8,
size: uint,
align: uint
// Remaining fields not listed
};
trait ty_visitor {
trait TyVisitor {
fn visit_bot() -> bool;
fn visit_nil() -> bool;
fn visit_bool() -> bool;
@@ -49,36 +48,36 @@ mod intrinsic {
fn visit_estr_slice() -> bool;
fn visit_estr_fixed(n: uint, sz: uint, align: uint) -> bool;
fn visit_box(mtbl: uint, inner: *tydesc) -> bool;
fn visit_uniq(mtbl: uint, inner: *tydesc) -> bool;
fn visit_ptr(mtbl: uint, inner: *tydesc) -> bool;
fn visit_rptr(mtbl: uint, inner: *tydesc) -> bool;
fn visit_box(mtbl: uint, inner: *TyDesc) -> bool;
fn visit_uniq(mtbl: uint, inner: *TyDesc) -> bool;
fn visit_ptr(mtbl: uint, inner: *TyDesc) -> bool;
fn visit_rptr(mtbl: uint, inner: *TyDesc) -> bool;
fn visit_vec(mtbl: uint, inner: *tydesc) -> bool;
fn visit_unboxed_vec(mtbl: uint, inner: *tydesc) -> bool;
fn visit_evec_box(mtbl: uint, inner: *tydesc) -> bool;
fn visit_evec_uniq(mtbl: uint, inner: *tydesc) -> bool;
fn visit_evec_slice(mtbl: uint, inner: *tydesc) -> bool;
fn visit_vec(mtbl: uint, inner: *TyDesc) -> bool;
fn visit_unboxed_vec(mtbl: uint, inner: *TyDesc) -> bool;
fn visit_evec_box(mtbl: uint, inner: *TyDesc) -> bool;
fn visit_evec_uniq(mtbl: uint, inner: *TyDesc) -> bool;
fn visit_evec_slice(mtbl: uint, inner: *TyDesc) -> bool;
fn visit_evec_fixed(n: uint, sz: uint, align: uint,
mtbl: uint, inner: *tydesc) -> bool;
mtbl: uint, inner: *TyDesc) -> bool;
fn visit_enter_rec(n_fields: uint,
sz: uint, align: uint) -> bool;
fn visit_rec_field(i: uint, name: &str,
mtbl: uint, inner: *tydesc) -> bool;
mtbl: uint, inner: *TyDesc) -> bool;
fn visit_leave_rec(n_fields: uint,
sz: uint, align: uint) -> bool;
fn visit_enter_class(n_fields: uint,
sz: uint, align: uint) -> bool;
fn visit_class_field(i: uint, name: &str,
mtbl: uint, inner: *tydesc) -> bool;
mtbl: uint, inner: *TyDesc) -> bool;
fn visit_leave_class(n_fields: uint,
sz: uint, align: uint) -> bool;
fn visit_enter_tup(n_fields: uint,
sz: uint, align: uint) -> bool;
fn visit_tup_field(i: uint, inner: *tydesc) -> bool;
fn visit_tup_field(i: uint, inner: *TyDesc) -> bool;
fn visit_leave_tup(n_fields: uint,
sz: uint, align: uint) -> bool;
@@ -88,7 +87,7 @@ mod intrinsic {
disr_val: int,
n_fields: uint,
name: &str) -> bool;
fn visit_enum_variant_field(i: uint, inner: *tydesc) -> bool;
fn visit_enum_variant_field(i: uint, inner: *TyDesc) -> bool;
fn visit_leave_enum_variant(variant: uint,
disr_val: int,
n_fields: uint,
@@ -98,8 +97,8 @@ mod intrinsic {
fn visit_enter_fn(purity: uint, proto: uint,
n_inputs: uint, retstyle: uint) -> bool;
fn visit_fn_input(i: uint, mode: uint, inner: *tydesc) -> bool;
fn visit_fn_output(retstyle: uint, inner: *tydesc) -> bool;
fn visit_fn_input(i: uint, mode: uint, inner: *TyDesc) -> bool;
fn visit_fn_output(retstyle: uint, inner: *TyDesc) -> bool;
fn visit_leave_fn(purity: uint, proto: uint,
n_inputs: uint, retstyle: uint) -> bool;
@@ -110,13 +109,13 @@ mod intrinsic {
fn visit_self() -> bool;
fn visit_type() -> bool;
fn visit_opaque_box() -> bool;
fn visit_constr(inner: *tydesc) -> bool;
fn visit_constr(inner: *TyDesc) -> bool;
fn visit_closure_ptr(ck: uint) -> bool;
}
#[abi = "rust-intrinsic"]
extern mod rusti {
fn get_tydesc<T>() -> *();
fn visit_tydesc(td: *tydesc, &&tv: ty_visitor);
fn visit_tydesc(td: *TyDesc, &&tv: TyVisitor);
}
}

2
src/rustc/middle/typeck/check.rs
View File

@@ -2562,7 +2562,7 @@ fn check_intrinsic_type(ccx: @crate_ctxt, it: @ast::foreign_item) {
}
~"visit_tydesc" => {
let tydesc_name = syntax::parse::token::special_idents::tydesc;
let ty_visitor_name = tcx.sess.ident_of(~"ty_visitor");
let ty_visitor_name = tcx.sess.ident_of(~"TyVisitor");
assert tcx.intrinsic_defs.contains_key(tydesc_name);
assert ccx.tcx.intrinsic_defs.contains_key(ty_visitor_name);
let (_, tydesc_ty) = tcx.intrinsic_defs.get(tydesc_name);