summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro Matsumoto <[email protected]>2012-05-12 23:44:31 +0900
committerYukihiro Matsumoto <[email protected]>2012-05-12 23:44:31 +0900
commit2dcc0ab656ed3b77234e06c49033486555059dd2 (patch)
tree0bd1c37f2d74f936e4229c4f3ed380ca043abff1
parent260f41ed630dab4ae012084ce655b926e4ca5e58 (diff)
downloadmruby-2dcc0ab656ed3b77234e06c49033486555059dd2.tar.gz
mruby-2dcc0ab656ed3b77234e06c49033486555059dd2.zip
breaking newline before else
-rw-r--r--tools/mirb/mirb.c42
1 files changed, 28 insertions, 14 deletions
diff --git a/tools/mirb/mirb.c b/tools/mirb/mirb.c
index b2dbead0d..7eb63010e 100644
--- a/tools/mirb/mirb.c
+++ b/tools/mirb/mirb.c
@@ -93,27 +93,34 @@ is_code_block_open(struct mrb_parser_state *parser)
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,
+ }
+ 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,
+ }
+ else if (strcmp(parser->error_buffer[0].message,
"syntax error, unexpected $end, expecting '<' or ';' or '\\n'") == 0) {
code_block_open = TRUE;
- } else if (strcmp(parser->error_buffer[0].message,
+ }
+ else if (strcmp(parser->error_buffer[0].message,
"syntax error, unexpected keyword_end") == 0) {
code_block_open = TRUE;
- } else if (strcmp(parser->error_buffer[0].message,
+ }
+ else if (strcmp(parser->error_buffer[0].message,
"syntax error, unexpected $end, expecting keyword_then or ';' or '\\n'") == 0) {
code_block_open = TRUE;
- } else if (strcmp(parser->error_buffer[0].message,
+ }
+ else if (strcmp(parser->error_buffer[0].message,
"syntax error, unexpected tREGEXP_BEG") == 0) {
code_block_open = TRUE;
- } else if (strcmp(parser->error_buffer[0].message,
+ }
+ else if (strcmp(parser->error_buffer[0].message,
"unterminated string meets end of file") == 0) {
code_block_open = TRUE;
}
}
- } else {
+ }
+ else {
// last parser state suggest that this code
// block is open, WE NEED MORE CODE!!
}
@@ -135,7 +142,8 @@ print_cmdline(int code_block_open)
{
if (code_block_open) {
printf("* ");
- } else {
+ }
+ else {
printf("> ");
}
}
@@ -180,15 +188,18 @@ main(void)
memset(ruby_code, 0, sizeof(*ruby_code));
memset(last_code_line, 0, sizeof(*last_code_line));
continue;
- } else {
+ }
+ else {
// quit the program
break;
}
- } else {
+ }
+ else {
if (code_block_open) {
strcat(ruby_code, "\n");
strcat(ruby_code, last_code_line);
- } else {
+ }
+ else {
memset(ruby_code, 0, sizeof(*ruby_code));
strcat(ruby_code, last_code_line);
}
@@ -199,11 +210,13 @@ main(void)
if (code_block_open) {
// no evaluation of code
- } else {
+ }
+ else {
if (0 < parser->nerr) {
// syntax error
printf("%s\n", parser->error_buffer[0].message);
- } else {
+ }
+ else {
// generate bytecode
byte_code = mrb_generate_code(mrb_interpreter, parser->tree);
@@ -216,7 +229,8 @@ main(void)
if (mrb_interpreter->exc) {
mrb_p(mrb_interpreter, mrb_obj_value(mrb_interpreter->exc));
mrb_interpreter->exc = 0;
- } else {
+ }
+ else {
// no
printf(" => ");
mrb_p(mrb_interpreter, mrb_return_value);