diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-11-12 16:41:20 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-11-12 16:41:20 -0800 |
| commit | 5f881b48cb058236494ccc2f6d54cf617ae21a7f (patch) | |
| tree | 89b01b2ca865ad8554dafd75b6c22344f773b413 /src/libsyntax/parse | |
| parent | 4c680849638b548e7202ebe4cbce2c86fd65519a (diff) | |
| download | rust-5f881b48cb058236494ccc2f6d54cf617ae21a7f.tar.gz rust-5f881b48cb058236494ccc2f6d54cf617ae21a7f.zip | |
Remove filemap box typedef from codemap
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/comments.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/lexer.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libsyntax/parse/comments.rs b/src/libsyntax/parse/comments.rs index 4f265e1919c..c691d998549 100644 --- a/src/libsyntax/parse/comments.rs +++ b/src/libsyntax/parse/comments.rs @@ -288,7 +288,7 @@ fn gather_comments_and_literals(span_diagnostic: diagnostic::span_handler, let src = @str::from_bytes(srdr.read_whole_stream()); let itr = parse::token::mk_fake_ident_interner(); let rdr = lexer::new_low_level_string_reader - (span_diagnostic, codemap::new_filemap(path, src, 0u, 0u), itr); + (span_diagnostic, @codemap::new_filemap(path, src, 0u, 0u), itr); let mut comments: ~[cmnt] = ~[]; let mut literals: ~[lit] = ~[]; diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs index 8f57d733eb5..a56f2576ab1 100644 --- a/src/libsyntax/parse/lexer.rs +++ b/src/libsyntax/parse/lexer.rs @@ -25,7 +25,7 @@ type string_reader = @{ mut pos: uint, mut curr: char, mut chpos: uint, - filemap: codemap::filemap, + filemap: @codemap::filemap, interner: @token::ident_interner, /* cached: */ mut peek_tok: token::Token, @@ -33,7 +33,7 @@ type string_reader = @{ }; fn new_string_reader(span_diagnostic: span_handler, - filemap: codemap::filemap, + filemap: @codemap::filemap, itr: @token::ident_interner) -> string_reader { let r = new_low_level_string_reader(span_diagnostic, filemap, itr); string_advance_token(r); /* fill in peek_* */ @@ -42,7 +42,7 @@ fn new_string_reader(span_diagnostic: span_handler, /* For comments.rs, which hackily pokes into 'pos' and 'curr' */ fn new_low_level_string_reader(span_diagnostic: span_handler, - filemap: codemap::filemap, + filemap: @codemap::filemap, itr: @token::ident_interner) -> string_reader { let r = @{span_diagnostic: span_diagnostic, src: filemap.src, |