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

rustc: Look up names in "use"d crates

Browse Source
This commit is contained in:
Patrick Walton
2011-03-25 17:53:46 -07:00
parent 661f1c541e
commit 94c19a18ae
4 changed files with 138 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
src/comp/front/creader.rs
View File

@@ -8,6 +8,7 @@ import lib.llvm.llvmext;
import lib.llvm.mk_object_file;
import lib.llvm.mk_section_iter;
import middle.fold;
import middle.metadata;
import middle.ty;
import middle.typeck;
import back.x86;
@@ -16,8 +17,11 @@ import util.common.span;
import std._str;
import std._vec;
import std.ebml;
import std.fs;
import std.io;
import std.option;
import std.option.none;
import std.option.some;
import std.os;
import std.map.hashmap;
@@ -30,6 +34,11 @@ type env = @rec(
mutable int next_crate_num
);
tag resolve_result {
rr_ok(ast.def_id);
rr_not_found(vec[ast.ident], ast.ident);
}
// Type decoding
// Compact string representation for ty.t values. API ty_str & parse_from_str.
@@ -213,10 +222,96 @@ impure fn parse_ty_fn(@pstate st, str_def sd) -> tup(vec[ty.arg], @ty.t) {
// Rust metadata parsing
// TODO
fn parse_def_id(str s) -> ast.def_id {
ret tup(1, 0); // TODO
}
// Given a path and serialized crate metadata, returns the ID of the
// definition the path refers to.
impure fn resolve_path(vec[ast.ident] path, vec[u8] data) -> resolve_result {
impure fn resolve_path_inner(vec[ast.ident] path, &ebml.reader ebml_r)
-> resolve_result {
auto i = 0u;
auto len = _vec.len[ast.ident](path);
while (i < len) {
auto name = path.(i);
auto last = i == len - 1u;
// Search this level for the identifier.
auto found = false;
while (ebml.bytes_left(ebml_r) > 0u && !found) {
auto ebml_tag = ebml.peek(ebml_r);
check ((ebml_tag.id == metadata.tag_paths_item) ||
(ebml_tag.id == metadata.tag_paths_mod));
ebml.move_to_first_child(ebml_r);
auto did_opt = none[ast.def_id];
auto name_opt = none[ast.ident];
while (ebml.bytes_left(ebml_r) > 0u) {
auto inner_tag = ebml.peek(ebml_r);
if (inner_tag.id == metadata.tag_paths_name) {
ebml.move_to_first_child(ebml_r);
auto name_data = ebml.read_data(ebml_r);
ebml.move_to_parent(ebml_r);
auto nm = _str.unsafe_from_bytes(name_data);
name_opt = some[ast.ident](nm);
} else if (inner_tag.id == metadata.tag_items_def_id) {
ebml.move_to_first_child(ebml_r);
auto did_data = ebml.read_data(ebml_r);
ebml.move_to_parent(ebml_r);
auto did_str = _str.unsafe_from_bytes(did_data);
log "did_str: " + did_str;
did_opt = some[ast.def_id](parse_def_id(did_str));
}
ebml.move_to_next_sibling(ebml_r);
}
ebml.move_to_parent(ebml_r);
if (_str.eq(option.get[ast.ident](name_opt), name)) {
// Matched!
if (last) {
ret rr_ok(option.get[ast.def_id](did_opt));
}
// Move to the module/item we found for the next iteration
// of the loop...
ebml.move_to_first_child(ebml_r);
found = true;
}
ebml.move_to_next_sibling(ebml_r);
}
if (!found) {
auto prev = _vec.slice[ast.ident](path, 0u, i);
ret rr_not_found(prev, name);
}
i += 1u;
}
fail; // not reached
}
auto io_r = io.new_reader_(io.new_byte_buf_reader(data));
auto ebml_r = ebml.create_reader(io_r);
while (ebml.bytes_left(ebml_r) > 0u) {
auto ebml_tag = ebml.peek(ebml_r);
log #fmt("outer ebml tag id: %u", ebml_tag.id);
if (ebml_tag.id == metadata.tag_paths) {
ebml.move_to_first_child(ebml_r);
ret resolve_path_inner(path, ebml_r);
}
ebml.move_to_next_sibling(ebml_r);
}
log "resolve_path(): no names in file";
fail;
}
fn load_crate(session.session sess,
int cnum,
ast.ident ident,
vec[str] library_search_paths) {
auto filename = parser.default_native_name(sess, ident);
@@ -235,6 +330,8 @@ fn load_crate(session.session sess,
auto cbuf = llvmext.LLVMGetSectionContents(si.llsi);
auto csz = llvmext.LLVMGetSectionSize(si.llsi);
auto cvbuf = cbuf as _vec.vbuf;
auto cvec = _vec.vec_from_vbuf[u8](cvbuf, csz);
sess.set_external_crate(cnum, cvec);
ret;
}
llvmext.LLVMMoveToNextSection(si.llsi);
@@ -252,8 +349,8 @@ fn fold_view_item_use(&env e, &span sp, ast.ident ident,
-> @ast.view_item {
auto cnum;
if (!e.crate_cache.contains_key(ident)) {
load_crate(e.sess, ident, e.library_search_paths);
cnum = e.next_crate_num;
load_crate(e.sess, cnum, ident, e.library_search_paths);
e.crate_cache.insert(ident, e.next_crate_num);
e.next_crate_num += 1;
} else {
@@ -280,9 +377,26 @@ fn read_crates(session.session sess,
ret fold.fold_crate[env](e, fld, crate);
}
// Crate metadata queries
fn lookup_def(session.session sess, &span sp, int cnum, vec[ast.ident] path)
-> ast.def {
// FIXME: fill in.
auto data = sess.get_external_crate(cnum);
auto did;
alt (resolve_path(path, data)) {
case (rr_ok(?di)) { did = di; }
case (rr_not_found(?prev, ?name)) {
sess.span_err(sp,
#fmt("unbound name '%s' (no item named '%s' found in '%s')",
_str.connect(path, "."), name, _str.connect(prev, ".")));
fail;
}
}
// TODO: Look up item type, use that to determine the type of def.
fail;
}

1
src/comp/rustc.rc
View File

@@ -43,6 +43,7 @@ mod util {
auth driver.rustc.main = impure;
auth front.creader.load_crate = unsafe;
auth front.creader.lookup_def = impure;
auth middle.metadata = unsafe;
auth middle.trans = unsafe;
auth middle.trans.copy_args_to_allocas = impure;

13
src/lib/ebml.rs
View File

@@ -6,7 +6,7 @@ import option.none;
import option.some;
type ebml_tag = rec(uint id, uint size);
type ebml_state = rec(ebml_tag ebml_tag, uint pos);
type ebml_state = rec(ebml_tag ebml_tag, uint tag_pos, uint data_pos);
// TODO: When we have module renaming, make "reader" and "writer" separate
// modules within this file.
@@ -57,7 +57,9 @@ impure fn bytes_left(&reader r) -> uint {
auto pos = r.reader.tell();
alt (_vec.last[ebml_state](r.states)) {
case (none[ebml_state]) { ret r.size - pos; }
case (some[ebml_state](?st)) { ret st.pos + st.ebml_tag.size - pos; }
case (some[ebml_state](?st)) {
ret st.data_pos + st.ebml_tag.size - pos;
}
}
}
@@ -69,9 +71,10 @@ impure fn read_tag(&reader r) -> ebml_tag {
// Reads a tag and moves the cursor to its first child or data segment.
impure fn move_to_first_child(&reader r) {
auto pos = r.reader.tell();
auto tag_pos = r.reader.tell();
auto t = read_tag(r);
r.states += vec(rec(ebml_tag=t, pos=pos));
auto data_pos = r.reader.tell();
r.states += vec(rec(ebml_tag=t, tag_pos=tag_pos, data_pos=data_pos));
}
// Reads a tag and skips over its contents, moving to its next sibling.
@@ -84,7 +87,7 @@ impure fn move_to_next_sibling(&reader r) {
impure fn move_to_parent(&reader r) {
check (_vec.len[ebml_state](r.states) > 0u);
auto st = _vec.pop[ebml_state](r.states);
r.reader.seek(st.pos as int, io.seek_set);
r.reader.seek(st.tag_pos as int, io.seek_set);
}
// Reads the data segment of a tag.

9
src/lib/io.rs
View File

@@ -188,6 +188,11 @@ fn file_reader(str path) -> reader {
ret new_reader(FILE_buf_reader(f, true));
}
// FIXME: Remove me once objects are exported.
fn new_reader_(buf_reader bufr) -> reader {
ret new_reader(bufr);
}
// Byte buffer readers
@@ -224,6 +229,10 @@ state obj byte_buf_reader(byte_buf bbuf) {
impure fn tell() -> uint { ret bbuf.pos; }
}
fn new_byte_buf_reader(vec[u8] buf) -> byte_buf_reader {
ret byte_buf_reader(@rec(buf=buf, mutable pos=0u));
}
// Writing