Skip to content

Commit 41af279

Browse files
committed
parser comments
1 parent 2985f74 commit 41af279

File tree

4 files changed

+82
-12
lines changed

4 files changed

+82
-12
lines changed

src/libsyntax/parse/classify.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@
1515
use ast;
1616
use codemap;
1717

18+
// does this expression require a semicolon to be treated
19+
// as a statement? The negation of this: 'can this expression
20+
// be used as a statement without a semicolon' -- is used
21+
// as an early-bail-out in the parser so that, for instance,
22+
// 'if true {...} else {...}
23+
// |x| 5 '
24+
// isn't parsed as (if true {...} else {...} | x) | 5
1825
pub fn expr_requires_semi_to_be_stmt(e: @ast::expr) -> bool {
1926
match e.node {
2027
ast::expr_if(*)
@@ -40,6 +47,9 @@ pub fn expr_is_simple_block(e: @ast::expr) -> bool {
4047
}
4148
}
4249

50+
// this statement requires a semicolon after it.
51+
// note that in one case (stmt_semi), we've already
52+
// seen the semicolon, and thus don't need another.
4353
pub fn stmt_ends_with_semi(stmt: &ast::stmt) -> bool {
4454
return match stmt.node {
4555
ast::stmt_decl(d, _) => {

src/libsyntax/parse/comments.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,8 @@ pub struct lit {
309309
pos: BytePos
310310
}
311311
312+
// it appears this function is called only from pprust... that's
313+
// probably not a good thing.
312314
pub fn gather_comments_and_literals(span_diagnostic:
313315
@diagnostic::span_handler,
314316
path: ~str,

src/libsyntax/parse/lexer.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,8 @@ fn consume_any_line_comment(rdr: @mut StringReader)
286286
}
287287
} else if rdr.curr == '#' {
288288
if nextch(rdr) == '!' {
289+
// I guess this is the only way to figure out if
290+
// we're at the beginning of the file...
289291
let cmap = @CodeMap::new();
290292
(*cmap).files.push(rdr.filemap);
291293
let loc = cmap.lookup_char_pos_adj(rdr.last_pos);

0 commit comments

Comments
 (0)