mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rustc: Add the notion of inherited visibility

Browse Source
This commit is contained in:
Patrick Walton 2012-08-03 13:58:14 -07:00
parent 0c623c4474
commit a805a1fb37
10 changed files with 83 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libsyntax/ast.rs
View File

@ -700,7 +700,7 @@ enum attr_style { attr_outer, attr_inner, }
type trait_ref = {path: @path, ref_id: node_id, impl_id: node_id};
#[auto_serialize]
enum visibility { public, private }
enum visibility { public, private, inherited }
#[auto_serialize]
type item = {ident: ident, attrs: ~[attribute],

1
src/libsyntax/ext/pipes/pipec.rs
View File

@ -437,7 +437,6 @@ fn parse_item(s: ~str) -> @ast::item {
@(copy s),
self.cfg(),
~[],
ast::public,
self.parse_sess());
alt res {
some(ast) { ast }

2
src/libsyntax/ext/qquote.rs
View File

@ -183,7 +183,7 @@ fn parse_expr(p: parser) -> @ast::expr { p.parse_expr() }
fn parse_pat(p: parser) -> @ast::pat { p.parse_pat(true) }
fn parse_item(p: parser) -> @ast::item {
alt p.parse_item(~[], ast::public) {
alt p.parse_item(~[]) {
some(item) { item }
none { fail ~"parse_item: parsing an item failed"; }
}

2
src/libsyntax/ext/tt/earley_parser.rs
View File

@ -320,7 +320,7 @@ fn parse(sess: parse_sess, cfg: ast::crate_cfg, rdr: reader, ms: ~[matcher])
fn parse_nt(p: parser, name: ~str) -> nonterminal {
alt name {
~"item" { alt p.parse_item(~[], ast::public) {
~"item" { alt p.parse_item(~[]) {
some(i) { token::nt_item(i) }
none { p.fatal(~"expected an item keyword") }
}}

3
src/libsyntax/parse.rs
View File

@ -120,11 +120,10 @@ fn parse_expr_from_source_str(name: ~str, source: @~str, cfg: ast::crate_cfg,
fn parse_item_from_source_str(name: ~str, source: @~str, cfg: ast::crate_cfg,
+attrs: ~[ast::attribute],
vis: ast::visibility,
sess: parse_sess) -> option<@ast::item> {
let (p, rdr) = new_parser_etc_from_source_str(sess, cfg, name,
codemap::fss_none, source);
let r = p.parse_item(attrs, vis);
let r = p.parse_item(attrs);
sess.chpos = rdr.chpos;
sess.byte_pos = sess.byte_pos + rdr.pos;
return r;

106
src/libsyntax/parse/parser.rs
View File

@ -31,25 +31,25 @@
expr_rec, expr_ret, expr_swap, expr_struct, expr_tup, expr_unary,
expr_unary_move, expr_vec, expr_vstore, expr_while, extern_fn,
field, fn_decl, foreign_item, foreign_item_fn, foreign_mod,
ident, impure_fn, infer, init_assign, init_move, initializer,
instance_var, item, item_, item_class, item_const, item_enum,
item_fn, item_foreign_mod, item_impl, item_mac, item_mod,
item_trait, item_ty, lit, lit_, lit_bool, lit_float, lit_int,
lit_int_unsuffixed, lit_nil, lit_str, lit_uint, local, m_const,
m_imm, m_mutbl, mac_, mac_aq, mac_ellipsis,
mac_invoc, mac_invoc_tt, mac_var, matcher, match_nonterminal,
match_seq, match_tok, method, mode, mt, mul, mutability, neg,
noreturn, not, pat, pat_box, pat_enum, pat_ident, pat_lit,
pat_range, pat_rec, pat_tup, pat_uniq, pat_wild, path, private,
proto, proto_any, proto_bare, proto_block, proto_box, proto_uniq,
provided, public, pure_fn, purity, re_anon, re_named, region,
rem, required, ret_style, return_val, self_ty, shl, shr, stmt,
stmt_decl, stmt_expr, stmt_semi, subtract, sty_box, sty_by_ref,
sty_region, sty_uniq, sty_value, token_tree, trait_method,
trait_ref, tt_delim, tt_seq, tt_tok, tt_nonterminal, ty, ty_,
ty_bot, ty_box, ty_field, ty_fn, ty_infer, ty_mac, ty_method,
ty_nil, ty_param, ty_path, ty_ptr, ty_rec, ty_rptr, ty_tup,
ty_u32, ty_uniq, ty_vec, ty_fixed_length, unchecked_blk, uniq,
ident, impure_fn, infer, inherited, init_assign, init_move,
initializer, instance_var, item, item_, item_class, item_const,
item_enum, item_fn, item_foreign_mod, item_impl, item_mac,
item_mod, item_trait, item_ty, lit, lit_, lit_bool, lit_float,
lit_int, lit_int_unsuffixed, lit_nil, lit_str, lit_uint, local,
m_const, m_imm, m_mutbl, mac_, mac_aq, mac_ellipsis, mac_invoc,
mac_invoc_tt, mac_var, matcher, match_nonterminal, match_seq,
match_tok, method, mode, mt, mul, mutability, neg, noreturn, not,
pat, pat_box, pat_enum, pat_ident, pat_lit, pat_range, pat_rec,
pat_tup, pat_uniq, pat_wild, path, private, proto, proto_any,
proto_bare, proto_block, proto_box, proto_uniq, provided, public,
pure_fn, purity, re_anon, re_named, region, rem, required,
ret_style, return_val, self_ty, shl, shr, stmt, stmt_decl,
stmt_expr, stmt_semi, subtract, sty_box, sty_by_ref, sty_region,
sty_uniq, sty_value, token_tree, trait_method, trait_ref,
tt_delim, tt_seq, tt_tok, tt_nonterminal, ty, ty_, ty_bot,
ty_box, ty_field, ty_fn, ty_infer, ty_mac, ty_method, ty_nil,
ty_param, ty_path, ty_ptr, ty_rec, ty_rptr, ty_tup, ty_u32,
ty_uniq, ty_vec, ty_fixed_length, unchecked_blk, uniq,
unsafe_blk, unsafe_fn, variant, view_item, view_item_,
view_item_export, view_item_import, view_item_use, view_path,
view_path_glob, view_path_list, view_path_simple, visibility,
@ -273,7 +273,7 @@ fn parse_trait_methods() -> ~[trait_method] {
let pur = p.parse_fn_purity();
// NB: at the moment, trait methods are public by default; this
// could change.
let vis = p.parse_visibility(public);
let vis = p.parse_visibility();
let ident = p.parse_method_name();
let tps = p.parse_ty_params();
let d = p.parse_ty_fn_decl(pur);
@ -1873,7 +1873,7 @@ fn check_expected_item(p: parser, current_attrs: ~[attribute]) {
let item_attrs = vec::append(first_item_attrs, item_attrs);
alt self.parse_item(item_attrs, public) {
alt self.parse_item(item_attrs) {
some(i) {
let mut hi = i.span.hi;
let decl = @spanned(lo, hi, decl_item(i));
@ -2459,8 +2459,7 @@ fn token_is_pound_or_doc_comment(++tok: token::token) -> bool {
}
}
fn parse_single_class_item(vis: visibility)
-> @class_member {
fn parse_single_class_item(vis: visibility) -> @class_member {
if (self.eat_keyword(~"let") ||
self.token_is_keyword(~"mut", copy self.token) ||
!self.is_any_keyword(copy self.token)) &&
@ -2491,17 +2490,27 @@ fn parse_dtor(attrs: ~[attribute]) -> class_contents {
dtor_decl(body, attrs, mk_sp(lo, self.last_span.hi))
}
fn parse_class_item(class_name_with_tps: @path)
-> class_contents {
fn parse_class_item(class_name_with_tps: @path) -> class_contents {
if self.eat_keyword(~"priv") {
self.expect(token::LBRACE);
let mut results = ~[];
while self.token != token::RBRACE {
vec::push(results, self.parse_single_class_item(private));
// XXX: Remove after snapshot.
match self.token {
token::LBRACE => {
self.bump();
let mut results = ~[];
while self.token != token::RBRACE {
vec::push(results,
self.parse_single_class_item(private));
}
self.bump();
return members(results);
}
_ =>
return members(~[self.parse_single_class_item(private)])
}
self.bump();
return members(results);
}
if self.eat_keyword(~"pub") {
return members(~[self.parse_single_class_item(public)]);
}
let attrs = self.parse_outer_attributes();
@ -2515,14 +2524,14 @@ fn parse_class_item(class_name_with_tps: @path)
return self.parse_dtor(attrs);
}
else {
return members(~[self.parse_single_class_item(public)]);
return members(~[self.parse_single_class_item(inherited)]);
}
}
fn parse_visibility(def: visibility) -> visibility {
fn parse_visibility() -> visibility {
if self.eat_keyword(~"pub") { public }
else if self.eat_keyword(~"priv") { private }
else { def }
else { inherited }
}
fn parse_mod_items(term: token::token,
@ -2539,8 +2548,7 @@ fn parse_mod_items(term: token::token,
first = false;
}
debug!{"parse_mod_items: parse_item(attrs=%?)", attrs};
let vis = self.parse_visibility(private);
alt self.parse_item(attrs, vis) {
alt self.parse_item(attrs) {
some(i) { vec::push(items, i); }
_ {
self.fatal(~"expected item but found `" +
@ -2661,7 +2669,7 @@ fn parse_region_param() {
}
}
fn parse_item_enum(default_vis: visibility) -> item_info {
fn parse_item_enum() -> item_info {
let id = self.parse_ident();
self.parse_region_param();
let ty_params = self.parse_ty_params();
@ -2689,7 +2697,7 @@ fn parse_item_enum(default_vis: visibility) -> item_info {
while self.token != token::RBRACE {
let variant_attrs = self.parse_outer_attributes();
let vlo = self.span.lo;
let vis = self.parse_visibility(default_vis);
let vis = self.parse_visibility();
let ident = self.parse_value_ident();
let mut args = ~[], disr_expr = none;
if self.token == token::LPAREN {
@ -2752,11 +2760,19 @@ fn fn_expr_lookahead(tok: token::token) -> bool {
}
}
fn parse_item(+attrs: ~[attribute], vis: visibility)
-> option<@item> {
fn parse_item(+attrs: ~[attribute]) -> option<@item> {
maybe_whole!{some self,nt_item};
let lo = self.span.lo;
let visibility;
if self.eat_keyword(~"pub") {
visibility = public;
} else if self.eat_keyword(~"priv") {
visibility = private;
} else {
visibility = inherited;
}
let (ident, item_, extra_attrs) = if self.eat_keyword(~"const") {
self.parse_item_const()
} else if self.is_keyword(~"fn") &&
@ -2782,7 +2798,7 @@ fn parse_item(+attrs: ~[attribute], vis: visibility)
} else if self.eat_keyword(~"type") {
self.parse_item_type()
} else if self.eat_keyword(~"enum") {
self.parse_item_enum(vis)
self.parse_item_enum()
} else if self.eat_keyword(~"iface") {
self.warn(~"`iface` is deprecated; use `trait`");
self.parse_item_trait()
@ -2816,7 +2832,7 @@ fn parse_item(+attrs: ~[attribute], vis: visibility)
expn_info: none}};
(id, item_mac(m), none)
} else { return none; };
some(self.mk_item(lo, self.last_span.hi, ident, item_, vis,
some(self.mk_item(lo, self.last_span.hi, ident, item_, visibility,
alt extra_attrs {
some(as) { vec::append(attrs, as) }
none { attrs }
@ -2917,7 +2933,7 @@ fn is_view_item() -> bool {
}
fn parse_view_item(+attrs: ~[attribute]) -> @view_item {
let lo = self.span.lo, vis = self.parse_visibility(private);
let lo = self.span.lo, vis = self.parse_visibility();
let node = if self.eat_keyword(~"use") {
self.parse_use()
} else if self.eat_keyword(~"import") {

2
src/rustc/front/intrinsic_inject.rs
View File

@ -12,7 +12,7 @@ fn inject_intrinsic(sess: session,
let item = parse::parse_item_from_source_str(~"<intrinsic>",
intrinsic_module,
sess.opts.cfg,
~[], ast::public,
~[],
sess.parse_sess);
let item =
alt item {

13
src/rustc/metadata/decoder.rs
View File

@ -294,7 +294,7 @@ fn item_to_def_like(item: ebml::doc, did: ast::def_id, cnum: ast::crate_num)
}
'I' { dl_def(ast::def_ty(did)) }
'i' { dl_impl(did) }
'g' | 'j' { dl_field }
'g' | 'j' | 'N' => { dl_field }
ch { fail fmt!{"unexpected family code: '%c'", ch} }
}
}
@ -741,14 +741,16 @@ fn get_class_members(cdata: cmd, id: ast::node_id,
pure fn family_to_visibility(family: char) -> ast::visibility {
alt family {
'g' { ast::public }
_ { ast::private }
'g' => ast::public,
'j' => ast::private,
'N' => ast::inherited,
_ => fail
}
}
/* 'g' for public field, 'j' for private field */
/* 'g' for public field, 'j' for private field, 'N' for inherited field */
fn get_class_fields(cdata: cmd, id: ast::node_id) -> ~[ty::field_ty] {
get_class_members(cdata, id, |f| f == 'g' || f == 'j')
get_class_members(cdata, id, |f| f == 'g' || f == 'j' || f == 'N')
}
fn family_has_type_params(fam_ch: char) -> bool {
@ -802,6 +804,7 @@ fn item_family_to_str(fam: char) -> ~str {
'S' { return ~"struct"; }
'g' { return ~"public field"; }
'j' { return ~"private field"; }
'N' { return ~"inherited field"; }
}
}

8
src/rustc/metadata/encoder.rs
View File

@ -144,7 +144,7 @@ fn encode_class_item_paths(ebml_w: ebml::writer,
for items.each |it| {
alt ast_util::class_member_visibility(it) {
private { again; }
public {
public | inherited {
let (id, ident) = alt it.node {
instance_var(v, _, _, vid, _) { (vid, v) }
class_method(it) { (it.id, it.ident) }
@ -434,7 +434,7 @@ fn encode_info_for_mod(ecx: @encode_ctxt, ebml_w: ebml::writer, md: _mod,
fn encode_visibility(ebml_w: ebml::writer, visibility: visibility) {
encode_family(ebml_w, alt visibility {
public { 'g' } private { 'j' }
public { 'g' } private { 'j' } inherited { 'N' }
});
}
@ -519,7 +519,7 @@ fn encode_info_for_class(ecx: @encode_ctxt, ebml_w: ebml::writer,
}
class_method(m) {
alt m.vis {
public {
public | inherited {
vec::push(*index, {val: m.id, pos: ebml_w.writer.tell()});
vec::push(*global_index,
{val: m.id, pos: ebml_w.writer.tell()});
@ -756,7 +756,7 @@ fn add_to_index_(item: @item, ebml_w: ebml::writer,
for ms.each |m| {
alt m.vis {
private { /* do nothing */ }
public {
public | inherited {
/* Write the info that's needed when viewing this class
as a trait */
ebml_w.start_tag(tag_item_trait_method);

9
src/rustc/middle/ty.rs
View File

@ -2940,10 +2940,11 @@ fn lookup_public_fields(cx: ctxt, did: ast::def_id) -> ~[field_ty] {
}
pure fn is_public(f: field_ty) -> bool {
alt f.vis {
public { true }
private { false }
}
// XXX: This is wrong.
match f.vis {
public | inherited => true,
private => false
}
}
/* Given a class def_id and a method name, return the method's