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

Merge pull request #434 from joequery/exit_in_string

Browse Source 
Improve handling of "exit" and "quit" in mirb.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2012-08-17 21:40:24 -07:00
parent bd3d5268db e7b61c65bb
commit af5b3279ac
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/mirb/mirb.c
+9 -12
View File
@@ -181,23 +181,20 @@ main(void)
last_code_line[char_index] = '\0';
if ((strcmp(last_code_line, "quit") == 0) ||
(strcmp(last_code_line, "exit") == 0)) {
if (code_block_open) {
/* cancel the current block and reset */
code_block_open = FALSE;
memset(ruby_code, 0, sizeof(*ruby_code));
memset(last_code_line, 0, sizeof(*last_code_line));
continue;
}
else {
/* quit the program */
if ((strcmp(last_code_line, "quit") == 0) || (strcmp(last_code_line, "exit") == 0)) {
if (!code_block_open || !parser->sterm){
break;
}
else{
/* count the quit/exit commands as strings if in a quote block */
strcat(ruby_code, "\n");
strcat(ruby_code, last_code_line);
}
}
else {
if (code_block_open) {
strcat(ruby_code, "\n");
strcat(ruby_code, "\n");
strcat(ruby_code, last_code_line);
}
else {