rustc: Remove the meta keyword

Issue #487
This commit is contained in:
Brian Anderson 2011-06-18 17:17:54 -07:00
parent f58de2d687
commit ddbb31eb8e
6 changed files with 1 additions and 34 deletions

View file

@ -254,30 +254,10 @@ iter crate_export_metas(&ast::crate c) -> @ast::meta_item {
for (ast::attribute attr in c.node.attrs) { for (ast::attribute attr in c.node.attrs) {
put @attr.node.value; put @attr.node.value;
} }
for (@ast::crate_directive cdir in c.node.directives) {
alt (cdir.node) {
case (ast::cdir_meta(?v, ?mis)) {
if (v == ast::export_meta) {
for (@ast::meta_item mi in mis) { put mi; }
}
}
case (_) { }
}
}
} }
iter crate_local_metas(&ast::crate c) -> @ast::meta_item { iter crate_local_metas(&ast::crate c) -> @ast::meta_item {
for (@ast::crate_directive cdir in c.node.directives) { // FIXME: As above
alt (cdir.node) {
case (ast::cdir_meta(?v, ?mis)) {
if (v == ast::local_meta) {
for (@ast::meta_item mi in mis) { put mi; }
}
}
case (_) { }
}
}
} }
fn get_crate_meta_export(&session::session sess, &ast::crate c, str k, fn get_crate_meta_export(&session::session sess, &ast::crate c, str k,

View file

@ -80,8 +80,6 @@ type crate_ = rec(vec[@crate_directive] directives,
_mod module, _mod module,
vec[attribute] attrs); vec[attribute] attrs);
tag meta_visibility { export_meta; local_meta; }
tag crate_directive_ { tag crate_directive_ {
cdir_expr(@expr); cdir_expr(@expr);
@ -92,7 +90,6 @@ tag crate_directive_ {
cdir_src_mod(ident, option::t[filename]); cdir_src_mod(ident, option::t[filename]);
cdir_dir_mod(ident, option::t[filename], vec[@crate_directive]); cdir_dir_mod(ident, option::t[filename], vec[@crate_directive]);
cdir_view_item(@view_item); cdir_view_item(@view_item);
cdir_meta(meta_visibility, vec[@meta_item]);
cdir_syntax(path); cdir_syntax(path);
cdir_auth(path, _auth); cdir_auth(path, _auth);
} }

View file

@ -316,7 +316,6 @@ fn eval_crate_directive(ctx cx, env e, @ast::crate_directive cdir, str prefix,
case (ast::cdir_view_item(?vi)) { case (ast::cdir_view_item(?vi)) {
vec::push[@ast::view_item](view_items, vi); vec::push[@ast::view_item](view_items, vi);
} }
case (ast::cdir_meta(?vi, ?mi)) { }
case (ast::cdir_syntax(?pth)) { } case (ast::cdir_syntax(?pth)) { }
case (ast::cdir_auth(?pth, ?eff)) { } case (ast::cdir_auth(?pth, ?eff)) { }
} }

View file

@ -2320,13 +2320,6 @@ fn parse_crate_directive(&parser p) -> ast::crate_directive {
auto hi = p.get_hi_pos(); auto hi = p.get_hi_pos();
expect(p, token::SEMI); expect(p, token::SEMI);
ret spanned(lo, hi, ast::cdir_auth(n, a)); ret spanned(lo, hi, ast::cdir_auth(n, a));
} else if (eat_word(p, "meta")) {
auto mv = ast::local_meta;
if (eat_word(p, "export")) { mv = ast::export_meta; }
auto mis = parse_meta(p);
auto hi = p.get_hi_pos();
expect(p, token::SEMI);
ret spanned(lo, hi, ast::cdir_meta(mv, mis));
} else if (eat_word(p, "mod")) { } else if (eat_word(p, "mod")) {
auto id = parse_ident(p); auto id = parse_ident(p);
auto file_opt = auto file_opt =

View file

@ -73,7 +73,6 @@ fn visit_crate_directive[E](&@crate_directive cd, &E e, &vt[E] v) {
} }
} }
case (cdir_view_item(?vi)) { vt(v).visit_view_item(vi, e, v); } case (cdir_view_item(?vi)) { vt(v).visit_view_item(vi, e, v); }
case (cdir_meta(_, _)) { }
case (cdir_syntax(_)) { } case (cdir_syntax(_)) { }
case (cdir_auth(_, _)) { } case (cdir_auth(_, _)) { }
} }

View file

@ -70,7 +70,6 @@ fn walk_crate_directive(&ast_visitor v, @ast::crate_directive cd) {
} }
} }
case (ast::cdir_view_item(?vi)) { walk_view_item(v, vi); } case (ast::cdir_view_item(?vi)) { walk_view_item(v, vi); }
case (ast::cdir_meta(_, _)) { }
case (ast::cdir_syntax(_)) { } case (ast::cdir_syntax(_)) { }
case (ast::cdir_auth(_, _)) { } case (ast::cdir_auth(_, _)) { }
} }