From 7fb1a4e2d1606f444d1ac40654b3ad11b081a07c Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Sun, 2 Sep 2012 15:19:52 -0700 Subject: [PATCH] Camel case core::intrinsic --- src/libsyntax/parse/token.rs | 4 +- src/rustc/front/intrinsic.rs | 47 +++++++------ src/rustc/middle/typeck/check.rs | 2 +- src/test/run-pass/reflect-visit-data.rs | 88 ++++++++++++------------- 4 files changed, 70 insertions(+), 71 deletions(-) diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index 50e05bb459e..02729382dab 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -340,8 +340,8 @@ fn mk_ident_interner() -> ident_interner { @~"[]", @~"unary-", @~"__extensions__", @~"self", @~"item", @~"block", @~"stmt", @~"pat", @~"expr", @~"ty", @~"ident", @~"path", @~"tt", @~"matchers", - @~"str", @~"ty_visitor", @~"arg", @~"descrim", - @~"__rust_abi", @~"__rust_stack_shim", @~"tydesc", + @~"str", @~"TyVisitor", @~"arg", @~"descrim", + @~"__rust_abi", @~"__rust_stack_shim", @~"TyDesc", @~"dtor", @~"main", @~"", @~"blk", @~"static", @~"intrinsic", @~"__foreign_mod__"]; diff --git a/src/rustc/front/intrinsic.rs b/src/rustc/front/intrinsic.rs index 8d8ced6434e..71262dfc1f0 100644 --- a/src/rustc/front/intrinsic.rs +++ b/src/rustc/front/intrinsic.rs @@ -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() -> *tydesc { - rusti::get_tydesc::() as *tydesc + fn get_tydesc() -> *TyDesc { + rusti::get_tydesc::() 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() -> *(); - fn visit_tydesc(td: *tydesc, &&tv: ty_visitor); + fn visit_tydesc(td: *TyDesc, &&tv: TyVisitor); } } diff --git a/src/rustc/middle/typeck/check.rs b/src/rustc/middle/typeck/check.rs index da096cbab24..f93fc3a01fb 100644 --- a/src/rustc/middle/typeck/check.rs +++ b/src/rustc/middle/typeck/check.rs @@ -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); diff --git a/src/test/run-pass/reflect-visit-data.rs b/src/test/run-pass/reflect-visit-data.rs index bd9dc15bbbe..d43adc74bd9 100644 --- a/src/test/run-pass/reflect-visit-data.rs +++ b/src/test/run-pass/reflect-visit-data.rs @@ -1,5 +1,5 @@ -import intrinsic::{tydesc, get_tydesc, visit_tydesc, ty_visitor}; +import intrinsic::{TyDesc, get_tydesc, visit_tydesc, TyVisitor}; import libc::c_void; // FIXME: this is a near-duplicate of code in core::vec. @@ -22,10 +22,10 @@ fn align(size: uint, align: uint) -> uint { ((size + align) - 1u) & !(align - 1u) } -enum ptr_visit_adaptor = { +enum ptr_visit_adaptor = { inner: V }; -impl ptr_visit_adaptor: ty_visitor { +impl ptr_visit_adaptor: TyVisitor { #[inline(always)] fn bump(sz: uint) { @@ -207,35 +207,35 @@ impl ptr_visit_adaptor: ty_visitor { true } - fn visit_box(mtbl: uint, inner: *tydesc) -> bool { + fn visit_box(mtbl: uint, inner: *TyDesc) -> bool { self.align_to::<@u8>(); if ! self.inner.visit_box(mtbl, inner) { return false; } self.bump_past::<@u8>(); true } - fn visit_uniq(mtbl: uint, inner: *tydesc) -> bool { + fn visit_uniq(mtbl: uint, inner: *TyDesc) -> bool { self.align_to::<~u8>(); if ! self.inner.visit_uniq(mtbl, inner) { return false; } self.bump_past::<~u8>(); true } - fn visit_ptr(mtbl: uint, inner: *tydesc) -> bool { + fn visit_ptr(mtbl: uint, inner: *TyDesc) -> bool { self.align_to::<*u8>(); if ! self.inner.visit_ptr(mtbl, inner) { return false; } self.bump_past::<*u8>(); true } - fn visit_rptr(mtbl: uint, inner: *tydesc) -> bool { + fn visit_rptr(mtbl: uint, inner: *TyDesc) -> bool { self.align_to::<&static/u8>(); if ! self.inner.visit_rptr(mtbl, inner) { return false; } self.bump_past::<&static/u8>(); true } - fn visit_unboxed_vec(mtbl: uint, inner: *tydesc) -> bool { + fn visit_unboxed_vec(mtbl: uint, inner: *TyDesc) -> bool { self.align_to::(); // FIXME: Inner really has to move its own pointers on this one. // or else possibly we could have some weird interface wherein we @@ -245,28 +245,28 @@ impl ptr_visit_adaptor: ty_visitor { true } - fn visit_vec(mtbl: uint, inner: *tydesc) -> bool { + fn visit_vec(mtbl: uint, inner: *TyDesc) -> bool { self.align_to::<~[u8]>(); if ! self.inner.visit_vec(mtbl, inner) { return false; } self.bump_past::<~[u8]>(); true } - fn visit_evec_box(mtbl: uint, inner: *tydesc) -> bool { + fn visit_evec_box(mtbl: uint, inner: *TyDesc) -> bool { self.align_to::<@[u8]>(); if ! self.inner.visit_evec_box(mtbl, inner) { return false; } self.bump_past::<@[u8]>(); true } - fn visit_evec_uniq(mtbl: uint, inner: *tydesc) -> bool { + fn visit_evec_uniq(mtbl: uint, inner: *TyDesc) -> bool { self.align_to::<~[u8]>(); if ! self.inner.visit_evec_uniq(mtbl, inner) { return false; } self.bump_past::<~[u8]>(); true } - fn visit_evec_slice(mtbl: uint, inner: *tydesc) -> bool { + fn visit_evec_slice(mtbl: uint, inner: *TyDesc) -> bool { self.align_to::<&static/[u8]>(); if ! self.inner.visit_evec_slice(mtbl, inner) { return false; } self.bump_past::<&static/[u8]>(); @@ -274,7 +274,7 @@ impl ptr_visit_adaptor: ty_visitor { } fn visit_evec_fixed(n: uint, sz: uint, align: uint, - mtbl: uint, inner: *tydesc) -> bool { + mtbl: uint, inner: *TyDesc) -> bool { self.align(align); if ! self.inner.visit_evec_fixed(n, sz, align, mtbl, inner) { return false; @@ -290,7 +290,7 @@ impl ptr_visit_adaptor: ty_visitor { } fn visit_rec_field(i: uint, name: &str, - mtbl: uint, inner: *tydesc) -> bool { + mtbl: uint, inner: *TyDesc) -> bool { if ! self.inner.visit_rec_field(i, name, mtbl, inner) { return false; } true } @@ -309,7 +309,7 @@ impl ptr_visit_adaptor: ty_visitor { } fn visit_class_field(i: uint, name: &str, - mtbl: uint, inner: *tydesc) -> bool { + mtbl: uint, inner: *TyDesc) -> bool { if ! self.inner.visit_class_field(i, name, mtbl, inner) { return false; } @@ -329,7 +329,7 @@ impl ptr_visit_adaptor: ty_visitor { true } - fn visit_tup_field(i: uint, inner: *tydesc) -> bool { + fn visit_tup_field(i: uint, inner: *TyDesc) -> bool { if ! self.inner.visit_tup_field(i, inner) { return false; } true } @@ -347,12 +347,12 @@ impl ptr_visit_adaptor: ty_visitor { true } - fn visit_fn_input(i: uint, mode: uint, inner: *tydesc) -> bool { + fn visit_fn_input(i: uint, mode: uint, inner: *TyDesc) -> bool { if ! self.inner.visit_fn_input(i, mode, inner) { return false; } true } - fn visit_fn_output(retstyle: uint, inner: *tydesc) -> bool { + fn visit_fn_output(retstyle: uint, inner: *TyDesc) -> bool { if ! self.inner.visit_fn_output(retstyle, inner) { return false; } true } @@ -382,7 +382,7 @@ impl ptr_visit_adaptor: ty_visitor { true } - fn visit_enum_variant_field(i: uint, inner: *tydesc) -> bool { + fn visit_enum_variant_field(i: uint, inner: *TyDesc) -> bool { if ! self.inner.visit_enum_variant_field(i, inner) { return false; } true } @@ -404,9 +404,9 @@ impl ptr_visit_adaptor: ty_visitor { } fn visit_trait() -> bool { - self.align_to::(); + self.align_to::(); if ! self.inner.visit_trait() { return false; } - self.bump_past::(); + self.bump_past::(); true } @@ -444,7 +444,7 @@ impl ptr_visit_adaptor: ty_visitor { true } - fn visit_constr(inner: *tydesc) -> bool { + fn visit_constr(inner: *TyDesc) -> bool { if ! self.inner.visit_constr(inner) { return false; } true } @@ -470,10 +470,10 @@ impl my_visitor { } } - fn visit_inner(inner: *tydesc) -> bool { + fn visit_inner(inner: *TyDesc) -> bool { let u = my_visitor(*self); let v = ptr_visit_adaptor({inner: u}); - visit_tydesc(inner, v as ty_visitor); + visit_tydesc(inner, v as TyVisitor); true } } @@ -485,7 +485,7 @@ impl my_visitor: movable_ptr { } } -impl my_visitor: ty_visitor { +impl my_visitor: TyVisitor { fn visit_bot() -> bool { true } fn visit_nil() -> bool { true } @@ -525,23 +525,23 @@ impl my_visitor: ty_visitor { fn visit_estr_fixed(_n: uint, _sz: uint, _align: uint) -> bool { true } - fn visit_box(_mtbl: uint, _inner: *tydesc) -> bool { true } - fn visit_uniq(_mtbl: uint, _inner: *tydesc) -> bool { true } - fn visit_ptr(_mtbl: uint, _inner: *tydesc) -> bool { true } - fn visit_rptr(_mtbl: uint, _inner: *tydesc) -> bool { true } + fn visit_box(_mtbl: uint, _inner: *TyDesc) -> bool { true } + fn visit_uniq(_mtbl: uint, _inner: *TyDesc) -> bool { true } + fn visit_ptr(_mtbl: uint, _inner: *TyDesc) -> bool { true } + fn visit_rptr(_mtbl: uint, _inner: *TyDesc) -> bool { true } - fn visit_vec(_mtbl: uint, _inner: *tydesc) -> bool { true } - fn visit_unboxed_vec(_mtbl: uint, _inner: *tydesc) -> bool { true } - fn visit_evec_box(_mtbl: uint, _inner: *tydesc) -> bool { true } - fn visit_evec_uniq(_mtbl: uint, _inner: *tydesc) -> bool { true } - fn visit_evec_slice(_mtbl: uint, _inner: *tydesc) -> bool { true } + fn visit_vec(_mtbl: uint, _inner: *TyDesc) -> bool { true } + fn visit_unboxed_vec(_mtbl: uint, _inner: *TyDesc) -> bool { true } + fn visit_evec_box(_mtbl: uint, _inner: *TyDesc) -> bool { true } + fn visit_evec_uniq(_mtbl: uint, _inner: *TyDesc) -> bool { true } + fn visit_evec_slice(_mtbl: uint, _inner: *TyDesc) -> bool { true } fn visit_evec_fixed(_n: uint, _sz: uint, _align: uint, - _mtbl: uint, _inner: *tydesc) -> bool { true } + _mtbl: uint, _inner: *TyDesc) -> bool { true } fn visit_enter_rec(_n_fields: uint, _sz: uint, _align: uint) -> bool { true } fn visit_rec_field(_i: uint, _name: &str, - _mtbl: uint, inner: *tydesc) -> bool { + _mtbl: uint, inner: *TyDesc) -> bool { error!("rec field!"); self.visit_inner(inner) } @@ -551,7 +551,7 @@ impl my_visitor: ty_visitor { fn visit_enter_class(_n_fields: uint, _sz: uint, _align: uint) -> bool { true } fn visit_class_field(_i: uint, _name: &str, - _mtbl: uint, inner: *tydesc) -> bool { + _mtbl: uint, inner: *TyDesc) -> bool { self.visit_inner(inner) } fn visit_leave_class(_n_fields: uint, @@ -559,7 +559,7 @@ impl my_visitor: ty_visitor { fn visit_enter_tup(_n_fields: uint, _sz: uint, _align: uint) -> bool { true } - fn visit_tup_field(_i: uint, inner: *tydesc) -> bool { + fn visit_tup_field(_i: uint, inner: *TyDesc) -> bool { error!("tup field!"); self.visit_inner(inner) } @@ -575,7 +575,7 @@ impl my_visitor: ty_visitor { _disr_val: int, _n_fields: uint, _name: &str) -> bool { true } - fn visit_enum_variant_field(_i: uint, inner: *tydesc) -> bool { + fn visit_enum_variant_field(_i: uint, inner: *TyDesc) -> bool { self.visit_inner(inner) } fn visit_leave_enum_variant(_variant: uint, @@ -587,8 +587,8 @@ impl my_visitor: ty_visitor { fn visit_enter_fn(_purity: uint, _proto: uint, _n_inputs: uint, _retstyle: uint) -> bool { true } - fn visit_fn_input(_i: uint, _mode: uint, _inner: *tydesc) -> bool { true } - fn visit_fn_output(_retstyle: uint, _inner: *tydesc) -> bool { true } + fn visit_fn_input(_i: uint, _mode: uint, _inner: *TyDesc) -> bool { true } + fn visit_fn_output(_retstyle: uint, _inner: *TyDesc) -> bool { true } fn visit_leave_fn(_purity: uint, _proto: uint, _n_inputs: uint, _retstyle: uint) -> bool { true } @@ -600,11 +600,11 @@ impl my_visitor: ty_visitor { fn visit_self() -> bool { true } fn visit_type() -> bool { true } fn visit_opaque_box() -> bool { true } - fn visit_constr(_inner: *tydesc) -> bool { true } + fn visit_constr(_inner: *TyDesc) -> bool { true } fn visit_closure_ptr(_ck: uint) -> bool { true } } -fn get_tydesc_for(&&_t: T) -> *tydesc { +fn get_tydesc_for(&&_t: T) -> *TyDesc { get_tydesc::() } @@ -618,7 +618,7 @@ fn main() { let td = get_tydesc_for(r); unsafe { error!("tydesc sz: %u, align: %u", (*td).size, (*td).align); } - let v = v as ty_visitor; + let v = v as TyVisitor; visit_tydesc(td, v); for (copy u.vals).each |s| {