More fleshing-out on rustc.me.trans. Emitting modules and fns corresponding to parsed input now.

3 files changed, 64 insertions, 16 deletions

diff --git a/src/comp/driver/session.rs b/src/comp/driver/session.rs
index 3b92e073..228e864f 100644
--- a/src/comp/driver/session.rs
+++ b/src/comp/driver/session.rs
@@ -1,8 +1,8 @@
 import util.common.span;
 import std._uint;
 
-io obj session() {
-    io fn span_err(span sp, str msg) {
+obj session() {
+    fn span_err(span sp, str msg) {
         let str s =  sp.filename;
         s += ':' as u8;
         // We really need #fmt soon!
@@ -19,12 +19,19 @@ io obj session() {
         fail;
     }
 
-    io fn err(str msg) {
+    fn err(str msg) {
         let str s = "error: ";
         s += msg;
         log s;
         fail;
     }
+
+    fn unimpl(str msg) {
+        let str s = "error: unimplemented ";
+        s += msg;
+        log s;
+        fail;
+    }
 }
 
 
diff --git a/src/comp/fe/parser.rs b/src/comp/fe/parser.rs
index 248d60f4..ab2e15e3 100644
--- a/src/comp/fe/parser.rs
+++ b/src/comp/fe/parser.rs
@@ -218,11 +218,27 @@ state fn parse_fn(parser p) -> tup(ast.ident, ast.item) {
     ret tup(id, ast.item_fn(@f));
 }
 
+state fn parse_mod(parser p) -> tup(ast.ident, ast.item) {
+    expect(p, token.MOD);
+    auto id = parse_ident(p);
+    expect(p, token.LBRACE);
+    let ast._mod m = new_str_hash[ast.item]();
+    while (p.peek() != token.RBRACE) {
+        auto i = parse_item(p);
+        m.insert(i._0, i._1);
+    }
+    expect(p, token.RBRACE);
+    ret tup(id, ast.item_mod(@m));
+}
+
 state fn parse_item(parser p) -> tup(ast.ident, ast.item) {
     alt (p.peek()) {
         case (token.FN) {
             ret parse_fn(p);
         }
+        case (token.MOD) {
+            ret parse_mod(p);
+        }
     }
     p.err("expectied item");
     fail;
diff --git a/src/comp/me/trans.rs b/src/comp/me/trans.rs
index d8e587c5..57213d93 100644
--- a/src/comp/me/trans.rs
+++ b/src/comp/me/trans.rs
@@ -17,6 +17,10 @@ import lib.llvm.llvm.BasicBlockRef;
 import lib.llvm.False;
 import lib.llvm.True;
 
+type trans_ctxt = rec(session.session sess,
+                      ModuleRef llmod,
+                      str path);
+
 fn T_nil() -> TypeRef {
     ret llvm.LLVMVoidType();
 }
@@ -32,35 +36,54 @@ fn T_fn(vec[TypeRef] inputs, TypeRef output) -> TypeRef {
                               False());
 }
 
-fn trans_fn(ModuleRef llmod, str name, &ast._fn f) {
-    let vec[TypeRef] args = vec();
-    let TypeRef llty = T_fn(args, T_nil());
-    let ValueRef llfn =
-        llvm.LLVMAddFunction(llmod, _str.buf(name), llty);
+fn trans_log(&trans_ctxt cx, builder b, &ast.atom a) {
 }
 
-fn trans_block(ast.block b, ValueRef llfn) {
+fn trans_stmt(&trans_ctxt cx, builder b, &ast.stmt s) {
+    alt (s) {
+        case (ast.stmt_log(?a)) {
+            trans_log(cx, b, *a);
+        }
+        case (_) {
+            cx.sess.unimpl("stmt variant");
+        }
+    }
+}
+
+fn trans_block(&trans_ctxt cx, ValueRef llfn, &ast.block b) {
     let BasicBlockRef llbb =
-        llvm.LLVMAppendBasicBlock(llfn, 0 as sbuf);
+        llvm.LLVMAppendBasicBlock(llfn, _str.buf(""));
     let BuilderRef llbuild = llvm.LLVMCreateBuilder();
     llvm.LLVMPositionBuilderAtEnd(llbuild, llbb);
-    auto b = builder(llbuild);
+    auto bld = builder(llbuild);
+    for (@ast.stmt s in b) {
+        trans_stmt(cx, bld, *s);
+    }
+}
+
+fn trans_fn(&trans_ctxt cx, &ast._fn f) {
+    let vec[TypeRef] args = vec();
+    let TypeRef llty = T_fn(args, T_nil());
+    let ValueRef llfn =
+        llvm.LLVMAddFunction(cx.llmod, _str.buf(cx.path), llty);
+    trans_block(cx, llfn, f.body);
 }
 
-fn trans_mod_item(ModuleRef llmod, str name, &ast.item item) {
+fn trans_item(&trans_ctxt cx, &str name, &ast.item item) {
+    auto sub_cx = rec(path=cx.path + "." + name with cx);
     alt (item) {
         case (ast.item_fn(?f)) {
-            trans_fn(llmod, name, *f);
+            trans_fn(sub_cx, *f);
         }
         case (ast.item_mod(?m)) {
-            trans_mod(llmod, name, *m);
+            trans_mod(sub_cx, *m);
         }
     }
 }
 
-fn trans_mod(ModuleRef llmod, str name, &ast._mod m) {
+fn trans_mod(&trans_ctxt cx, &ast._mod m) {
     for each (tup(str, ast.item) pair in m.items()) {
-        trans_mod_item(llmod, name + "." + pair._0, pair._1);
+        trans_item(cx, pair._0, pair._1);
     }
 }
 
@@ -69,6 +92,8 @@ fn trans_crate(session.session sess, ast.crate crate) {
         llvm.LLVMModuleCreateWithNameInContext(_str.buf("rust_out"),
                                                llvm.LLVMGetGlobalContext());
 
+    auto cx = rec(sess=sess, llmod=llmod, path="");
+    trans_mod(cx, crate.module);
 
     llvm.LLVMWriteBitcodeToFile(llmod, _str.buf("rust_out.bc"));
     llvm.LLVMDisposeModule(llmod);