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

Make vectors uglier ([]/~). Sorry. Should be temporary. Closes #2725.

Browse Source
This commit is contained in:
Michael Sullivan
2012-06-25 20:00:46 -07:00
parent c087aaf56b
commit 329eca6044
418 changed files with 4123 additions and 4034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libsyntax/ast_map.rs
View File

@@ -7,7 +7,7 @@ import ast_util::inlined_item_methods;
import diagnostic::span_handler;
enum path_elt { path_mod(ident), path_name(ident) }
type path = [path_elt];
type path = [path_elt]/~;
/* FIXMEs that say "bad" are as per #2543 */
fn path_to_str_with_sep(p: path, sep: str) -> str {
@@ -45,9 +45,9 @@ enum ast_node {
node_local(uint),
// Constructor for a class
// def_id is parent id
node_ctor(ident, [ty_param], @class_ctor, def_id, @path),
node_ctor(ident, [ty_param]/~, @class_ctor, def_id, @path),
// Destructor for a class
node_dtor([ty_param], @class_dtor, def_id, @path),
node_dtor([ty_param]/~, @class_dtor, def_id, @path),
node_block(blk),
}
@@ -57,7 +57,7 @@ type ctx = {map: map, mut path: path,
type vt = visit::vt<ctx>;
fn extend(cx: ctx, +elt: ident) -> @path {
@(cx.path + [path_name(elt)])
@(cx.path + [path_name(elt)]/~)
}
fn mk_ast_map_visitor() -> vt {
@@ -75,7 +75,7 @@ fn mk_ast_map_visitor() -> vt {
fn map_crate(diag: span_handler, c: crate) -> map {
let cx = {map: std::map::int_hash(),
mut path: [],
mut path: []/~,
mut local_id: 0u,
diag: diag};
visit::visit_crate(c, cx, mk_ast_map_visitor());
@@ -229,9 +229,9 @@ fn map_item(i: @item, cx: ctx, v: vt) {
}
alt i.node {
item_mod(_) | item_native_mod(_) {
cx.path += [path_mod(i.ident)];
cx.path += [path_mod(i.ident)]/~;
}
_ { cx.path += [path_name(i.ident)]; }
_ { cx.path += [path_name(i.ident)]/~; }
}
visit::visit_item(i, cx, v);
vec::pop(cx.path);