admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

even smarter expression termination detection

Browse Source
This commit is contained in:
Yukihiro Matsumoto
2012-05-19 16:44:36 +09:00
parent 6f6c270bb1
commit 04cafb7fb3
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/mirb/mirb.c
+5 -14
View File
@@ -26,9 +26,7 @@ is_code_block_open(struct mrb_parser_state *parser)
case EXPR_BEG:
/* an expression was just started, */
/* we can't end it like this */
if (parser->nerr == 0) return FALSE;
code_block_open = TRUE;
/* or right after the expresion terminated */
break;
case EXPR_DOT:
/* a message dot was the last token, */
@@ -86,21 +84,13 @@ is_code_block_open(struct mrb_parser_state *parser)
/* now check if parser error are available */
if (0 < parser->nerr) {
const char *unexpected_end = "syntax error, unexpected $end";
/* a parser error occur, we have to check if */
/* we need to read one more line or if there is */
/* a different issue which we have to show to */
/* the user */
if (strcmp(parser->error_buffer[0].message,
"syntax error, unexpected $end, expecting ';' or '\\n'") == 0) {
code_block_open = TRUE;
}
else if (strcmp(parser->error_buffer[0].message,
"syntax error, unexpected $end, expecting keyword_end") == 0) {
code_block_open = TRUE;
}
else if (strcmp(parser->error_buffer[0].message,
"syntax error, unexpected $end, expecting '<' or ';' or '\\n'") == 0) {
if (strncmp(parser->error_buffer[0].message, unexpected_end, strlen(unexpected_end)) == 0) {
code_block_open = TRUE;
}
else if (strcmp(parser->error_buffer[0].message,
@@ -211,6 +201,7 @@ main(void)
parser->s = ruby_code;
parser->send = ruby_code + strlen(ruby_code);
parser->capture_errors = 1;
parser->lineno = 1;
mrb_parser_parse(parser);
code_block_open = is_code_block_open(parser);
@@ -220,7 +211,7 @@ main(void)
else {
if (0 < parser->nerr) {
/* syntax error */
printf("%s\n", parser->error_buffer[0].message);
printf("line %d: %s\n", parser->error_buffer[0].lineno, parser->error_buffer[0].message);
}
else {
/* generate bytecode */