diff options
| author | Brian Anderson <[email protected]> | 2011-03-07 21:21:01 -0500 |
|---|---|---|
| committer | Brian Anderson <[email protected]> | 2011-03-07 21:21:01 -0500 |
| commit | 9fc4db6b89213afdf45c02fc2bd2be62b0ddc40c (patch) | |
| tree | 6c84574116273f91cbe89abd256b9f809adf97de /src/comp/rustc.rc | |
| parent | Allow the else part of an expr_if to be either expr_if or expr_block (diff) | |
| parent | rustc: Cast the LLVM representations of tag types when constructing boxes. Un... (diff) | |
| download | rust-9fc4db6b89213afdf45c02fc2bd2be62b0ddc40c.tar.xz rust-9fc4db6b89213afdf45c02fc2bd2be62b0ddc40c.zip | |
Merge branch 'master' into recursive-elseif
Conflicts:
src/Makefile
src/comp/front/ast.rs
src/comp/front/parser.rs
src/comp/middle/fold.rs
src/comp/middle/trans.rs
Diffstat (limited to 'src/comp/rustc.rc')
| -rw-r--r-- | src/comp/rustc.rc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/comp/rustc.rc b/src/comp/rustc.rc index b439632c..e4833409 100644 --- a/src/comp/rustc.rc +++ b/src/comp/rustc.rc @@ -5,9 +5,12 @@ use std; mod front { mod ast; + mod extfmt; mod lexer; mod parser; + mod pretty; mod token; + mod eval; } mod middle { @@ -28,6 +31,11 @@ mod driver { mod session; } +mod pretty { + mod pp; + mod pprust; +} + mod util { mod common; } @@ -38,7 +46,6 @@ auth middle.trans.copy_args_to_allocas = impure; auth middle.trans.trans_block = impure; auth lib.llvm = unsafe; - mod lib { alt (target_os) { case ("win32") { |