From 7a52154d78ff85fe87647685885e9958a50cb42e Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Sun, 1 Sep 2013 23:36:25 -0400 Subject: repr: print functions as `fn()` --- src/libstd/repr.rs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/libstd') diff --git a/src/libstd/repr.rs b/src/libstd/repr.rs index 3e2c5773acc..381cd449695 100644 --- a/src/libstd/repr.rs +++ b/src/libstd/repr.rs @@ -551,13 +551,19 @@ impl<'self> TyVisitor for ReprVisitor<'self> { } fn visit_enter_fn(&mut self, _purity: uint, _proto: uint, - _n_inputs: uint, _retstyle: uint) -> bool { true } + _n_inputs: uint, _retstyle: uint) -> bool { + self.writer.write("fn(".as_bytes()); + true + } fn visit_fn_input(&mut self, _i: uint, _mode: uint, _inner: *TyDesc) -> bool { + // FIXME: #8917: should print out the parameter types here, separated by commas true } fn visit_fn_output(&mut self, _retstyle: uint, _inner: *TyDesc) -> bool { + self.writer.write(")".as_bytes()); + // FIXME: #8917: should print out the output type here, as `-> T` true } @@ -596,6 +602,7 @@ struct P {a: int, b: float} #[test] fn test_repr() { + use prelude::*; use str; use str::Str; use rt::io::Decorator; @@ -653,6 +660,8 @@ fn test_repr() { exact_test(&(10u64, ~"hello"), "(10u64, ~\"hello\")"); + exact_test(&(&println), "&fn()"); + struct Foo; exact_test(&(~[Foo, Foo]), "~[repr::test_repr::Foo, repr::test_repr::Foo]"); } -- cgit 1.4.1-3-g733a5 From cc1f0027c73f2728fa20867a4dfdbdcfad77847f Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Mon, 2 Sep 2013 01:15:03 -0400 Subject: repr: add support for trait objects Closes #8916 --- src/librustc/middle/trans/reflect.rs | 12 +++++++----- src/libstd/reflect.rs | 4 ++-- src/libstd/repr.rs | 7 ++++++- src/libstd/unstable/intrinsics.rs | 2 +- src/test/run-pass/reflect-visit-data.rs | 6 +++--- src/test/run-pass/reflect-visit-type.rs | 2 +- 6 files changed, 20 insertions(+), 13 deletions(-) (limited to 'src/libstd') diff --git a/src/librustc/middle/trans/reflect.rs b/src/librustc/middle/trans/reflect.rs index b6cb47efc76..e57b845567a 100644 --- a/src/librustc/middle/trans/reflect.rs +++ b/src/librustc/middle/trans/reflect.rs @@ -146,6 +146,7 @@ impl Reflector { // Entrypoint pub fn visit_ty(&mut self, t: ty::t) { let bcx = self.bcx; + let tcx = bcx.ccx().tcx; debug!("reflect::visit_ty %s", ty_to_str(bcx.ccx().tcx, t)); match ty::get(t).sty { @@ -248,8 +249,6 @@ impl Reflector { } ty::ty_struct(did, ref substs) => { - let bcx = self.bcx; - let tcx = bcx.ccx().tcx; let fields = ty::struct_fields(tcx, did, substs); let extra = ~[self.c_slice(ty_to_str(tcx, t).to_managed()), @@ -270,7 +269,6 @@ impl Reflector { // let the visitor tell us if it wants to visit only a particular // variant? ty::ty_enum(did, ref substs) => { - let bcx = self.bcx; let ccx = bcx.ccx(); let repr = adt::represent_type(bcx.ccx(), t); let variants = ty::substd_enum_variants(ccx.tcx, did, substs); @@ -336,8 +334,12 @@ impl Reflector { } } - // Miscallaneous extra types - ty::ty_trait(_, _, _, _, _) => self.leaf("trait"), + ty::ty_trait(_, _, _, _, _) => { + let extra = [self.c_slice(ty_to_str(tcx, t).to_managed())]; + self.visit("trait", extra); + } + + // Miscellaneous extra types ty::ty_infer(_) => self.leaf("infer"), ty::ty_err => self.leaf("err"), ty::ty_param(ref p) => { diff --git a/src/libstd/reflect.rs b/src/libstd/reflect.rs index 7b352e7806e..6bef4402bf1 100644 --- a/src/libstd/reflect.rs +++ b/src/libstd/reflect.rs @@ -450,9 +450,9 @@ impl TyVisitor for MovePtrAdaptor { true } - fn visit_trait(&mut self) -> bool { + fn visit_trait(&mut self, name: &str) -> bool { self.align_to::<@TyVisitor>(); - if ! self.inner.visit_trait() { return false; } + if ! self.inner.visit_trait(name) { return false; } self.bump_past::<@TyVisitor>(); true } diff --git a/src/libstd/repr.rs b/src/libstd/repr.rs index 381cd449695..63a1416e48a 100644 --- a/src/libstd/repr.rs +++ b/src/libstd/repr.rs @@ -571,7 +571,11 @@ impl<'self> TyVisitor for ReprVisitor<'self> { _n_inputs: uint, _retstyle: uint) -> bool { true } - fn visit_trait(&mut self) -> bool { true } + fn visit_trait(&mut self, name: &str) -> bool { + self.writer.write(name.as_bytes()); + true + } + fn visit_param(&mut self, _i: uint) -> bool { true } fn visit_self(&mut self) -> bool { true } fn visit_type(&mut self) -> bool { true } @@ -661,6 +665,7 @@ fn test_repr() { "(10u64, ~\"hello\")"); exact_test(&(&println), "&fn()"); + exact_test(&(~5 as ~ToStr), "~to_str::ToStr:Send"); struct Foo; exact_test(&(~[Foo, Foo]), "~[repr::test_repr::Foo, repr::test_repr::Foo]"); diff --git a/src/libstd/unstable/intrinsics.rs b/src/libstd/unstable/intrinsics.rs index 8e0f6255e09..1726d144df1 100644 --- a/src/libstd/unstable/intrinsics.rs +++ b/src/libstd/unstable/intrinsics.rs @@ -256,7 +256,7 @@ pub trait TyVisitor { fn visit_leave_fn(&mut self, purity: uint, proto: uint, n_inputs: uint, retstyle: uint) -> bool; - fn visit_trait(&mut self) -> bool; + fn visit_trait(&mut self, name: &str) -> bool; fn visit_param(&mut self, i: uint) -> bool; fn visit_self(&mut self) -> bool; fn visit_type(&mut self) -> bool; diff --git a/src/test/run-pass/reflect-visit-data.rs b/src/test/run-pass/reflect-visit-data.rs index 317fdb634bc..e088cb1b45d 100644 --- a/src/test/run-pass/reflect-visit-data.rs +++ b/src/test/run-pass/reflect-visit-data.rs @@ -428,9 +428,9 @@ impl TyVisitor for ptr_visit_adaptor { true } - fn visit_trait(&mut self) -> bool { + fn visit_trait(&mut self, name: &str) -> bool { self.align_to::<@TyVisitor>(); - if ! self.inner.visit_trait() { return false; } + if ! self.inner.visit_trait(name) { return false; } self.bump_past::<@TyVisitor>(); true } @@ -616,7 +616,7 @@ impl TyVisitor for my_visitor { _n_inputs: uint, _retstyle: uint) -> bool { true } - fn visit_trait(&mut self) -> bool { true } + fn visit_trait(&mut self, _name: &str) -> bool { true } fn visit_param(&mut self, _i: uint) -> bool { true } fn visit_self(&mut self) -> bool { true } fn visit_type(&mut self) -> bool { true } diff --git a/src/test/run-pass/reflect-visit-type.rs b/src/test/run-pass/reflect-visit-type.rs index 32df4376983..53aef472aaf 100644 --- a/src/test/run-pass/reflect-visit-type.rs +++ b/src/test/run-pass/reflect-visit-type.rs @@ -139,7 +139,7 @@ impl TyVisitor for MyVisitor { _n_inputs: uint, _retstyle: uint) -> bool { true } - fn visit_trait(&mut self) -> bool { true } + fn visit_trait(&mut self, _name: &str) -> bool { true } fn visit_param(&mut self, _i: uint) -> bool { true } fn visit_self(&mut self) -> bool { true } fn visit_type(&mut self) -> bool { true } -- cgit 1.4.1-3-g733a5 From 331d2d6d31e1c7925c23f5173e5fbbb61f8b3e91 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Mon, 2 Sep 2013 02:56:08 -0400 Subject: repr: handle tuple structs sanely Closes #8919 --- src/librustc/middle/trans/reflect.rs | 13 +++++++++++-- src/libstd/reflect.rs | 15 +++++++++------ src/libstd/repr.rs | 30 +++++++++++++++++++++--------- src/libstd/unstable/intrinsics.rs | 6 +++--- src/test/run-pass/reflect-visit-data.rs | 22 +++++++++++----------- src/test/run-pass/reflect-visit-type.rs | 6 +++--- 6 files changed, 58 insertions(+), 34 deletions(-) (limited to 'src/libstd') diff --git a/src/librustc/middle/trans/reflect.rs b/src/librustc/middle/trans/reflect.rs index e57b845567a..45f2830dafe 100644 --- a/src/librustc/middle/trans/reflect.rs +++ b/src/librustc/middle/trans/reflect.rs @@ -51,6 +51,10 @@ impl Reflector { C_int(self.bcx.ccx(), i) } + pub fn c_bool(&mut self, b: bool) -> ValueRef { + C_bool(b) + } + pub fn c_slice(&mut self, s: @str) -> ValueRef { // We're careful to not use first class aggregates here because that // will kick us off fast isel. (Issue #4352.) @@ -250,14 +254,19 @@ impl Reflector { ty::ty_struct(did, ref substs) => { let fields = ty::struct_fields(tcx, did, substs); + let mut named_fields = false; + if !fields.is_empty() { + named_fields = fields[0].ident != special_idents::unnamed_field; + } let extra = ~[self.c_slice(ty_to_str(tcx, t).to_managed()), + self.c_bool(named_fields), self.c_uint(fields.len())] + self.c_size_and_align(t); do self.bracketed("class", extra) |this| { for (i, field) in fields.iter().enumerate() { let extra = ~[this.c_uint(i), - this.c_slice( - bcx.ccx().sess.str_of(field.ident))] + this.c_slice(bcx.ccx().sess.str_of(field.ident)), + this.c_bool(named_fields)] + this.c_mt(&field.mt); this.visit("class_field", extra); } diff --git a/src/libstd/reflect.rs b/src/libstd/reflect.rs index 6bef4402bf1..91e3719e3d0 100644 --- a/src/libstd/reflect.rs +++ b/src/libstd/reflect.rs @@ -331,25 +331,28 @@ impl TyVisitor for MovePtrAdaptor { true } - fn visit_enter_class(&mut self, name: &str, n_fields: uint, sz: uint, align: uint) -> bool { + fn visit_enter_class(&mut self, name: &str, named_fields: bool, n_fields: uint, sz: uint, + align: uint) -> bool { self.align(align); - if ! self.inner.visit_enter_class(name, n_fields, sz, align) { + if ! self.inner.visit_enter_class(name, named_fields, n_fields, sz, align) { return false; } true } - fn visit_class_field(&mut self, i: uint, name: &str, mtbl: uint, inner: *TyDesc) -> bool { + fn visit_class_field(&mut self, i: uint, name: &str, named: bool, mtbl: uint, + inner: *TyDesc) -> bool { unsafe { self.align((*inner).align); } - if ! self.inner.visit_class_field(i, name, mtbl, inner) { + if ! self.inner.visit_class_field(i, name, named, mtbl, inner) { return false; } unsafe { self.bump((*inner).size); } true } - fn visit_leave_class(&mut self, name: &str, n_fields: uint, sz: uint, align: uint) -> bool { - if ! self.inner.visit_leave_class(name, n_fields, sz, align) { + fn visit_leave_class(&mut self, name: &str, named_fields: bool, n_fields: uint, sz: uint, + align: uint) -> bool { + if ! self.inner.visit_leave_class(name, named_fields, n_fields, sz, align) { return false; } true diff --git a/src/libstd/repr.rs b/src/libstd/repr.rs index 63a1416e48a..02a3561a6f4 100644 --- a/src/libstd/repr.rs +++ b/src/libstd/repr.rs @@ -412,31 +412,40 @@ impl<'self> TyVisitor for ReprVisitor<'self> { true } - fn visit_enter_class(&mut self, name: &str, n_fields: uint, + fn visit_enter_class(&mut self, name: &str, named_fields: bool, n_fields: uint, _sz: uint, _align: uint) -> bool { self.writer.write(name.as_bytes()); if n_fields != 0 { - self.writer.write(['{' as u8]); + if named_fields { + self.writer.write(['{' as u8]); + } else { + self.writer.write(['(' as u8]); + } } true } - fn visit_class_field(&mut self, i: uint, name: &str, - mtbl: uint, inner: *TyDesc) -> bool { + fn visit_class_field(&mut self, i: uint, name: &str, named: bool, + _mtbl: uint, inner: *TyDesc) -> bool { if i != 0 { self.writer.write(", ".as_bytes()); } - self.write_mut_qualifier(mtbl); - self.writer.write(name.as_bytes()); - self.writer.write(": ".as_bytes()); + if named { + self.writer.write(name.as_bytes()); + self.writer.write(": ".as_bytes()); + } self.visit_inner(inner); true } - fn visit_leave_class(&mut self, _name: &str, n_fields: uint, + fn visit_leave_class(&mut self, _name: &str, named_fields: bool, n_fields: uint, _sz: uint, _align: uint) -> bool { if n_fields != 0 { - self.writer.write(['}' as u8]); + if named_fields { + self.writer.write(['}' as u8]); + } else { + self.writer.write([')' as u8]); + } } true } @@ -669,4 +678,7 @@ fn test_repr() { struct Foo; exact_test(&(~[Foo, Foo]), "~[repr::test_repr::Foo, repr::test_repr::Foo]"); + + struct Bar(int, int); + exact_test(&(Bar(2, 2)), "repr::test_repr::Bar(2, 2)"); } diff --git a/src/libstd/unstable/intrinsics.rs b/src/libstd/unstable/intrinsics.rs index 1726d144df1..fbd5bdaf587 100644 --- a/src/libstd/unstable/intrinsics.rs +++ b/src/libstd/unstable/intrinsics.rs @@ -220,11 +220,11 @@ pub trait TyVisitor { fn visit_leave_rec(&mut self, n_fields: uint, sz: uint, align: uint) -> bool; - fn visit_enter_class(&mut self, name: &str, n_fields: uint, + fn visit_enter_class(&mut self, name: &str, named_fields: bool, n_fields: uint, sz: uint, align: uint) -> bool; - fn visit_class_field(&mut self, i: uint, name: &str, + fn visit_class_field(&mut self, i: uint, name: &str, named: bool, mtbl: uint, inner: *TyDesc) -> bool; - fn visit_leave_class(&mut self, name: &str, n_fields: uint, + fn visit_leave_class(&mut self, name: &str, named_fields: bool, n_fields: uint, sz: uint, align: uint) -> bool; fn visit_enter_tup(&mut self, n_fields: uint, diff --git a/src/test/run-pass/reflect-visit-data.rs b/src/test/run-pass/reflect-visit-data.rs index e088cb1b45d..2d9f4a2ff6f 100644 --- a/src/test/run-pass/reflect-visit-data.rs +++ b/src/test/run-pass/reflect-visit-data.rs @@ -317,26 +317,26 @@ impl TyVisitor for ptr_visit_adaptor { true } - fn visit_enter_class(&mut self, name: &str, n_fields: uint, sz: uint, align: uint) - -> bool { + fn visit_enter_class(&mut self, name: &str, named_fields: bool, n_fields: uint, sz: uint, + align: uint) -> bool { self.align(align); - if ! self.inner.visit_enter_class(name, n_fields, sz, align) { + if ! self.inner.visit_enter_class(name, named_fields, n_fields, sz, align) { return false; } true } - fn visit_class_field(&mut self, i: uint, name: &str, + fn visit_class_field(&mut self, i: uint, name: &str, named: bool, mtbl: uint, inner: *TyDesc) -> bool { - if ! self.inner.visit_class_field(i, name, mtbl, inner) { + if ! self.inner.visit_class_field(i, name, named, mtbl, inner) { return false; } true } - fn visit_leave_class(&mut self, name: &str, n_fields: uint, sz: uint, align: uint) - -> bool { - if ! self.inner.visit_leave_class(name, n_fields, sz, align) { + fn visit_leave_class(&mut self, name: &str, named_fields: bool, n_fields: uint, sz: uint, + align: uint) -> bool { + if ! self.inner.visit_leave_class(name, named_fields, n_fields, sz, align) { return false; } true @@ -565,13 +565,13 @@ impl TyVisitor for my_visitor { fn visit_leave_rec(&mut self, _n_fields: uint, _sz: uint, _align: uint) -> bool { true } - fn visit_enter_class(&mut self, _name: &str, _n_fields: uint, + fn visit_enter_class(&mut self, _name: &str, _named_fields: bool, _n_fields: uint, _sz: uint, _align: uint) -> bool { true } - fn visit_class_field(&mut self, _i: uint, _name: &str, + fn visit_class_field(&mut self, _i: uint, _name: &str, _named: bool, _mtbl: uint, inner: *TyDesc) -> bool { self.visit_inner(inner) } - fn visit_leave_class(&mut self, _name: &str, _n_fields: uint, + fn visit_leave_class(&mut self, _name: &str, _named_fields: bool, _n_fields: uint, _sz: uint, _align: uint) -> bool { true } fn visit_enter_tup(&mut self, _n_fields: uint, diff --git a/src/test/run-pass/reflect-visit-type.rs b/src/test/run-pass/reflect-visit-type.rs index 53aef472aaf..b3d81d9c511 100644 --- a/src/test/run-pass/reflect-visit-type.rs +++ b/src/test/run-pass/reflect-visit-type.rs @@ -99,11 +99,11 @@ impl TyVisitor for MyVisitor { fn visit_leave_rec(&mut self, _n_fields: uint, _sz: uint, _align: uint) -> bool { true } - fn visit_enter_class(&mut self, _name: &str, _n_fields: uint, + fn visit_enter_class(&mut self, _name: &str, _named_fields: bool, _n_fields: uint, _sz: uint, _align: uint) -> bool { true } - fn visit_class_field(&mut self, _i: uint, _name: &str, + fn visit_class_field(&mut self, _i: uint, _name: &str, _named: bool, _mtbl: uint, _inner: *TyDesc) -> bool { true } - fn visit_leave_class(&mut self, _name: &str, _n_fields: uint, + fn visit_leave_class(&mut self, _name: &str, _named_fields: bool, _n_fields: uint, _sz: uint, _align: uint) -> bool { true } fn visit_enter_tup(&mut self, _n_fields: uint, -- cgit 1.4.1-3-g733a5