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/util/common.rs | |
| 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/util/common.rs')
| -rw-r--r-- | src/comp/util/common.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/comp/util/common.rs b/src/comp/util/common.rs index 56f30e07..071acea2 100644 --- a/src/comp/util/common.rs +++ b/src/comp/util/common.rs @@ -2,8 +2,10 @@ import std._uint; import std._int; import front.ast; + +type filename = str; type pos = rec(uint line, uint col); -type span = rec(str filename, pos lo, pos hi); +type span = rec(filename filename, pos lo, pos hi); type spanned[T] = rec(T node, span span); tag ty_mach { |