fix(frontends/lean/scanner): block comments

fixes #600
This commit is contained in:
Leonardo de Moura 2015-05-13 22:10:15 -07:00
parent 4a03570bf5
commit cbcaf5a48e
5 changed files with 33 additions and 33 deletions

View file

@ -216,42 +216,25 @@ void scanner::read_single_line_comment() {
} }
} }
// Try to consume str, return true if success.
// Throw a parser exception error_msg if end of file is found
bool scanner::consume(char const * str, char const * error_msg) {
if (curr() == str[0]) {
next();
unsigned i = 1;
while (true) {
if (!str[i])
return true;
check_not_eof(error_msg);
if (curr_next() != str[i])
return false;
i++;
}
} else {
return false;
}
}
static char const * g_begin_comment_block = "/-";
static char const * g_end_comment_block = "-/";
static char const * g_end_error_block_msg = "unexpected end of comment block";
void scanner::read_comment_block() { void scanner::read_comment_block() {
unsigned nesting = 1; unsigned nesting = 1;
while (true) { while (true) {
if (consume(g_begin_comment_block, g_end_error_block_msg)) { char c = curr();
check_not_eof("unexpected end of comment block");
next();
if (c == '/') {
if (curr() == '-') {
next();
nesting++; nesting++;
} }
if (consume(g_end_comment_block, g_end_error_block_msg)) { } else if (c == '-') {
if (curr() == '/') {
next();
nesting--; nesting--;
if (nesting == 0) if (nesting == 0)
return; return;
} }
check_not_eof(g_end_error_block_msg); }
next();
} }
} }

View file

@ -53,7 +53,6 @@ protected:
bool is_next_digit(); bool is_next_digit();
bool is_next_id_rest(); bool is_next_id_rest();
void move_back(unsigned offset, unsigned u_offset); void move_back(unsigned offset, unsigned u_offset);
bool consume(char const * str, char const * error_msg);
void read_single_line_comment(); void read_single_line_comment();
void read_comment_block(); void read_comment_block();
void read_until(char const * end_str, char const * error_msg); void read_until(char const * end_str, char const * error_msg);

3
tests/lean/run/600a.lean Normal file
View file

@ -0,0 +1,3 @@
/- - -/
print "ok"

3
tests/lean/run/600b.lean Normal file
View file

@ -0,0 +1,3 @@
/- --/
print "ok"

12
tests/lean/run/600c.lean Normal file
View file

@ -0,0 +1,12 @@
/- /- -/ -/
/- - /--/-/
/-/-/--/-/-/
/--/
/------------/
/---/
/- ---/
/-
-/
----/
print "ok"