user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Find main functions buried within modules. Un-XFAIL import.rs.

Browse source
This commit is contained in:
Graydon Hoare 2011-02-21 17:42:23 -08:00
parent cbe8d222a8
commit 60f97aa9cc
2 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/Makefile
View file

@ -492,6 +492,7 @@ TEST_XFAILS_RUSTC := $(filter-out \
int.rs \
i32-sub.rs \
i8-incr.rs \
import.rs \
import2.rs \
import3.rs \
import4.rs \

27
src/comp/middle/trans.rs
View file

@ -4602,6 +4602,30 @@ fn create_crate_constant(@crate_ctxt cx) {
llvm.LLVMSetInitializer(cx.crate_ptr, crate_val);
}
fn find_main_fn(@crate_ctxt cx) -> ValueRef {
auto e = sep() + "main";
let ValueRef v = C_nil();
let uint n = 0u;
for each (tup(str,ValueRef) i in cx.item_names.items()) {
if (_str.ends_with(i._0, e)) {
n += 1u;
v = i._1;
}
}
alt (n) {
case (0u) {
cx.sess.err("main fn not found");
}
case (1u) {
ret v;
}
case (_) {
cx.sess.err("multiple main fns found");
}
}
fail;
}
fn trans_main_fn(@crate_ctxt cx, ValueRef llcrate) {
auto T_main_args = vec(T_int(), T_int());
auto T_rust_start_args = vec(T_int(), T_int(), T_int(), T_int());
@ -4621,8 +4645,7 @@ fn trans_main_fn(@crate_ctxt cx, ValueRef llcrate) {
auto llargc = llvm.LLVMGetParam(llmain, 0u);
auto llargv = llvm.LLVMGetParam(llmain, 1u);
check (cx.item_names.contains_key("_rust" + sep() + "main"));
auto llrust_main = cx.item_names.get("_rust" + sep() + "main");
auto llrust_main = find_main_fn(cx);
//
// Emit the moral equivalent of: