2012-07-17 18:22:11 +00:00
|
|
|
import util::interner::interner;
|
2012-06-27 22:29:35 +00:00
|
|
|
import diagnostic::span_handler;
|
2012-06-15 16:32:17 +00:00
|
|
|
import codemap::span;
|
2012-06-27 22:29:35 +00:00
|
|
|
import ext::tt::transcribe::{tt_reader, new_tt_reader, dup_tt_reader,
|
|
|
|
tt_next_token};
|
2011-06-15 18:19:50 +00:00
|
|
|
|
2012-05-30 18:36:30 +00:00
|
|
|
export reader, string_reader, new_string_reader, is_whitespace;
|
2012-06-27 22:29:35 +00:00
|
|
|
export tt_reader, new_tt_reader;
|
2012-06-15 16:32:17 +00:00
|
|
|
export nextch, is_eof, bump, get_str_from, new_low_level_string_reader;
|
2012-06-05 01:18:47 +00:00
|
|
|
export string_reader_as_reader, tt_reader_as_reader;
|
2012-05-30 18:36:30 +00:00
|
|
|
|
|
|
|
iface reader {
|
|
|
|
fn is_eof() -> bool;
|
2012-06-15 16:32:17 +00:00
|
|
|
fn next_token() -> {tok: token::token, sp: span};
|
2012-07-14 05:57:48 +00:00
|
|
|
fn fatal(~str) -> !;
|
2012-06-27 22:29:35 +00:00
|
|
|
fn span_diag() -> span_handler;
|
2012-07-26 02:13:58 +00:00
|
|
|
pure fn interner() -> @interner<@~str>;
|
2012-06-12 17:59:50 +00:00
|
|
|
fn peek() -> {tok: token::token, sp: span};
|
|
|
|
fn dup() -> reader;
|
2012-05-30 18:36:30 +00:00
|
|
|
}
|
2012-04-15 10:49:59 +00:00
|
|
|
|
2012-05-30 18:36:30 +00:00
|
|
|
type string_reader = @{
|
2012-06-27 22:29:35 +00:00
|
|
|
span_diagnostic: span_handler,
|
2012-07-14 05:57:48 +00:00
|
|
|
src: @~str,
|
2012-03-27 01:35:18 +00:00
|
|
|
mut col: uint,
|
|
|
|
mut pos: uint,
|
|
|
|
mut curr: char,
|
|
|
|
mut chpos: uint,
|
2012-01-13 08:56:53 +00:00
|
|
|
filemap: codemap::filemap,
|
2012-07-14 05:57:48 +00:00
|
|
|
interner: @interner<@~str>,
|
2012-06-12 17:59:50 +00:00
|
|
|
/* cached: */
|
|
|
|
mut peek_tok: token::token,
|
|
|
|
mut peek_span: span
|
2012-01-13 08:56:53 +00:00
|
|
|
};
|
|
|
|
|
2012-06-27 22:29:35 +00:00
|
|
|
fn new_string_reader(span_diagnostic: span_handler,
|
2012-06-05 01:18:47 +00:00
|
|
|
filemap: codemap::filemap,
|
2012-07-14 05:57:48 +00:00
|
|
|
itr: @interner<@~str>) -> string_reader {
|
2012-06-15 16:32:17 +00:00
|
|
|
let r = new_low_level_string_reader(span_diagnostic, filemap, itr);
|
2012-06-12 17:59:50 +00:00
|
|
|
string_advance_token(r); /* fill in peek_* */
|
2012-06-15 16:32:17 +00:00
|
|
|
ret r;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* For comments.rs, which hackily pokes into 'pos' and 'curr' */
|
2012-06-27 22:29:35 +00:00
|
|
|
fn new_low_level_string_reader(span_diagnostic: span_handler,
|
2012-06-15 16:32:17 +00:00
|
|
|
filemap: codemap::filemap,
|
2012-07-14 05:57:48 +00:00
|
|
|
itr: @interner<@~str>)
|
2012-06-15 16:32:17 +00:00
|
|
|
-> string_reader {
|
2012-06-05 01:18:47 +00:00
|
|
|
let r = @{span_diagnostic: span_diagnostic, src: filemap.src,
|
|
|
|
mut col: 0u, mut pos: 0u, mut curr: -1 as char,
|
|
|
|
mut chpos: filemap.start_pos.ch,
|
2012-06-12 17:59:50 +00:00
|
|
|
filemap: filemap, interner: itr,
|
|
|
|
/* dummy values; not read */
|
|
|
|
mut peek_tok: token::EOF,
|
|
|
|
mut peek_span: ast_util::mk_sp(0u,0u)};
|
2012-06-05 01:18:47 +00:00
|
|
|
if r.pos < (*filemap.src).len() {
|
|
|
|
let next = str::char_range_at(*r.src, r.pos);
|
|
|
|
r.pos = next.next;
|
|
|
|
r.curr = next.ch;
|
|
|
|
}
|
|
|
|
ret r;
|
|
|
|
}
|
|
|
|
|
2012-06-12 17:59:50 +00:00
|
|
|
fn dup_string_reader(&&r: string_reader) -> string_reader {
|
|
|
|
@{span_diagnostic: r.span_diagnostic, src: r.src,
|
|
|
|
mut col: r.col, mut pos: r.pos, mut curr: r.curr, mut chpos: r.chpos,
|
|
|
|
filemap: r.filemap, interner: r.interner,
|
|
|
|
mut peek_tok: r.peek_tok, mut peek_span: r.peek_span}
|
|
|
|
}
|
|
|
|
|
2012-05-30 18:36:30 +00:00
|
|
|
impl string_reader_as_reader of reader for string_reader {
|
|
|
|
fn is_eof() -> bool { is_eof(self) }
|
2012-06-15 16:32:17 +00:00
|
|
|
fn next_token() -> {tok: token::token, sp: span} {
|
2012-06-12 17:59:50 +00:00
|
|
|
let ret_val = {tok: self.peek_tok, sp: self.peek_span};
|
|
|
|
string_advance_token(self);
|
|
|
|
ret ret_val;
|
2012-01-13 08:56:53 +00:00
|
|
|
}
|
2012-07-14 05:57:48 +00:00
|
|
|
fn fatal(m: ~str) -> ! {
|
2012-06-12 17:59:50 +00:00
|
|
|
self.span_diagnostic.span_fatal(copy self.peek_span, m)
|
2012-01-13 08:56:53 +00:00
|
|
|
}
|
2012-06-27 22:29:35 +00:00
|
|
|
fn span_diag() -> span_handler { self.span_diagnostic }
|
2012-07-26 02:13:58 +00:00
|
|
|
pure fn interner() -> @interner<@~str> { self.interner }
|
2012-06-12 17:59:50 +00:00
|
|
|
fn peek() -> {tok: token::token, sp: span} {
|
|
|
|
{tok: self.peek_tok, sp: self.peek_span}
|
|
|
|
}
|
|
|
|
fn dup() -> reader { dup_string_reader(self) as reader }
|
2012-06-01 22:52:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
impl tt_reader_as_reader of reader for tt_reader {
|
|
|
|
fn is_eof() -> bool { self.cur_tok == token::EOF }
|
2012-06-15 16:32:17 +00:00
|
|
|
fn next_token() -> {tok: token::token, sp: span} {
|
2012-06-08 01:01:58 +00:00
|
|
|
/* weird resolve bug: if the following `if`, or any of its
|
|
|
|
statements are removed, we get resolution errors */
|
|
|
|
if false {
|
|
|
|
let _ignore_me = 0;
|
|
|
|
let _me_too = self.cur.readme[self.cur.idx];
|
2012-06-01 22:52:07 +00:00
|
|
|
}
|
2012-06-08 01:01:58 +00:00
|
|
|
tt_next_token(self)
|
2012-06-01 22:52:07 +00:00
|
|
|
}
|
2012-07-14 05:57:48 +00:00
|
|
|
fn fatal(m: ~str) -> ! {
|
2012-07-07 01:04:28 +00:00
|
|
|
self.sp_diag.span_fatal(copy self.cur_span, m);
|
2012-06-01 22:52:07 +00:00
|
|
|
}
|
2012-07-07 01:04:28 +00:00
|
|
|
fn span_diag() -> span_handler { self.sp_diag }
|
2012-07-26 02:13:58 +00:00
|
|
|
pure fn interner() -> @interner<@~str> { self.interner }
|
2012-06-12 17:59:50 +00:00
|
|
|
fn peek() -> {tok: token::token, sp: span} {
|
|
|
|
{ tok: self.cur_tok, sp: self.cur_span }
|
|
|
|
}
|
|
|
|
fn dup() -> reader { dup_tt_reader(self) as reader }
|
2012-01-13 08:56:53 +00:00
|
|
|
}
|
2011-06-15 18:19:50 +00:00
|
|
|
|
2012-06-15 16:32:17 +00:00
|
|
|
fn string_advance_token(&&r: string_reader) {
|
2012-07-02 21:44:31 +00:00
|
|
|
for consume_whitespace_and_comments(r).each |comment| {
|
2012-06-30 10:54:54 +00:00
|
|
|
r.peek_tok = comment.tok;
|
|
|
|
r.peek_span = comment.sp;
|
|
|
|
ret;
|
|
|
|
}
|
2012-06-15 16:32:17 +00:00
|
|
|
|
2012-06-12 17:59:50 +00:00
|
|
|
if is_eof(r) {
|
|
|
|
r.peek_tok = token::EOF;
|
|
|
|
} else {
|
|
|
|
let start_chpos = r.chpos;
|
|
|
|
r.peek_tok = next_token_inner(r);
|
|
|
|
r.peek_span = ast_util::mk_sp(start_chpos, r.chpos);
|
|
|
|
};
|
|
|
|
|
2012-06-15 16:32:17 +00:00
|
|
|
}
|
|
|
|
|
2012-07-14 05:57:48 +00:00
|
|
|
fn get_str_from(rdr: string_reader, start: uint) -> ~str unsafe {
|
2012-05-30 18:36:30 +00:00
|
|
|
// I'm pretty skeptical about this subtraction. What if there's a
|
|
|
|
// multi-byte character before the mark?
|
|
|
|
ret str::slice(*rdr.src, start - 1u, rdr.pos - 1u);
|
|
|
|
}
|
|
|
|
|
|
|
|
fn bump(rdr: string_reader) {
|
|
|
|
if rdr.pos < (*rdr.src).len() {
|
|
|
|
rdr.col += 1u;
|
|
|
|
rdr.chpos += 1u;
|
|
|
|
if rdr.curr == '\n' {
|
|
|
|
codemap::next_line(rdr.filemap, rdr.chpos, rdr.pos);
|
|
|
|
rdr.col = 0u;
|
|
|
|
}
|
|
|
|
let next = str::char_range_at(*rdr.src, rdr.pos);
|
|
|
|
rdr.pos = next.next;
|
|
|
|
rdr.curr = next.ch;
|
|
|
|
} else {
|
|
|
|
if (rdr.curr != -1 as char) {
|
|
|
|
rdr.col += 1u;
|
|
|
|
rdr.chpos += 1u;
|
|
|
|
rdr.curr = -1 as char;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
fn is_eof(rdr: string_reader) -> bool {
|
|
|
|
rdr.curr == -1 as char
|
|
|
|
}
|
|
|
|
fn nextch(rdr: string_reader) -> char {
|
|
|
|
if rdr.pos < (*rdr.src).len() {
|
|
|
|
ret str::char_at(*rdr.src, rdr.pos);
|
|
|
|
} else { ret -1 as char; }
|
|
|
|
}
|
|
|
|
|
2011-07-27 12:19:39 +00:00
|
|
|
fn dec_digit_val(c: char) -> int { ret (c as int) - ('0' as int); }
|
2010-08-31 18:36:36 +00:00
|
|
|
|
2011-07-27 12:19:39 +00: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 18:36:36 +00:00
|
|
|
fail;
|
|
|
|
}
|
|
|
|
|
2011-07-27 12:19:39 +00:00
|
|
|
fn bin_digit_value(c: char) -> int { if c == '0' { ret 0; } ret 1; }
|
2010-08-31 18:36:36 +00:00
|
|
|
|
2011-07-27 12:19:39 +00:00
|
|
|
fn is_whitespace(c: char) -> bool {
|
2010-08-20 22:36:48 +00:00
|
|
|
ret c == ' ' || c == '\t' || c == '\r' || c == '\n';
|
2010-08-20 01:42:17 +00:00
|
|
|
}
|
|
|
|
|
2011-07-27 12:19:39 +00:00
|
|
|
fn may_begin_ident(c: char) -> bool { ret is_alpha(c) || c == '_'; }
|
2011-07-05 09:48:19 +00:00
|
|
|
|
2011-07-27 12:19:39 +00:00
|
|
|
fn in_range(c: char, lo: char, hi: char) -> bool { ret lo <= c && c <= hi; }
|
2011-07-05 09:48:19 +00:00
|
|
|
|
2011-07-27 12:19:39 +00:00
|
|
|
fn is_alpha(c: char) -> bool {
|
2011-07-05 09:48:19 +00:00
|
|
|
ret in_range(c, 'a', 'z') || in_range(c, 'A', 'Z');
|
|
|
|
}
|
|
|
|
|
2011-07-27 12:19:39 +00:00
|
|
|
fn is_dec_digit(c: char) -> bool { ret in_range(c, '0', '9'); }
|
2011-07-05 09:48:19 +00:00
|
|
|
|
2011-07-27 12:19:39 +00:00
|
|
|
fn is_alnum(c: char) -> bool { ret is_alpha(c) || is_dec_digit(c); }
|
2011-07-05 09:48:19 +00:00
|
|
|
|
2011-07-27 12:19:39 +00:00
|
|
|
fn is_hex_digit(c: char) -> bool {
|
2011-07-05 09:48:19 +00:00
|
|
|
ret in_range(c, '0', '9') || in_range(c, 'a', 'f') ||
|
|
|
|
in_range(c, 'A', 'F');
|
|
|
|
}
|
|
|
|
|
2011-07-27 12:19:39 +00:00
|
|
|
fn is_bin_digit(c: char) -> bool { ret c == '0' || c == '1'; }
|
2011-07-05 09:48:19 +00:00
|
|
|
|
2012-06-30 10:54:54 +00:00
|
|
|
// might return a sugared-doc-attr
|
|
|
|
fn consume_whitespace_and_comments(rdr: string_reader)
|
|
|
|
-> option<{tok: token::token, sp: span}> {
|
2012-05-30 18:36:30 +00:00
|
|
|
while is_whitespace(rdr.curr) { bump(rdr); }
|
2012-05-14 23:55:01 +00:00
|
|
|
ret consume_any_line_comment(rdr);
|
2010-08-24 02:17:04 +00:00
|
|
|
}
|
|
|
|
|
2012-06-30 10:54:54 +00:00
|
|
|
// might return a sugared-doc-attr
|
|
|
|
fn consume_any_line_comment(rdr: string_reader)
|
|
|
|
-> option<{tok: token::token, sp: span}> {
|
2012-01-13 08:56:53 +00:00
|
|
|
if rdr.curr == '/' {
|
2012-05-30 18:36:30 +00:00
|
|
|
alt nextch(rdr) {
|
2011-07-27 12:19:39 +00:00
|
|
|
'/' {
|
2012-06-30 10:54:54 +00:00
|
|
|
bump(rdr);
|
|
|
|
bump(rdr);
|
|
|
|
// line comments starting with "///" or "//!" are doc-comments
|
|
|
|
if rdr.curr == '/' || rdr.curr == '!' {
|
|
|
|
let start_chpos = rdr.chpos - 2u;
|
2012-07-14 05:57:48 +00:00
|
|
|
let mut acc = ~"//";
|
2012-06-30 10:54:54 +00:00
|
|
|
while rdr.curr != '\n' && !is_eof(rdr) {
|
|
|
|
str::push_char(acc, rdr.curr);
|
|
|
|
bump(rdr);
|
|
|
|
}
|
|
|
|
ret some({
|
2012-07-18 00:05:38 +00:00
|
|
|
tok: token::DOC_COMMENT((*rdr.interner).intern(@acc)),
|
2012-06-30 10:54:54 +00:00
|
|
|
sp: ast_util::mk_sp(start_chpos, rdr.chpos)
|
|
|
|
});
|
|
|
|
} else {
|
|
|
|
while rdr.curr != '\n' && !is_eof(rdr) { bump(rdr); }
|
|
|
|
// Restart whitespace munch.
|
|
|
|
ret consume_whitespace_and_comments(rdr);
|
|
|
|
}
|
2011-07-27 12:19:39 +00:00
|
|
|
}
|
2012-05-30 18:36:30 +00:00
|
|
|
'*' { bump(rdr); bump(rdr); ret consume_block_comment(rdr); }
|
2012-06-30 10:54:54 +00:00
|
|
|
_ {}
|
2010-08-24 02:17:04 +00:00
|
|
|
}
|
2012-05-23 00:27:20 +00:00
|
|
|
} else if rdr.curr == '#' {
|
2012-05-30 18:36:30 +00:00
|
|
|
if nextch(rdr) == '!' {
|
2012-05-23 00:27:20 +00:00
|
|
|
let cmap = codemap::new_codemap();
|
|
|
|
(*cmap).files.push(rdr.filemap);
|
2012-05-23 01:13:24 +00:00
|
|
|
let loc = codemap::lookup_char_pos_adj(cmap, rdr.chpos);
|
2012-05-23 00:27:20 +00:00
|
|
|
if loc.line == 1u && loc.col == 0u {
|
2012-05-30 18:36:30 +00:00
|
|
|
while rdr.curr != '\n' && !is_eof(rdr) { bump(rdr); }
|
2012-05-23 00:27:20 +00:00
|
|
|
ret consume_whitespace_and_comments(rdr);
|
|
|
|
}
|
|
|
|
}
|
2010-08-24 02:17:04 +00:00
|
|
|
}
|
2012-06-30 10:54:54 +00:00
|
|
|
ret none;
|
2010-08-24 02:17:04 +00:00
|
|
|
}
|
|
|
|
|
2012-06-30 10:54:54 +00:00
|
|
|
// might return a sugared-doc-attr
|
|
|
|
fn consume_block_comment(rdr: string_reader)
|
|
|
|
-> option<{tok: token::token, sp: span}> {
|
|
|
|
|
|
|
|
// block comments starting with "/**" or "/*!" are doc-comments
|
|
|
|
if rdr.curr == '*' || rdr.curr == '!' {
|
|
|
|
let start_chpos = rdr.chpos - 2u;
|
2012-07-14 05:57:48 +00:00
|
|
|
let mut acc = ~"/*";
|
2012-06-30 10:54:54 +00:00
|
|
|
while !(rdr.curr == '*' && nextch(rdr) == '/') && !is_eof(rdr) {
|
|
|
|
str::push_char(acc, rdr.curr);
|
|
|
|
bump(rdr);
|
|
|
|
}
|
|
|
|
if is_eof(rdr) {
|
2012-07-14 05:57:48 +00:00
|
|
|
rdr.fatal(~"unterminated block doc-comment");
|
2012-06-30 10:54:54 +00:00
|
|
|
} else {
|
2012-07-14 05:57:48 +00:00
|
|
|
acc += ~"*/";
|
2012-06-30 10:54:54 +00:00
|
|
|
bump(rdr);
|
|
|
|
bump(rdr);
|
|
|
|
ret some({
|
2012-07-18 00:05:38 +00:00
|
|
|
tok: token::DOC_COMMENT((*rdr.interner).intern(@acc)),
|
2012-06-30 10:54:54 +00:00
|
|
|
sp: ast_util::mk_sp(start_chpos, rdr.chpos)
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-15 13:47:03 +00:00
|
|
|
let mut level: int = 1;
|
2011-07-27 12:19:39 +00:00
|
|
|
while level > 0 {
|
2012-07-14 05:57:48 +00:00
|
|
|
if is_eof(rdr) { rdr.fatal(~"unterminated block comment"); }
|
2012-05-30 18:36:30 +00:00
|
|
|
if rdr.curr == '/' && nextch(rdr) == '*' {
|
|
|
|
bump(rdr);
|
|
|
|
bump(rdr);
|
2010-08-31 20:29:00 +00:00
|
|
|
level += 1;
|
|
|
|
} else {
|
2012-05-30 18:36:30 +00:00
|
|
|
if rdr.curr == '*' && nextch(rdr) == '/' {
|
|
|
|
bump(rdr);
|
|
|
|
bump(rdr);
|
2010-08-31 20:29:00 +00:00
|
|
|
level -= 1;
|
2012-05-30 18:36:30 +00:00
|
|
|
} else { bump(rdr); }
|
2010-08-31 20:29:00 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
// restart whitespace munch.
|
2011-06-15 18:19:50 +00:00
|
|
|
|
2012-05-14 23:55:01 +00:00
|
|
|
ret consume_whitespace_and_comments(rdr);
|
2010-08-31 20:29:00 +00:00
|
|
|
}
|
|
|
|
|
2012-07-14 05:57:48 +00:00
|
|
|
fn scan_exponent(rdr: string_reader) -> option<~str> {
|
2012-03-15 13:47:03 +00:00
|
|
|
let mut c = rdr.curr;
|
2012-07-14 05:57:48 +00:00
|
|
|
let mut rslt = ~"";
|
2011-07-27 12:19:39 +00:00
|
|
|
if c == 'e' || c == 'E' {
|
2012-02-12 07:49:03 +00:00
|
|
|
str::push_char(rslt, c);
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
2012-01-13 08:56:53 +00:00
|
|
|
c = rdr.curr;
|
2011-07-27 12:19:39 +00:00
|
|
|
if c == '-' || c == '+' {
|
2012-02-12 07:49:03 +00:00
|
|
|
str::push_char(rslt, c);
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
2011-03-23 00:25:40 +00:00
|
|
|
}
|
2011-12-07 20:06:12 +00:00
|
|
|
let exponent = scan_digits(rdr, 10u);
|
2012-02-23 09:44:04 +00:00
|
|
|
if str::len(exponent) > 0u {
|
2011-06-24 17:04:08 +00:00
|
|
|
ret some(rslt + exponent);
|
2012-07-14 05:57:48 +00:00
|
|
|
} else { rdr.fatal(~"scan_exponent: bad fp literal"); }
|
|
|
|
} else { ret none::<~str>; }
|
2011-03-25 00:12:24 +00:00
|
|
|
}
|
|
|
|
|
2012-07-14 05:57:48 +00:00
|
|
|
fn scan_digits(rdr: string_reader, radix: uint) -> ~str {
|
|
|
|
let mut rslt = ~"";
|
2012-03-11 04:34:17 +00:00
|
|
|
loop {
|
2012-01-13 08:56:53 +00:00
|
|
|
let c = rdr.curr;
|
2012-07-09 21:37:48 +00:00
|
|
|
if c == '_' { bump(rdr); again; }
|
2012-02-22 12:18:15 +00:00
|
|
|
alt char::to_digit(c, radix) {
|
|
|
|
some(d) {
|
2012-02-12 07:49:03 +00:00
|
|
|
str::push_char(rslt, c);
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
2011-12-07 20:06:12 +00:00
|
|
|
}
|
2012-03-11 04:34:17 +00:00
|
|
|
_ { ret rslt; }
|
2011-12-07 20:06:12 +00:00
|
|
|
}
|
2012-03-11 04:34:17 +00:00
|
|
|
};
|
2011-03-23 00:25:40 +00:00
|
|
|
}
|
|
|
|
|
2012-05-30 18:36:30 +00:00
|
|
|
fn scan_number(c: char, rdr: string_reader) -> token::token {
|
|
|
|
let mut num_str, base = 10u, c = c, n = nextch(rdr);
|
2011-07-27 12:19:39 +00:00
|
|
|
if c == '0' && n == 'x' {
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
|
|
|
bump(rdr);
|
2011-12-07 20:06:12 +00:00
|
|
|
base = 16u;
|
2011-08-19 22:16:48 +00:00
|
|
|
} else if c == '0' && n == 'b' {
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
|
|
|
bump(rdr);
|
2011-12-07 20:06:12 +00:00
|
|
|
base = 2u;
|
2011-09-02 05:39:44 +00:00
|
|
|
}
|
2011-12-07 20:06:12 +00:00
|
|
|
num_str = scan_digits(rdr, base);
|
2012-01-13 08:56:53 +00:00
|
|
|
c = rdr.curr;
|
2012-05-30 18:36:30 +00:00
|
|
|
nextch(rdr);
|
2011-07-27 12:19:39 +00:00
|
|
|
if c == 'u' || c == 'i' {
|
2012-03-15 13:47:03 +00:00
|
|
|
let signed = c == 'i';
|
|
|
|
let mut tp = {
|
|
|
|
if signed { either::left(ast::ty_i) }
|
|
|
|
else { either::right(ast::ty_u) }
|
|
|
|
};
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
2012-01-13 08:56:53 +00:00
|
|
|
c = rdr.curr;
|
2011-07-27 12:19:39 +00:00
|
|
|
if c == '8' {
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
2012-01-30 02:33:08 +00:00
|
|
|
tp = if signed { either::left(ast::ty_i8) }
|
|
|
|
else { either::right(ast::ty_u8) };
|
2010-11-23 01:41:26 +00:00
|
|
|
}
|
2012-05-30 18:36:30 +00:00
|
|
|
n = nextch(rdr);
|
2011-07-27 12:19:39 +00:00
|
|
|
if c == '1' && n == '6' {
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
|
|
|
bump(rdr);
|
2012-01-30 02:33:08 +00:00
|
|
|
tp = if signed { either::left(ast::ty_i16) }
|
|
|
|
else { either::right(ast::ty_u16) };
|
2011-12-07 20:06:12 +00:00
|
|
|
} else if c == '3' && n == '2' {
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
|
|
|
bump(rdr);
|
2012-01-30 02:33:08 +00:00
|
|
|
tp = if signed { either::left(ast::ty_i32) }
|
|
|
|
else { either::right(ast::ty_u32) };
|
2011-12-07 20:06:12 +00:00
|
|
|
} else if c == '6' && n == '4' {
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
|
|
|
bump(rdr);
|
2012-01-30 02:33:08 +00:00
|
|
|
tp = if signed { either::left(ast::ty_i64) }
|
|
|
|
else { either::right(ast::ty_u64) };
|
2010-11-23 01:41:26 +00:00
|
|
|
}
|
2012-02-23 09:44:04 +00:00
|
|
|
if str::len(num_str) == 0u {
|
2012-07-14 05:57:48 +00:00
|
|
|
rdr.fatal(~"no valid digits found for number");
|
2012-02-10 08:50:16 +00:00
|
|
|
}
|
2012-05-16 05:50:29 +00:00
|
|
|
let parsed = option::get(u64::from_str_radix(num_str, base as u64));
|
2011-12-07 20:06:12 +00:00
|
|
|
alt tp {
|
|
|
|
either::left(t) { ret token::LIT_INT(parsed as i64, t); }
|
|
|
|
either::right(t) { ret token::LIT_UINT(parsed, t); }
|
2010-11-23 01:41:26 +00:00
|
|
|
}
|
|
|
|
}
|
2012-03-15 13:47:03 +00:00
|
|
|
let mut is_float = false;
|
2012-05-30 18:36:30 +00:00
|
|
|
if rdr.curr == '.' && !(is_alpha(nextch(rdr)) || nextch(rdr) == '_') {
|
2011-09-13 15:43:01 +00:00
|
|
|
is_float = true;
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
2011-12-07 20:06:12 +00:00
|
|
|
let dec_part = scan_digits(rdr, 10u);
|
2012-07-14 05:57:48 +00:00
|
|
|
num_str += ~"." + dec_part;
|
2011-09-13 15:43:01 +00:00
|
|
|
}
|
|
|
|
alt scan_exponent(rdr) {
|
|
|
|
some(s) {
|
|
|
|
is_float = true;
|
|
|
|
num_str += s;
|
|
|
|
}
|
2012-01-19 06:37:22 +00:00
|
|
|
none {}
|
2011-09-13 15:43:01 +00:00
|
|
|
}
|
2012-01-13 08:56:53 +00:00
|
|
|
if rdr.curr == 'f' {
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
2012-01-13 08:56:53 +00:00
|
|
|
c = rdr.curr;
|
2012-05-30 18:36:30 +00:00
|
|
|
n = nextch(rdr);
|
2011-09-13 15:43:01 +00:00
|
|
|
if c == '3' && n == '2' {
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
|
|
|
bump(rdr);
|
2012-07-18 00:05:38 +00:00
|
|
|
ret token::LIT_FLOAT((*rdr.interner).intern(@num_str),
|
|
|
|
ast::ty_f32);
|
2011-09-13 15:43:01 +00:00
|
|
|
} else if c == '6' && n == '4' {
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
|
|
|
bump(rdr);
|
2012-07-18 00:05:38 +00:00
|
|
|
ret token::LIT_FLOAT((*rdr.interner).intern(@num_str),
|
|
|
|
ast::ty_f64);
|
2012-06-21 23:44:10 +00:00
|
|
|
/* FIXME (#2252): 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 18:19:50 +00:00
|
|
|
} else {
|
2011-09-13 15:43:01 +00:00
|
|
|
is_float = true;
|
2011-03-23 00:25:40 +00:00
|
|
|
}
|
2011-03-22 00:12:05 +00:00
|
|
|
}
|
2011-09-13 15:43:01 +00:00
|
|
|
if is_float {
|
2012-07-18 00:05:38 +00:00
|
|
|
ret token::LIT_FLOAT((*rdr.interner).intern(@num_str), ast::ty_f);
|
2011-09-13 15:43:01 +00:00
|
|
|
} else {
|
2012-02-23 09:44:04 +00:00
|
|
|
if str::len(num_str) == 0u {
|
2012-07-14 05:57:48 +00:00
|
|
|
rdr.fatal(~"no valid digits found for number");
|
2012-02-10 08:50:16 +00:00
|
|
|
}
|
2012-05-16 05:50:29 +00:00
|
|
|
let parsed = option::get(u64::from_str_radix(num_str, base as u64));
|
2012-06-11 23:31:03 +00:00
|
|
|
|
2012-07-30 23:01:07 +00:00
|
|
|
debug!{"lexing %s as an unsuffixed integer literal",
|
|
|
|
num_str};
|
2012-06-15 02:41:40 +00:00
|
|
|
ret token::LIT_INT_UNSUFFIXED(parsed as i64);
|
2011-03-22 00:12:05 +00:00
|
|
|
}
|
2010-11-23 01:41:26 +00:00
|
|
|
}
|
|
|
|
|
2012-05-30 18:36:30 +00:00
|
|
|
fn scan_numeric_escape(rdr: string_reader, n_hex_digits: uint) -> char {
|
2012-03-15 13:47:03 +00:00
|
|
|
let mut accum_int = 0, i = n_hex_digits;
|
2011-11-03 09:57:54 +00:00
|
|
|
while i != 0u {
|
2012-01-13 08:56:53 +00:00
|
|
|
let n = rdr.curr;
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
2011-07-27 12:19:39 +00:00
|
|
|
if !is_hex_digit(n) {
|
2012-07-30 23:01:07 +00:00
|
|
|
rdr.fatal(fmt!{"illegal numeric character escape: %d", n as int});
|
2011-04-13 18:25:01 +00:00
|
|
|
}
|
|
|
|
accum_int *= 16;
|
|
|
|
accum_int += hex_digit_val(n);
|
2011-11-03 09:57:54 +00:00
|
|
|
i -= 1u;
|
2011-04-13 18:25:01 +00:00
|
|
|
}
|
|
|
|
ret accum_int as char;
|
|
|
|
}
|
|
|
|
|
2012-05-30 18:36:30 +00:00
|
|
|
fn next_token_inner(rdr: string_reader) -> token::token {
|
2012-07-14 05:57:48 +00:00
|
|
|
let mut accum_str = ~"";
|
2012-03-15 13:47:03 +00:00
|
|
|
let mut c = rdr.curr;
|
2012-03-03 02:45:10 +00:00
|
|
|
if (c >= 'a' && c <= 'z')
|
|
|
|
|| (c >= 'A' && c <= 'Z')
|
|
|
|
|| c == '_'
|
|
|
|
|| (c > 'z' && char::is_XID_start(c)) {
|
|
|
|
while (c >= 'a' && c <= 'z')
|
|
|
|
|| (c >= 'A' && c <= 'Z')
|
|
|
|
|| (c >= '0' && c <= '9')
|
|
|
|
|| c == '_'
|
|
|
|
|| (c > 'z' && char::is_XID_continue(c)) {
|
2011-09-02 00:27:58 +00:00
|
|
|
str::push_char(accum_str, c);
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
2012-01-13 08:56:53 +00:00
|
|
|
c = rdr.curr;
|
2010-08-20 18:41:34 +00:00
|
|
|
}
|
2012-07-14 05:57:48 +00:00
|
|
|
if str::eq(accum_str, ~"_") { ret token::UNDERSCORE; }
|
2012-05-30 18:36:30 +00:00
|
|
|
let is_mod_name = c == ':' && nextch(rdr) == ':';
|
2011-12-29 22:45:18 +00:00
|
|
|
|
2012-04-19 22:24:49 +00:00
|
|
|
// FIXME: perform NFKC normalization here. (Issue #2253)
|
2012-07-18 00:05:38 +00:00
|
|
|
ret token::IDENT((*rdr.interner).intern(@accum_str), is_mod_name);
|
2010-08-20 17:03:31 +00:00
|
|
|
}
|
2011-12-02 12:57:12 +00:00
|
|
|
if is_dec_digit(c) {
|
2011-09-02 05:39:44 +00:00
|
|
|
ret scan_number(c, rdr);
|
|
|
|
}
|
2012-05-30 18:36:30 +00:00
|
|
|
fn binop(rdr: string_reader, op: token::binop) -> token::token {
|
|
|
|
bump(rdr);
|
2012-01-13 08:56:53 +00:00
|
|
|
if rdr.curr == '=' {
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
2011-05-12 15:24:54 +00:00
|
|
|
ret token::BINOPEQ(op);
|
2011-06-15 18:19:50 +00:00
|
|
|
} else { ret token::BINOP(op); }
|
2010-08-24 02:17:04 +00:00
|
|
|
}
|
2011-07-27 12:19:39 +00:00
|
|
|
alt c {
|
|
|
|
|
2011-08-19 22:16:48 +00:00
|
|
|
|
2011-09-02 22:34:58 +00:00
|
|
|
|
2011-09-12 09:27:30 +00:00
|
|
|
|
2011-09-12 10:39:38 +00:00
|
|
|
|
2011-07-27 12:19:39 +00:00
|
|
|
// One-byte tokens.
|
2012-05-30 18:36:30 +00:00
|
|
|
';' { bump(rdr); ret token::SEMI; }
|
|
|
|
',' { bump(rdr); ret token::COMMA; }
|
2011-07-27 12:19:39 +00:00
|
|
|
'.' {
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
|
|
|
if rdr.curr == '.' && nextch(rdr) == '.' {
|
|
|
|
bump(rdr);
|
|
|
|
bump(rdr);
|
2011-07-27 12:19:39 +00:00
|
|
|
ret token::ELLIPSIS;
|
|
|
|
}
|
|
|
|
ret token::DOT;
|
|
|
|
}
|
2012-05-30 18:36:30 +00:00
|
|
|
'(' { bump(rdr); ret token::LPAREN; }
|
|
|
|
')' { bump(rdr); ret token::RPAREN; }
|
|
|
|
'{' { bump(rdr); ret token::LBRACE; }
|
|
|
|
'}' { bump(rdr); ret token::RBRACE; }
|
|
|
|
'[' { bump(rdr); ret token::LBRACKET; }
|
|
|
|
']' { bump(rdr); ret token::RBRACKET; }
|
|
|
|
'@' { bump(rdr); ret token::AT; }
|
|
|
|
'#' { bump(rdr); ret token::POUND; }
|
|
|
|
'~' { bump(rdr); ret token::TILDE; }
|
2011-07-27 12:19:39 +00:00
|
|
|
':' {
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
2012-01-13 08:56:53 +00:00
|
|
|
if rdr.curr == ':' {
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
2011-07-27 12:19:39 +00:00
|
|
|
ret token::MOD_SEP;
|
|
|
|
} else { ret token::COLON; }
|
|
|
|
}
|
|
|
|
|
2012-05-30 18:36:30 +00:00
|
|
|
'$' { bump(rdr); ret token::DOLLAR; }
|
2012-01-25 23:38:09 +00:00
|
|
|
|
2011-08-19 22:16:48 +00:00
|
|
|
|
2011-09-02 22:34:58 +00:00
|
|
|
|
2011-09-12 09:27:30 +00:00
|
|
|
|
2011-09-12 10:39:38 +00:00
|
|
|
|
2011-07-27 12:19:39 +00:00
|
|
|
// Multi-byte tokens.
|
|
|
|
'=' {
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
2012-01-13 08:56:53 +00:00
|
|
|
if rdr.curr == '=' {
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
2011-07-27 12:19:39 +00:00
|
|
|
ret token::EQEQ;
|
2012-06-05 01:34:10 +00:00
|
|
|
} else if rdr.curr == '>' {
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
2012-06-05 01:34:10 +00:00
|
|
|
ret token::FAT_ARROW;
|
|
|
|
} else {
|
|
|
|
ret token::EQ;
|
|
|
|
}
|
2011-07-27 12:19:39 +00:00
|
|
|
}
|
|
|
|
'!' {
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
2012-01-13 08:56:53 +00:00
|
|
|
if rdr.curr == '=' {
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
2011-07-27 12:19:39 +00:00
|
|
|
ret token::NE;
|
|
|
|
} else { ret token::NOT; }
|
|
|
|
}
|
|
|
|
'<' {
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
2012-01-13 08:56:53 +00:00
|
|
|
alt rdr.curr {
|
2012-05-30 18:36:30 +00:00
|
|
|
'=' { bump(rdr); ret token::LE; }
|
2012-05-22 21:59:15 +00:00
|
|
|
'<' { ret binop(rdr, token::SHL); }
|
2011-07-27 12:19:39 +00:00
|
|
|
'-' {
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
2012-01-13 08:56:53 +00:00
|
|
|
alt rdr.curr {
|
2012-05-30 18:36:30 +00:00
|
|
|
'>' { bump(rdr); ret token::DARROW; }
|
2011-07-27 12:19:39 +00:00
|
|
|
_ { ret token::LARROW; }
|
2010-08-31 20:29:00 +00:00
|
|
|
}
|
2011-07-27 12:19:39 +00:00
|
|
|
}
|
|
|
|
_ { ret token::LT; }
|
2010-08-31 20:29:00 +00:00
|
|
|
}
|
2011-07-27 12:19:39 +00:00
|
|
|
}
|
|
|
|
'>' {
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
2012-01-13 08:56:53 +00:00
|
|
|
alt rdr.curr {
|
2012-05-30 18:36:30 +00:00
|
|
|
'=' { bump(rdr); ret token::GE; }
|
2012-05-22 21:59:15 +00:00
|
|
|
'>' { ret binop(rdr, token::SHR); }
|
2011-07-27 12:19:39 +00:00
|
|
|
_ { ret token::GT; }
|
2010-08-20 22:36:48 +00:00
|
|
|
}
|
2011-07-27 12:19:39 +00:00
|
|
|
}
|
|
|
|
'\'' {
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
2012-03-15 13:47:03 +00:00
|
|
|
let mut c2 = rdr.curr;
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
2011-07-27 12:19:39 +00:00
|
|
|
if c2 == '\\' {
|
2012-01-13 08:56:53 +00:00
|
|
|
let escaped = rdr.curr;
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
2011-07-27 12:19:39 +00:00
|
|
|
alt escaped {
|
|
|
|
'n' { c2 = '\n'; }
|
|
|
|
'r' { c2 = '\r'; }
|
|
|
|
't' { c2 = '\t'; }
|
|
|
|
'\\' { c2 = '\\'; }
|
|
|
|
'\'' { c2 = '\''; }
|
2012-05-31 22:31:13 +00:00
|
|
|
'"' { c2 = '"'; }
|
2011-07-27 12:19:39 +00:00
|
|
|
'x' { c2 = scan_numeric_escape(rdr, 2u); }
|
|
|
|
'u' { c2 = scan_numeric_escape(rdr, 4u); }
|
|
|
|
'U' { c2 = scan_numeric_escape(rdr, 8u); }
|
|
|
|
c2 {
|
2012-07-30 23:01:07 +00:00
|
|
|
rdr.fatal(fmt!{"unknown character escape: %d", c2 as int});
|
2011-07-27 12:19:39 +00:00
|
|
|
}
|
2010-08-24 15:56:42 +00:00
|
|
|
}
|
|
|
|
}
|
2012-01-13 08:56:53 +00:00
|
|
|
if rdr.curr != '\'' {
|
2012-07-14 05:57:48 +00:00
|
|
|
rdr.fatal(~"unterminated character constant");
|
2011-07-27 12:19:39 +00:00
|
|
|
}
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr); // advance curr past token
|
2011-12-07 20:06:12 +00:00
|
|
|
ret token::LIT_INT(c2 as i64, ast::ty_char);
|
2011-07-27 12:19:39 +00:00
|
|
|
}
|
|
|
|
'"' {
|
2012-01-13 08:56:53 +00:00
|
|
|
let n = rdr.chpos;
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
2012-01-13 08:56:53 +00:00
|
|
|
while rdr.curr != '"' {
|
2012-05-30 18:36:30 +00:00
|
|
|
if is_eof(rdr) {
|
2012-07-30 23:01:07 +00:00
|
|
|
rdr.fatal(fmt!{"unterminated double quote string: %s",
|
|
|
|
get_str_from(rdr, n)});
|
2011-09-27 18:15:24 +00:00
|
|
|
}
|
|
|
|
|
2012-01-13 08:56:53 +00:00
|
|
|
let ch = rdr.curr;
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
2011-07-27 12:19:39 +00:00
|
|
|
alt ch {
|
|
|
|
'\\' {
|
2012-01-13 08:56:53 +00:00
|
|
|
let escaped = rdr.curr;
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
2011-07-27 12:19:39 +00:00
|
|
|
alt escaped {
|
2012-02-12 07:49:03 +00:00
|
|
|
'n' { str::push_char(accum_str, '\n'); }
|
|
|
|
'r' { str::push_char(accum_str, '\r'); }
|
|
|
|
't' { str::push_char(accum_str, '\t'); }
|
|
|
|
'\\' { str::push_char(accum_str, '\\'); }
|
|
|
|
'"' { str::push_char(accum_str, '"'); }
|
2011-07-27 12:19:39 +00:00
|
|
|
'\n' { consume_whitespace(rdr); }
|
|
|
|
'x' {
|
2011-09-02 00:27:58 +00:00
|
|
|
str::push_char(accum_str, scan_numeric_escape(rdr, 2u));
|
2011-07-27 12:19:39 +00:00
|
|
|
}
|
|
|
|
'u' {
|
2011-09-02 00:27:58 +00:00
|
|
|
str::push_char(accum_str, scan_numeric_escape(rdr, 4u));
|
2011-07-27 12:19:39 +00:00
|
|
|
}
|
|
|
|
'U' {
|
2011-09-02 00:27:58 +00:00
|
|
|
str::push_char(accum_str, scan_numeric_escape(rdr, 8u));
|
2011-07-27 12:19:39 +00:00
|
|
|
}
|
|
|
|
c2 {
|
2012-07-30 23:01:07 +00:00
|
|
|
rdr.fatal(fmt!{"unknown string escape: %d", c2 as int});
|
2011-07-27 12:19:39 +00:00
|
|
|
}
|
2010-08-24 15:56:42 +00:00
|
|
|
}
|
2011-07-27 12:19:39 +00:00
|
|
|
}
|
2011-09-02 00:27:58 +00:00
|
|
|
_ { str::push_char(accum_str, ch); }
|
2010-08-24 15:56:42 +00:00
|
|
|
}
|
2011-04-13 18:25:01 +00:00
|
|
|
}
|
2012-05-30 18:36:30 +00:00
|
|
|
bump(rdr);
|
2012-07-18 00:05:38 +00:00
|
|
|
ret token::LIT_STR((*rdr.interner).intern(@accum_str));
|
2011-07-27 12:19:39 +00:00
|
|
|
}
|
|
|
|
'-' {
|
2012-05-30 18:36:30 +00:00
|
|
|
if nextch(rdr) == '>' {
|
|
|
|
bump(rdr);
|
|
|
|
bump(rdr);
|
2011-07-27 12:19:39 +00:00
|
|
|
ret token::RARROW;
|
|
|
|
} else { ret binop(rdr, token::MINUS); }
|
|
|
|
}
|
|
|
|
'&' {
|
2012-05-30 18:36:30 +00:00
|
|
|
if nextch(rdr) == '&' {
|
|
|
|
bump(rdr);
|
|
|
|
bump(rdr);
|
2011-07-27 12:19:39 +00:00
|
|
|
ret token::ANDAND;
|
|
|
|
} else { ret binop(rdr, token::AND); }
|
|
|
|
}
|
|
|
|
'|' {
|
2012-05-30 18:36:30 +00:00
|
|
|
alt nextch(rdr) {
|
|
|
|
'|' { bump(rdr); bump(rdr); ret token::OROR; }
|
2011-07-27 12:19:39 +00:00
|
|
|
_ { 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); }
|
2012-07-30 23:01:07 +00:00
|
|
|
c { rdr.fatal(fmt!{"unknown start of token: %d", c as int}); }
|
2010-08-20 21:34:48 +00:00
|
|
|
}
|
2010-07-14 16:41:36 +00:00
|
|
|
}
|
|
|
|
|
2012-05-30 18:36:30 +00:00
|
|
|
fn consume_whitespace(rdr: string_reader) {
|
|
|
|
while is_whitespace(rdr.curr) && !is_eof(rdr) { bump(rdr); }
|
2011-03-24 15:33:20 +00:00
|
|
|
}
|
|
|
|
|
2011-10-07 14:22:53 +00:00
|
|
|
|
2010-08-12 17:29:23 +00:00
|
|
|
//
|
|
|
|
// Local Variables:
|
|
|
|
// mode: rust
|
|
|
|
// fill-column: 78;
|
|
|
|
// indent-tabs-mode: nil
|
|
|
|
// c-basic-offset: 4
|
|
|
|
// buffer-file-coding-system: utf-8-unix
|
|
|
|
// End:
|
|
|
|
//
|