2011-06-15 11:19:50 -07:00
|
|
|
|
2011-07-12 10:59:18 -07:00
|
|
|
import std::ioivec;
|
2011-05-17 20:41:41 +02:00
|
|
|
import std::int;
|
2011-07-14 17:26:10 -07:00
|
|
|
import std::ivec;
|
|
|
|
import std::str;
|
2011-05-12 17:24:54 +02:00
|
|
|
import std::map;
|
|
|
|
import std::map::hashmap;
|
|
|
|
import std::option;
|
|
|
|
import std::option::some;
|
|
|
|
import std::option::none;
|
2011-07-05 11:48:19 +02:00
|
|
|
import util::interner;
|
|
|
|
import util::interner::intern;
|
|
|
|
import codemap;
|
2011-06-15 11:19:50 -07:00
|
|
|
|
|
|
|
type reader =
|
|
|
|
obj {
|
|
|
|
fn is_eof() -> bool ;
|
|
|
|
fn curr() -> char ;
|
|
|
|
fn next() -> char ;
|
|
|
|
fn init() ;
|
|
|
|
fn bump() ;
|
2011-07-25 16:23:32 +02:00
|
|
|
fn get_str_from(uint) -> str ;
|
2011-06-15 11:19:50 -07:00
|
|
|
fn get_interner() -> @interner::interner[str] ;
|
|
|
|
fn get_chpos() -> uint ;
|
2011-07-16 02:01:10 -04:00
|
|
|
fn get_byte_pos() -> uint ;
|
2011-06-15 11:19:50 -07:00
|
|
|
fn get_col() -> uint ;
|
|
|
|
fn get_filemap() -> codemap::filemap ;
|
|
|
|
fn err(str) ;
|
|
|
|
};
|
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn new_reader(cm: &codemap::codemap, src: str, filemap: codemap::filemap,
|
|
|
|
itr: @interner::interner[str]) -> reader {
|
|
|
|
obj reader(cm: codemap::codemap,
|
|
|
|
src: str,
|
|
|
|
len: uint,
|
|
|
|
mutable col: uint,
|
|
|
|
mutable pos: uint,
|
|
|
|
mutable ch: char,
|
|
|
|
mutable chpos: uint,
|
|
|
|
mutable strs: str[],
|
|
|
|
fm: codemap::filemap,
|
|
|
|
itr: @interner::interner[str]) {
|
2011-06-15 11:19:50 -07:00
|
|
|
fn is_eof() -> bool { ret ch == -1 as char; }
|
2011-07-27 14:19:39 +02:00
|
|
|
fn get_str_from(start: uint) -> str {
|
2011-07-11 21:30:33 -07:00
|
|
|
// I'm pretty skeptical about this subtraction. What if there's a
|
|
|
|
// multi-byte character before the mark?
|
2011-07-25 16:23:32 +02:00
|
|
|
ret str::slice(src, start - 1u, pos - 1u);
|
2011-07-11 21:30:33 -07:00
|
|
|
}
|
2011-04-08 18:44:20 +02:00
|
|
|
fn get_chpos() -> uint { ret chpos; }
|
2011-07-16 02:01:10 -04:00
|
|
|
fn get_byte_pos() -> uint { ret pos; }
|
2011-06-15 11:19:50 -07:00
|
|
|
fn curr() -> char { ret ch; }
|
2011-04-08 16:48:17 +02:00
|
|
|
fn next() -> char {
|
2011-07-27 14:19:39 +02:00
|
|
|
if pos < len {
|
2011-07-11 16:43:51 -07:00
|
|
|
ret str::char_at(src, pos);
|
2011-06-15 11:19:50 -07:00
|
|
|
} else { ret -1 as char; }
|
2011-04-08 16:48:17 +02:00
|
|
|
}
|
2011-04-19 13:35:49 -07:00
|
|
|
fn init() {
|
2011-07-27 14:19:39 +02:00
|
|
|
if pos < len {
|
|
|
|
let next = str::char_range_at(src, pos);
|
2011-07-26 14:06:02 +02:00
|
|
|
pos = next.next;
|
|
|
|
ch = next.ch;
|
2010-08-27 12:36:57 -07:00
|
|
|
}
|
2011-04-08 16:48:17 +02:00
|
|
|
}
|
2011-04-19 13:35:49 -07:00
|
|
|
fn bump() {
|
2011-07-27 14:19:39 +02:00
|
|
|
if pos < len {
|
2011-05-30 14:10:54 -07:00
|
|
|
col += 1u;
|
2011-04-08 18:44:20 +02:00
|
|
|
chpos += 1u;
|
2011-07-27 14:19:39 +02:00
|
|
|
if ch == '\n' {
|
2011-07-16 02:01:10 -04:00
|
|
|
codemap::next_line(fm, chpos, pos + fm.start_pos.byte);
|
|
|
|
col = 0u;
|
|
|
|
}
|
2011-07-27 14:19:39 +02:00
|
|
|
let next = str::char_range_at(src, pos);
|
2011-07-26 14:06:02 +02:00
|
|
|
pos = next.next;
|
|
|
|
ch = next.ch;
|
2011-06-15 11:19:50 -07:00
|
|
|
} else { ch = -1 as char; }
|
2011-04-08 16:48:17 +02:00
|
|
|
}
|
2011-05-16 14:53:00 -07:00
|
|
|
fn get_interner() -> @interner::interner[str] { ret itr; }
|
2011-06-15 11:19:50 -07:00
|
|
|
fn get_col() -> uint { ret col; }
|
|
|
|
fn get_filemap() -> codemap::filemap { ret fm; }
|
2011-07-27 14:19:39 +02:00
|
|
|
fn err(m: str) {
|
|
|
|
codemap::emit_error(some({lo: chpos, hi: chpos}), m, cm);
|
2011-07-05 11:48:19 +02:00
|
|
|
}
|
2011-04-08 16:48:17 +02:00
|
|
|
}
|
2011-07-27 14:19:39 +02:00
|
|
|
let strs: str[] = ~[];
|
|
|
|
let rd =
|
2011-07-25 16:23:32 +02:00
|
|
|
reader(cm, src, str::byte_len(src), 0u, 0u, -1 as char,
|
|
|
|
filemap.start_pos.ch, strs, filemap, itr);
|
2011-04-08 18:44:20 +02:00
|
|
|
rd.init();
|
|
|
|
ret rd;
|
|
|
|
}
|
2010-08-24 09:59:41 -07:00
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn dec_digit_val(c: char) -> int { ret (c as int) - ('0' as int); }
|
2010-08-31 11:36:36 -07:00
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn hex_digit_val(c: char) -> int {
|
|
|
|
if in_range(c, '0', '9') { ret (c as int) - ('0' as int); }
|
|
|
|
if in_range(c, 'a', 'f') { ret (c as int) - ('a' as int) + 10; }
|
|
|
|
if in_range(c, 'A', 'F') { ret (c as int) - ('A' as int) + 10; }
|
2010-08-31 11:36:36 -07:00
|
|
|
fail;
|
|
|
|
}
|
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn bin_digit_value(c: char) -> int { if c == '0' { ret 0; } ret 1; }
|
2010-08-31 11:36:36 -07:00
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn is_whitespace(c: char) -> bool {
|
2010-08-20 15:36:48 -07:00
|
|
|
ret c == ' ' || c == '\t' || c == '\r' || c == '\n';
|
2010-08-19 18:42:17 -07:00
|
|
|
}
|
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn may_begin_ident(c: char) -> bool { ret is_alpha(c) || c == '_'; }
|
2011-07-05 11:48:19 +02:00
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn in_range(c: char, lo: char, hi: char) -> bool { ret lo <= c && c <= hi; }
|
2011-07-05 11:48:19 +02:00
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn is_alpha(c: char) -> bool {
|
2011-07-05 11:48:19 +02:00
|
|
|
ret in_range(c, 'a', 'z') || in_range(c, 'A', 'Z');
|
|
|
|
}
|
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn is_dec_digit(c: char) -> bool { ret in_range(c, '0', '9'); }
|
2011-07-05 11:48:19 +02:00
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn is_alnum(c: char) -> bool { ret is_alpha(c) || is_dec_digit(c); }
|
2011-07-05 11:48:19 +02:00
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn is_hex_digit(c: char) -> bool {
|
2011-07-05 11:48:19 +02:00
|
|
|
ret in_range(c, '0', '9') || in_range(c, 'a', 'f') ||
|
|
|
|
in_range(c, 'A', 'F');
|
|
|
|
}
|
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn is_bin_digit(c: char) -> bool { ret c == '0' || c == '1'; }
|
2011-07-05 11:48:19 +02:00
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn consume_whitespace_and_comments(rdr: &reader) {
|
|
|
|
while is_whitespace(rdr.curr()) { rdr.bump(); }
|
2010-08-27 12:36:57 -07:00
|
|
|
be consume_any_line_comment(rdr);
|
2010-08-23 19:17:04 -07:00
|
|
|
}
|
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn consume_any_line_comment(rdr: &reader) {
|
|
|
|
if rdr.curr() == '/' {
|
|
|
|
alt rdr.next() {
|
|
|
|
'/' {
|
|
|
|
while rdr.curr() != '\n' && !rdr.is_eof() { rdr.bump(); }
|
|
|
|
// Restart whitespace munch.
|
2011-06-15 11:19:50 -07:00
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
be consume_whitespace_and_comments(rdr);
|
|
|
|
}
|
|
|
|
'*' { rdr.bump(); rdr.bump(); be consume_block_comment(rdr); }
|
|
|
|
_ { ret; }
|
2010-08-23 19:17:04 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn consume_block_comment(rdr: &reader) {
|
|
|
|
let level: int = 1;
|
|
|
|
while level > 0 {
|
|
|
|
if rdr.is_eof() { rdr.err("unterminated block comment"); fail; }
|
|
|
|
if rdr.curr() == '/' && rdr.next() == '*' {
|
2010-08-31 13:29:00 -07:00
|
|
|
rdr.bump();
|
|
|
|
rdr.bump();
|
|
|
|
level += 1;
|
|
|
|
} else {
|
2011-07-27 14:19:39 +02:00
|
|
|
if rdr.curr() == '*' && rdr.next() == '/' {
|
2010-08-31 13:29:00 -07:00
|
|
|
rdr.bump();
|
|
|
|
rdr.bump();
|
|
|
|
level -= 1;
|
2011-06-15 11:19:50 -07:00
|
|
|
} else { rdr.bump(); }
|
2010-08-31 13:29:00 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
// restart whitespace munch.
|
2011-06-15 11:19:50 -07:00
|
|
|
|
2011-05-30 14:10:54 -07:00
|
|
|
be consume_whitespace_and_comments(rdr);
|
2010-08-31 13:29:00 -07:00
|
|
|
}
|
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn digits_to_string(s: str) -> int {
|
|
|
|
let accum_int: int = 0;
|
|
|
|
for c: u8 in s {
|
2011-03-24 17:12:24 -07:00
|
|
|
accum_int *= 10;
|
|
|
|
accum_int += dec_digit_val(c as char);
|
2011-03-21 17:12:05 -07:00
|
|
|
}
|
|
|
|
ret accum_int;
|
|
|
|
}
|
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn scan_exponent(rdr: &reader) -> option::t[str] {
|
|
|
|
let c = rdr.curr();
|
|
|
|
let rslt = "";
|
|
|
|
if c == 'e' || c == 'E' {
|
2011-06-24 19:04:08 +02:00
|
|
|
rslt += str::from_bytes([c as u8]);
|
2011-03-22 17:25:40 -07:00
|
|
|
rdr.bump();
|
|
|
|
c = rdr.curr();
|
2011-07-27 14:19:39 +02:00
|
|
|
if c == '-' || c == '+' {
|
2011-06-24 19:04:08 +02:00
|
|
|
rslt += str::from_bytes([c as u8]);
|
2011-03-22 17:25:40 -07:00
|
|
|
rdr.bump();
|
|
|
|
}
|
2011-07-27 14:19:39 +02:00
|
|
|
let exponent = scan_dec_digits(rdr);
|
|
|
|
if str::byte_len(exponent) > 0u {
|
2011-06-24 19:04:08 +02:00
|
|
|
ret some(rslt + exponent);
|
2011-06-15 11:19:50 -07:00
|
|
|
} else { rdr.err("scan_exponent: bad fp literal"); fail; }
|
|
|
|
} else { ret none[str]; }
|
2011-03-24 17:12:24 -07:00
|
|
|
}
|
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn scan_dec_digits(rdr: &reader) -> str {
|
|
|
|
let c = rdr.curr();
|
|
|
|
let rslt: str = "";
|
|
|
|
while is_dec_digit(c) || c == '_' {
|
|
|
|
if c != '_' { rslt += str::from_bytes([c as u8]); }
|
2011-03-24 17:12:24 -07:00
|
|
|
rdr.bump();
|
|
|
|
c = rdr.curr();
|
2011-03-22 17:25:40 -07:00
|
|
|
}
|
2011-06-24 19:04:08 +02:00
|
|
|
ret rslt;
|
2011-03-22 17:25:40 -07:00
|
|
|
}
|
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn scan_number(c: char, rdr: &reader) -> token::token {
|
|
|
|
let accum_int = 0;
|
|
|
|
let dec_str: str = "";
|
|
|
|
let is_dec_integer: bool = false;
|
|
|
|
let n = rdr.next();
|
|
|
|
if c == '0' && n == 'x' {
|
2010-11-22 17:41:26 -08:00
|
|
|
rdr.bump();
|
|
|
|
rdr.bump();
|
|
|
|
c = rdr.curr();
|
2011-07-27 14:19:39 +02:00
|
|
|
while is_hex_digit(c) || c == '_' {
|
|
|
|
if c != '_' { accum_int *= 16; accum_int += hex_digit_val(c); }
|
2010-11-22 17:41:26 -08:00
|
|
|
rdr.bump();
|
|
|
|
c = rdr.curr();
|
|
|
|
}
|
2011-03-21 17:12:05 -07:00
|
|
|
} else if (c == '0' && n == 'b') {
|
2010-11-22 17:41:26 -08:00
|
|
|
rdr.bump();
|
|
|
|
rdr.bump();
|
|
|
|
c = rdr.curr();
|
2011-07-27 14:19:39 +02:00
|
|
|
while is_bin_digit(c) || c == '_' {
|
|
|
|
if c != '_' { accum_int *= 2; accum_int += bin_digit_value(c); }
|
2010-11-22 17:41:26 -08:00
|
|
|
rdr.bump();
|
|
|
|
c = rdr.curr();
|
|
|
|
}
|
2011-06-15 11:19:50 -07:00
|
|
|
} else { dec_str = scan_dec_digits(rdr); is_dec_integer = true; }
|
2011-07-27 14:19:39 +02:00
|
|
|
if is_dec_integer { accum_int = digits_to_string(dec_str); }
|
2011-03-21 17:12:05 -07:00
|
|
|
c = rdr.curr();
|
|
|
|
n = rdr.next();
|
2011-07-27 14:19:39 +02:00
|
|
|
if c == 'u' || c == 'i' {
|
|
|
|
let signed: bool = c == 'i';
|
2010-11-22 17:41:26 -08:00
|
|
|
rdr.bump();
|
|
|
|
c = rdr.curr();
|
2011-07-27 14:19:39 +02:00
|
|
|
if c == '8' {
|
2010-11-22 17:41:26 -08:00
|
|
|
rdr.bump();
|
2011-07-27 14:19:39 +02:00
|
|
|
if signed {
|
2011-07-05 11:48:19 +02:00
|
|
|
ret token::LIT_MACH_INT(ast::ty_i8, accum_int);
|
|
|
|
} else { ret token::LIT_MACH_INT(ast::ty_u8, accum_int); }
|
2010-11-22 17:41:26 -08:00
|
|
|
}
|
|
|
|
n = rdr.next();
|
2011-07-27 14:19:39 +02:00
|
|
|
if c == '1' && n == '6' {
|
2010-11-22 17:41:26 -08:00
|
|
|
rdr.bump();
|
|
|
|
rdr.bump();
|
2011-07-27 14:19:39 +02:00
|
|
|
if signed {
|
2011-07-05 11:48:19 +02:00
|
|
|
ret token::LIT_MACH_INT(ast::ty_i16, accum_int);
|
|
|
|
} else { ret token::LIT_MACH_INT(ast::ty_u16, accum_int); }
|
2010-11-22 17:41:26 -08:00
|
|
|
}
|
2011-07-27 14:19:39 +02:00
|
|
|
if c == '3' && n == '2' {
|
2010-11-22 17:41:26 -08:00
|
|
|
rdr.bump();
|
|
|
|
rdr.bump();
|
2011-07-27 14:19:39 +02:00
|
|
|
if signed {
|
2011-07-05 11:48:19 +02:00
|
|
|
ret token::LIT_MACH_INT(ast::ty_i32, accum_int);
|
|
|
|
} else { ret token::LIT_MACH_INT(ast::ty_u32, accum_int); }
|
2010-11-22 17:41:26 -08:00
|
|
|
}
|
2011-07-27 14:19:39 +02:00
|
|
|
if c == '6' && n == '4' {
|
2010-11-22 17:41:26 -08:00
|
|
|
rdr.bump();
|
|
|
|
rdr.bump();
|
2011-07-27 14:19:39 +02:00
|
|
|
if signed {
|
2011-07-05 11:48:19 +02:00
|
|
|
ret token::LIT_MACH_INT(ast::ty_i64, accum_int);
|
|
|
|
} else { ret token::LIT_MACH_INT(ast::ty_u64, accum_int); }
|
2010-11-22 17:41:26 -08:00
|
|
|
}
|
2011-07-27 14:19:39 +02:00
|
|
|
if signed {
|
2011-05-12 17:24:54 +02:00
|
|
|
ret token::LIT_INT(accum_int);
|
2010-11-22 17:41:26 -08:00
|
|
|
} else {
|
|
|
|
// FIXME: should cast in the target bit-width.
|
2011-06-15 11:19:50 -07:00
|
|
|
|
2011-05-12 17:24:54 +02:00
|
|
|
ret token::LIT_UINT(accum_int as uint);
|
2010-11-22 17:41:26 -08:00
|
|
|
}
|
|
|
|
}
|
2011-03-22 17:25:40 -07:00
|
|
|
c = rdr.curr();
|
2011-07-27 14:19:39 +02:00
|
|
|
if c == '.' {
|
2011-03-21 17:12:05 -07:00
|
|
|
// Parse a floating-point number.
|
2011-06-15 11:19:50 -07:00
|
|
|
|
2011-03-21 17:12:05 -07:00
|
|
|
rdr.bump();
|
2011-07-27 14:19:39 +02:00
|
|
|
let dec_part = scan_dec_digits(rdr);
|
|
|
|
let float_str = dec_str + "." + dec_part;
|
2011-03-22 17:25:40 -07:00
|
|
|
c = rdr.curr();
|
2011-07-27 14:19:39 +02:00
|
|
|
let exponent_str = scan_exponent(rdr);
|
|
|
|
alt exponent_str { some(s) { float_str += s; } none. { } }
|
2011-03-22 17:25:40 -07:00
|
|
|
c = rdr.curr();
|
2011-07-27 14:19:39 +02:00
|
|
|
if c == 'f' {
|
2011-03-22 17:25:40 -07:00
|
|
|
rdr.bump();
|
|
|
|
c = rdr.curr();
|
|
|
|
n = rdr.next();
|
2011-07-27 14:19:39 +02:00
|
|
|
if c == '3' && n == '2' {
|
2011-06-15 11:19:50 -07:00
|
|
|
rdr.bump();
|
|
|
|
rdr.bump();
|
2011-07-05 11:48:19 +02:00
|
|
|
ret token::LIT_MACH_FLOAT(ast::ty_f32,
|
2011-06-15 11:19:50 -07:00
|
|
|
intern(*rdr.get_interner(),
|
|
|
|
float_str));
|
|
|
|
} else if (c == '6' && n == '4') {
|
|
|
|
rdr.bump();
|
|
|
|
rdr.bump();
|
2011-07-05 11:48:19 +02:00
|
|
|
ret token::LIT_MACH_FLOAT(ast::ty_f64,
|
2011-06-15 11:19:50 -07:00
|
|
|
intern(*rdr.get_interner(),
|
2011-06-16 16:55:46 -07:00
|
|
|
float_str));
|
2011-03-24 17:12:24 -07:00
|
|
|
/* FIXME: if this is out of range for either a 32-bit or
|
|
|
|
64-bit float, it won't be noticed till the back-end */
|
2011-06-15 11:19:50 -07:00
|
|
|
|
2011-03-22 17:25:40 -07:00
|
|
|
}
|
2011-06-15 11:19:50 -07:00
|
|
|
} else {
|
2011-05-16 14:53:00 -07:00
|
|
|
ret token::LIT_FLOAT(interner::intern[str](*rdr.get_interner(),
|
|
|
|
float_str));
|
2011-03-22 17:25:40 -07:00
|
|
|
}
|
2011-03-21 17:12:05 -07:00
|
|
|
}
|
2011-07-27 14:19:39 +02:00
|
|
|
let maybe_exponent = scan_exponent(rdr);
|
|
|
|
alt maybe_exponent {
|
|
|
|
some(s) {
|
|
|
|
ret token::LIT_FLOAT(interner::intern[str](*rdr.get_interner(),
|
|
|
|
dec_str + s));
|
|
|
|
}
|
|
|
|
none. { ret token::LIT_INT(accum_int); }
|
2011-03-21 17:12:05 -07:00
|
|
|
}
|
2010-11-22 17:41:26 -08:00
|
|
|
}
|
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn scan_numeric_escape(rdr: &reader, n_hex_digits: uint) -> char {
|
|
|
|
let accum_int = 0;
|
|
|
|
while n_hex_digits != 0u {
|
|
|
|
let n = rdr.curr();
|
2011-05-23 22:46:39 +02:00
|
|
|
rdr.bump();
|
2011-07-27 14:19:39 +02:00
|
|
|
if !is_hex_digit(n) {
|
2011-05-11 23:04:16 -04:00
|
|
|
rdr.err(#fmt("illegal numeric character escape: %d", n as int));
|
2011-04-13 11:25:01 -07:00
|
|
|
fail;
|
|
|
|
}
|
|
|
|
accum_int *= 16;
|
|
|
|
accum_int += hex_digit_val(n);
|
2011-05-23 22:46:39 +02:00
|
|
|
n_hex_digits -= 1u;
|
2011-04-13 11:25:01 -07:00
|
|
|
}
|
|
|
|
ret accum_int as char;
|
|
|
|
}
|
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn next_token(rdr: &reader) -> {tok: token::token, chpos: uint, bpos: uint} {
|
2011-05-30 14:10:54 -07:00
|
|
|
consume_whitespace_and_comments(rdr);
|
2011-07-27 14:19:39 +02:00
|
|
|
let start_chpos = rdr.get_chpos();
|
|
|
|
let start_bpos = rdr.get_byte_pos();
|
|
|
|
let tok = if rdr.is_eof() { token::EOF } else { next_token_inner(rdr) };
|
|
|
|
ret {tok: tok, chpos: start_chpos, bpos: start_bpos};
|
2011-07-25 16:23:32 +02:00
|
|
|
}
|
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn next_token_inner(rdr: &reader) -> token::token {
|
|
|
|
let accum_str = "";
|
|
|
|
let c = rdr.curr();
|
|
|
|
if is_alpha(c) || c == '_' {
|
|
|
|
while is_alnum(c) || c == '_' {
|
2011-05-17 20:41:41 +02:00
|
|
|
str::push_char(accum_str, c);
|
2010-08-27 12:36:57 -07:00
|
|
|
rdr.bump();
|
2010-08-31 11:36:36 -07:00
|
|
|
c = rdr.curr();
|
2010-08-20 11:41:34 -07:00
|
|
|
}
|
2011-07-27 14:19:39 +02:00
|
|
|
if str::eq(accum_str, "_") { ret token::UNDERSCORE; }
|
|
|
|
let is_mod_name = c == ':' && rdr.next() == ':';
|
2011-05-16 14:53:00 -07:00
|
|
|
ret token::IDENT(interner::intern[str](*rdr.get_interner(),
|
|
|
|
accum_str), is_mod_name);
|
2010-08-20 10:03:31 -07:00
|
|
|
}
|
2011-07-27 14:19:39 +02:00
|
|
|
if is_dec_digit(c) { ret scan_number(c, rdr); }
|
|
|
|
fn binop(rdr: &reader, op: token::binop) -> token::token {
|
2010-08-27 12:36:57 -07:00
|
|
|
rdr.bump();
|
2011-07-27 14:19:39 +02:00
|
|
|
if rdr.curr() == '=' {
|
2010-08-27 12:36:57 -07:00
|
|
|
rdr.bump();
|
2011-05-12 17:24:54 +02:00
|
|
|
ret token::BINOPEQ(op);
|
2011-06-15 11:19:50 -07:00
|
|
|
} else { ret token::BINOP(op); }
|
2010-08-23 19:17:04 -07:00
|
|
|
}
|
2011-07-27 14:19:39 +02:00
|
|
|
alt c {
|
|
|
|
|
|
|
|
// One-byte tokens.
|
|
|
|
'?' {
|
|
|
|
rdr.bump();
|
|
|
|
ret token::QUES;
|
|
|
|
}
|
|
|
|
';' { rdr.bump(); ret token::SEMI; }
|
|
|
|
',' { rdr.bump(); ret token::COMMA; }
|
|
|
|
'.' {
|
|
|
|
rdr.bump();
|
|
|
|
if rdr.curr() == '.' && rdr.next() == '.' {
|
2011-07-13 15:44:09 -07:00
|
|
|
rdr.bump();
|
|
|
|
rdr.bump();
|
2011-07-27 14:19:39 +02:00
|
|
|
ret token::ELLIPSIS;
|
|
|
|
}
|
|
|
|
ret token::DOT;
|
|
|
|
}
|
|
|
|
'(' { rdr.bump(); ret token::LPAREN; }
|
|
|
|
')' { rdr.bump(); ret token::RPAREN; }
|
|
|
|
'{' { rdr.bump(); ret token::LBRACE; }
|
|
|
|
'}' { rdr.bump(); ret token::RBRACE; }
|
|
|
|
'[' { rdr.bump(); ret token::LBRACKET; }
|
|
|
|
']' { rdr.bump(); ret token::RBRACKET; }
|
|
|
|
'@' { rdr.bump(); ret token::AT; }
|
|
|
|
'#' {
|
|
|
|
rdr.bump();
|
|
|
|
if rdr.curr() == '<' { rdr.bump(); ret token::POUND_LT; }
|
|
|
|
if rdr.curr() == '{' { rdr.bump(); ret token::POUND_LBRACE; }
|
|
|
|
ret token::POUND;
|
|
|
|
}
|
|
|
|
'~' { rdr.bump(); ret token::TILDE; }
|
|
|
|
':' {
|
|
|
|
rdr.bump();
|
|
|
|
if rdr.curr() == ':' {
|
2011-05-12 17:20:07 +02:00
|
|
|
rdr.bump();
|
2011-07-27 14:19:39 +02:00
|
|
|
ret token::MOD_SEP;
|
|
|
|
} else { ret token::COLON; }
|
|
|
|
}
|
|
|
|
|
|
|
|
// Multi-byte tokens.
|
|
|
|
'=' {
|
|
|
|
rdr.bump();
|
|
|
|
if rdr.curr() == '=' {
|
2010-08-31 13:29:00 -07:00
|
|
|
rdr.bump();
|
2011-07-27 14:19:39 +02:00
|
|
|
ret token::EQEQ;
|
|
|
|
} else { ret token::EQ; }
|
|
|
|
}
|
|
|
|
'!' {
|
|
|
|
rdr.bump();
|
|
|
|
if rdr.curr() == '=' {
|
2010-08-31 13:29:00 -07:00
|
|
|
rdr.bump();
|
2011-07-27 14:19:39 +02:00
|
|
|
ret token::NE;
|
|
|
|
} else { ret token::NOT; }
|
|
|
|
}
|
|
|
|
'<' {
|
|
|
|
rdr.bump();
|
|
|
|
alt rdr.curr() {
|
|
|
|
'=' { rdr.bump(); ret token::LE; }
|
|
|
|
'<' { ret binop(rdr, token::LSL); }
|
|
|
|
'|' { rdr.bump(); ret token::SEND; }
|
|
|
|
'-' {
|
2010-08-31 13:29:00 -07:00
|
|
|
rdr.bump();
|
2011-07-27 14:19:39 +02:00
|
|
|
alt rdr.curr() {
|
|
|
|
'>' { rdr.bump(); ret token::DARROW; }
|
|
|
|
_ { ret token::LARROW; }
|
2010-08-31 13:29:00 -07:00
|
|
|
}
|
2011-07-27 14:19:39 +02:00
|
|
|
}
|
|
|
|
_ { ret token::LT; }
|
2010-08-31 13:29:00 -07:00
|
|
|
}
|
2011-07-27 14:19:39 +02:00
|
|
|
}
|
|
|
|
'>' {
|
|
|
|
rdr.bump();
|
|
|
|
alt rdr.curr() {
|
|
|
|
'=' { rdr.bump(); ret token::GE; }
|
|
|
|
'>' {
|
|
|
|
if rdr.next() == '>' {
|
|
|
|
rdr.bump();
|
|
|
|
ret binop(rdr, token::ASR);
|
|
|
|
} else { ret binop(rdr, token::LSR); }
|
|
|
|
}
|
|
|
|
_ { ret token::GT; }
|
2010-08-20 15:36:48 -07:00
|
|
|
}
|
2011-07-27 14:19:39 +02:00
|
|
|
}
|
|
|
|
'\'' {
|
|
|
|
rdr.bump();
|
|
|
|
let c2 = rdr.curr();
|
|
|
|
rdr.bump();
|
|
|
|
if c2 == '\\' {
|
|
|
|
let escaped = rdr.curr();
|
2011-05-23 22:46:39 +02:00
|
|
|
rdr.bump();
|
2011-07-27 14:19:39 +02:00
|
|
|
alt escaped {
|
|
|
|
'n' { c2 = '\n'; }
|
|
|
|
'r' { c2 = '\r'; }
|
|
|
|
't' { c2 = '\t'; }
|
|
|
|
'\\' { c2 = '\\'; }
|
|
|
|
'\'' { c2 = '\''; }
|
|
|
|
'x' { c2 = scan_numeric_escape(rdr, 2u); }
|
|
|
|
'u' { c2 = scan_numeric_escape(rdr, 4u); }
|
|
|
|
'U' { c2 = scan_numeric_escape(rdr, 8u); }
|
|
|
|
c2 {
|
|
|
|
rdr.err(#fmt("unknown character escape: %d", c2 as int));
|
2010-08-24 08:56:42 -07:00
|
|
|
fail;
|
2011-07-27 14:19:39 +02:00
|
|
|
}
|
2010-08-24 08:56:42 -07:00
|
|
|
}
|
|
|
|
}
|
2011-07-27 14:19:39 +02:00
|
|
|
if rdr.curr() != '\'' {
|
|
|
|
rdr.err("unterminated character constant");
|
|
|
|
fail;
|
|
|
|
}
|
|
|
|
rdr.bump(); // advance curr past token
|
|
|
|
|
|
|
|
ret token::LIT_CHAR(c2);
|
|
|
|
}
|
|
|
|
'"' {
|
|
|
|
rdr.bump();
|
|
|
|
while rdr.curr() != '"' {
|
|
|
|
let ch = rdr.curr();
|
2010-08-27 12:36:57 -07:00
|
|
|
rdr.bump();
|
2011-07-27 14:19:39 +02:00
|
|
|
alt ch {
|
|
|
|
'\\' {
|
|
|
|
let escaped = rdr.curr();
|
2011-05-23 22:46:39 +02:00
|
|
|
rdr.bump();
|
2011-07-27 14:19:39 +02:00
|
|
|
alt escaped {
|
|
|
|
'n' { str::push_byte(accum_str, '\n' as u8); }
|
|
|
|
'r' { str::push_byte(accum_str, '\r' as u8); }
|
|
|
|
't' { str::push_byte(accum_str, '\t' as u8); }
|
|
|
|
'\\' { str::push_byte(accum_str, '\\' as u8); }
|
|
|
|
'"' { str::push_byte(accum_str, '"' as u8); }
|
|
|
|
'\n' { consume_whitespace(rdr); }
|
|
|
|
'x' {
|
|
|
|
str::push_char(accum_str, scan_numeric_escape(rdr, 2u));
|
|
|
|
}
|
|
|
|
'u' {
|
|
|
|
str::push_char(accum_str, scan_numeric_escape(rdr, 4u));
|
|
|
|
}
|
|
|
|
'U' {
|
|
|
|
str::push_char(accum_str, scan_numeric_escape(rdr, 8u));
|
|
|
|
}
|
|
|
|
c2 {
|
|
|
|
rdr.err(#fmt("unknown string escape: %d", c2 as int));
|
|
|
|
fail;
|
|
|
|
}
|
2010-08-24 08:56:42 -07:00
|
|
|
}
|
2011-07-27 14:19:39 +02:00
|
|
|
}
|
|
|
|
_ { str::push_char(accum_str, ch); }
|
2010-08-24 08:56:42 -07:00
|
|
|
}
|
2011-04-13 11:25:01 -07:00
|
|
|
}
|
2011-07-27 14:19:39 +02:00
|
|
|
rdr.bump();
|
|
|
|
ret token::LIT_STR(interner::intern[str](*rdr.get_interner(),
|
|
|
|
accum_str));
|
|
|
|
}
|
|
|
|
'-' {
|
|
|
|
if rdr.next() == '>' {
|
|
|
|
rdr.bump();
|
|
|
|
rdr.bump();
|
|
|
|
ret token::RARROW;
|
|
|
|
} else { ret binop(rdr, token::MINUS); }
|
|
|
|
}
|
|
|
|
'&' {
|
|
|
|
if rdr.next() == '&' {
|
|
|
|
rdr.bump();
|
|
|
|
rdr.bump();
|
|
|
|
ret token::ANDAND;
|
|
|
|
} else { ret binop(rdr, token::AND); }
|
|
|
|
}
|
|
|
|
'|' {
|
|
|
|
alt rdr.next() {
|
|
|
|
'|' { rdr.bump(); rdr.bump(); ret token::OROR; }
|
|
|
|
'>' { rdr.bump(); rdr.bump(); ret token::RECV; }
|
|
|
|
_ { ret binop(rdr, token::OR); }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
'+' { ret binop(rdr, token::PLUS); }
|
|
|
|
'*' { ret binop(rdr, token::STAR); }
|
|
|
|
'/' { ret binop(rdr, token::SLASH); }
|
|
|
|
'^' { ret binop(rdr, token::CARET); }
|
|
|
|
'%' { ret binop(rdr, token::PERCENT); }
|
|
|
|
c { rdr.err(#fmt("unkown start of token: %d", c as int)); fail; }
|
2010-08-20 14:34:48 -07:00
|
|
|
}
|
2010-07-14 09:41:36 -07:00
|
|
|
}
|
|
|
|
|
2011-05-30 14:10:54 -07:00
|
|
|
tag cmnt_style {
|
2011-06-15 11:19:50 -07:00
|
|
|
isolated; // No code on either side of each line of the comment
|
|
|
|
trailing; // Code exists to the left of the comment
|
|
|
|
mixed; // Code before /* foo */ and after the comment
|
2011-07-27 16:24:41 +02:00
|
|
|
blank_line; // Just a manual blank line "\n\n", for layout
|
2011-03-24 16:33:20 +01:00
|
|
|
}
|
2011-04-08 18:44:20 +02:00
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
type cmnt = {style: cmnt_style, lines: str[], pos: uint};
|
2011-03-24 16:33:20 +01:00
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn read_to_eol(rdr: &reader) -> str {
|
|
|
|
let val = "";
|
|
|
|
while rdr.curr() != '\n' && !rdr.is_eof() {
|
2011-05-30 14:10:54 -07:00
|
|
|
str::push_char(val, rdr.curr());
|
|
|
|
rdr.bump();
|
|
|
|
}
|
2011-07-27 14:19:39 +02:00
|
|
|
if rdr.curr() == '\n' { rdr.bump(); }
|
2011-05-30 14:10:54 -07:00
|
|
|
ret val;
|
2011-03-24 16:33:20 +01:00
|
|
|
}
|
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn read_one_line_comment(rdr: &reader) -> str {
|
|
|
|
let val = read_to_eol(rdr);
|
2011-06-15 11:19:50 -07:00
|
|
|
assert (val.(0) == '/' as u8 && val.(1) == '/' as u8);
|
2011-05-30 14:10:54 -07:00
|
|
|
ret val;
|
|
|
|
}
|
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn consume_whitespace(rdr: &reader) {
|
|
|
|
while is_whitespace(rdr.curr()) && !rdr.is_eof() { rdr.bump(); }
|
2011-03-24 16:33:20 +01:00
|
|
|
}
|
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn consume_non_eol_whitespace(rdr: &reader) {
|
|
|
|
while is_whitespace(rdr.curr()) && rdr.curr() != '\n' && !rdr.is_eof() {
|
2011-05-30 14:10:54 -07:00
|
|
|
rdr.bump();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn push_blank_line_comment(rdr: &reader, comments: &mutable cmnt[]) {
|
2011-07-25 17:09:45 -07:00
|
|
|
log ">>> blank-line comment";
|
2011-07-27 14:19:39 +02:00
|
|
|
let v: str[] = ~[];
|
|
|
|
comments += ~[{style: blank_line, lines: v, pos: rdr.get_chpos()}];
|
2011-07-25 17:09:45 -07:00
|
|
|
}
|
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn consume_whitespace_counting_blank_lines(rdr: &reader,
|
|
|
|
comments: &mutable cmnt[]) {
|
|
|
|
while is_whitespace(rdr.curr()) && !rdr.is_eof() {
|
2011-07-26 15:35:34 -07:00
|
|
|
if rdr.get_col() == 0u && rdr.curr() == '\n' {
|
2011-07-25 17:09:45 -07:00
|
|
|
push_blank_line_comment(rdr, comments);
|
2011-06-30 17:25:13 -07:00
|
|
|
}
|
|
|
|
rdr.bump();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn read_line_comments(rdr: &reader, code_to_the_left: bool) -> cmnt {
|
2011-05-30 14:10:54 -07:00
|
|
|
log ">>> line comments";
|
2011-07-27 14:19:39 +02:00
|
|
|
let p = rdr.get_chpos();
|
|
|
|
let lines: str[] = ~[];
|
|
|
|
while rdr.curr() == '/' && rdr.next() == '/' {
|
|
|
|
let line = read_one_line_comment(rdr);
|
2011-05-31 15:31:50 -07:00
|
|
|
log line;
|
2011-07-14 17:26:10 -07:00
|
|
|
lines += ~[line];
|
2011-05-30 14:10:54 -07:00
|
|
|
consume_non_eol_whitespace(rdr);
|
|
|
|
}
|
|
|
|
log "<<< line comments";
|
2011-07-27 14:19:39 +02:00
|
|
|
ret {style: if code_to_the_left { trailing } else { isolated },
|
|
|
|
lines: lines,
|
|
|
|
pos: p};
|
2011-05-30 14:10:54 -07:00
|
|
|
}
|
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn all_whitespace(s: &str, begin: uint, end: uint) -> bool {
|
|
|
|
let i: uint = begin;
|
|
|
|
while i != end {
|
|
|
|
if !is_whitespace(s.(i) as char) { ret false; }
|
2011-05-30 14:10:54 -07:00
|
|
|
i += 1u;
|
|
|
|
}
|
|
|
|
ret true;
|
|
|
|
}
|
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn trim_whitespace_prefix_and_push_line(lines: &mutable str[], s: &str,
|
|
|
|
col: uint) {
|
|
|
|
let s1;
|
|
|
|
if all_whitespace(s, 0u, col) {
|
|
|
|
if col < str::byte_len(s) {
|
2011-05-30 14:10:54 -07:00
|
|
|
s1 = str::slice(s, col, str::byte_len(s));
|
2011-06-15 11:19:50 -07:00
|
|
|
} else { s1 = ""; }
|
|
|
|
} else { s1 = s; }
|
2011-05-30 14:10:54 -07:00
|
|
|
log "pushing line: " + s1;
|
2011-07-14 17:26:10 -07:00
|
|
|
lines += ~[s1];
|
2011-05-30 14:10:54 -07:00
|
|
|
}
|
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn read_block_comment(rdr: &reader, code_to_the_left: bool) -> cmnt {
|
2011-05-30 14:10:54 -07:00
|
|
|
log ">>> block comment";
|
2011-07-27 14:19:39 +02:00
|
|
|
let p = rdr.get_chpos();
|
|
|
|
let lines: str[] = ~[];
|
|
|
|
let col: uint = rdr.get_col();
|
2011-05-30 14:10:54 -07:00
|
|
|
rdr.bump();
|
|
|
|
rdr.bump();
|
2011-07-27 14:19:39 +02:00
|
|
|
let curr_line = "/*";
|
|
|
|
let level: int = 1;
|
|
|
|
while level > 0 {
|
2011-05-30 14:10:54 -07:00
|
|
|
log #fmt("=== block comment level %d", level);
|
2011-07-27 14:19:39 +02:00
|
|
|
if rdr.is_eof() { rdr.err("unterminated block comment"); fail; }
|
|
|
|
if rdr.curr() == '\n' {
|
2011-05-30 14:10:54 -07:00
|
|
|
trim_whitespace_prefix_and_push_line(lines, curr_line, col);
|
|
|
|
curr_line = "";
|
|
|
|
rdr.bump();
|
|
|
|
} else {
|
|
|
|
str::push_char(curr_line, rdr.curr());
|
2011-07-27 14:19:39 +02:00
|
|
|
if rdr.curr() == '/' && rdr.next() == '*' {
|
2011-05-30 14:10:54 -07:00
|
|
|
rdr.bump();
|
|
|
|
rdr.bump();
|
|
|
|
curr_line += "*";
|
|
|
|
level += 1;
|
|
|
|
} else {
|
2011-07-27 14:19:39 +02:00
|
|
|
if rdr.curr() == '*' && rdr.next() == '/' {
|
2011-05-30 14:10:54 -07:00
|
|
|
rdr.bump();
|
|
|
|
rdr.bump();
|
|
|
|
curr_line += "/";
|
|
|
|
level -= 1;
|
2011-06-15 11:19:50 -07:00
|
|
|
} else { rdr.bump(); }
|
2011-05-30 14:10:54 -07:00
|
|
|
}
|
|
|
|
}
|
2011-03-24 16:33:20 +01:00
|
|
|
}
|
2011-07-27 14:19:39 +02:00
|
|
|
if str::byte_len(curr_line) != 0u {
|
2011-05-30 14:10:54 -07:00
|
|
|
trim_whitespace_prefix_and_push_line(lines, curr_line, col);
|
|
|
|
}
|
2011-07-27 14:19:39 +02:00
|
|
|
let style = if code_to_the_left { trailing } else { isolated };
|
2011-05-30 14:10:54 -07:00
|
|
|
consume_non_eol_whitespace(rdr);
|
2011-07-27 14:19:39 +02:00
|
|
|
if !rdr.is_eof() && rdr.curr() != '\n' && ivec::len(lines) == 1u {
|
2011-05-30 14:10:54 -07:00
|
|
|
style = mixed;
|
|
|
|
}
|
|
|
|
log "<<< block comment";
|
2011-07-27 14:19:39 +02:00
|
|
|
ret {style: style, lines: lines, pos: p};
|
2011-05-30 14:10:54 -07:00
|
|
|
}
|
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn peeking_at_comment(rdr: &reader) -> bool {
|
2011-06-15 11:19:50 -07:00
|
|
|
ret rdr.curr() == '/' && rdr.next() == '/' ||
|
|
|
|
rdr.curr() == '/' && rdr.next() == '*';
|
2011-05-30 14:10:54 -07:00
|
|
|
}
|
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn consume_comment(rdr: &reader, code_to_the_left: bool,
|
|
|
|
comments: &mutable cmnt[]) {
|
2011-05-30 14:10:54 -07:00
|
|
|
log ">>> consume comment";
|
2011-07-27 14:19:39 +02:00
|
|
|
if rdr.curr() == '/' && rdr.next() == '/' {
|
2011-07-12 16:13:30 -07:00
|
|
|
comments += ~[read_line_comments(rdr, code_to_the_left)];
|
2011-05-30 14:10:54 -07:00
|
|
|
} else if (rdr.curr() == '/' && rdr.next() == '*') {
|
2011-07-12 16:13:30 -07:00
|
|
|
comments += ~[read_block_comment(rdr, code_to_the_left)];
|
2011-05-30 14:10:54 -07:00
|
|
|
} else { fail; }
|
|
|
|
log "<<< consume comment";
|
2011-03-24 16:33:20 +01:00
|
|
|
}
|
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
fn is_lit(t: &token::token) -> bool {
|
|
|
|
ret alt t {
|
|
|
|
token::LIT_INT(_) { true }
|
|
|
|
token::LIT_UINT(_) { true }
|
|
|
|
token::LIT_MACH_INT(_, _) { true }
|
|
|
|
token::LIT_FLOAT(_) { true }
|
|
|
|
token::LIT_MACH_FLOAT(_, _) { true }
|
|
|
|
token::LIT_STR(_) { true }
|
|
|
|
token::LIT_CHAR(_) { true }
|
|
|
|
token::LIT_BOOL(_) { true }
|
|
|
|
_ { false }
|
2011-06-15 11:19:50 -07:00
|
|
|
}
|
2011-06-02 17:18:43 -07:00
|
|
|
}
|
|
|
|
|
2011-07-27 14:19:39 +02:00
|
|
|
type lit = {lit: str, pos: uint};
|
|
|
|
|
|
|
|
fn gather_comments_and_literals(cm: &codemap::codemap, path: str,
|
|
|
|
srdr: ioivec::reader) ->
|
|
|
|
{cmnts: cmnt[], lits: lit[]} {
|
|
|
|
let src = str::unsafe_from_bytes_ivec(srdr.read_whole_stream());
|
|
|
|
let itr = @interner::mk[str](str::hash, str::eq);
|
|
|
|
let rdr = new_reader(cm, src, codemap::new_filemap(path, 0u, 0u), itr);
|
|
|
|
let comments: cmnt[] = ~[];
|
|
|
|
let literals: lit[] = ~[];
|
|
|
|
let first_read: bool = true;
|
|
|
|
while !rdr.is_eof() {
|
|
|
|
while true {
|
|
|
|
let code_to_the_left = !first_read;
|
2011-05-30 14:10:54 -07:00
|
|
|
consume_non_eol_whitespace(rdr);
|
2011-07-27 14:19:39 +02:00
|
|
|
if rdr.curr() == '\n' {
|
2011-05-30 14:10:54 -07:00
|
|
|
code_to_the_left = false;
|
2011-06-30 17:25:13 -07:00
|
|
|
consume_whitespace_counting_blank_lines(rdr, comments);
|
2011-05-30 14:10:54 -07:00
|
|
|
}
|
2011-07-27 14:19:39 +02:00
|
|
|
while peeking_at_comment(rdr) {
|
2011-05-30 14:10:54 -07:00
|
|
|
consume_comment(rdr, code_to_the_left, comments);
|
2011-06-30 17:25:13 -07:00
|
|
|
consume_whitespace_counting_blank_lines(rdr, comments);
|
2011-05-30 14:10:54 -07:00
|
|
|
}
|
|
|
|
break;
|
2011-03-24 16:33:20 +01:00
|
|
|
}
|
2011-07-27 14:19:39 +02:00
|
|
|
let tok = next_token(rdr);
|
|
|
|
if is_lit(tok.tok) {
|
|
|
|
literals += ~[{lit: rdr.get_str_from(tok.bpos), pos: tok.chpos}];
|
2011-06-02 17:18:43 -07:00
|
|
|
}
|
2011-07-26 14:06:02 +02:00
|
|
|
log "tok: " + token::to_str(rdr, tok.tok);
|
2011-06-14 11:11:22 -07:00
|
|
|
first_read = false;
|
2011-03-24 16:33:20 +01:00
|
|
|
}
|
2011-07-27 14:19:39 +02:00
|
|
|
ret {cmnts: comments, lits: literals};
|
2011-06-15 11:19:50 -07:00
|
|
|
}
|
2010-08-12 10:29:23 -07:00
|
|
|
//
|
|
|
|
// Local Variables:
|
|
|
|
// mode: rust
|
|
|
|
// fill-column: 78;
|
|
|
|
// indent-tabs-mode: nil
|
|
|
|
// c-basic-offset: 4
|
|
|
|
// buffer-file-coding-system: utf-8-unix
|
2011-03-25 15:07:27 -07:00
|
|
|
// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
|
2010-08-12 10:29:23 -07:00
|
|
|
// End:
|
|
|
|
//
|