Skip to content

Make mrb_load_exec() return nil if there is a syntax error #5496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dearblue wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make mrb_load_exec() return nil if there is a syntax error #5496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@ main(int argc, char **argv)
v = mrb_load_file_cxt(mrb, args.rfp, cc);
mrbc_context_free(mrb, cc);
}
if (mrdb->dbg->xm == DBG_QUIT && !mrb_undef_p(v) && mrb->exc) {
if (mrdb->dbg->xm == DBG_QUIT && mrb->exc) {
const char *classname = mrb_obj_classname(mrb, mrb_obj_value(mrb->exc));
if (!strcmp(classname, "DebuggerExit")) {
cleanup(mrb, &args);
Expand All @@ -732,14 +732,12 @@ main(int argc, char **argv)
}
puts("mruby application exited.");
mrdb->dbg->xphase = DBG_PHASE_AFTER_RUN;
if (!mrb_undef_p(v)) {
if (mrb->exc) {
mrb_print_error(mrb);
}
else {
printf(" => ");
mrb_p(mrb, v);
}
if (mrb->exc) {
mrb_print_error(mrb);
}
else {
printf(" => ");
mrb_p(mrb, v);
}

mrdb->dbg->prvfile = "-";
Expand Down
14 changes: 10 additions & 4 deletions mrbgems/mruby-compiler/core/parse.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6816,7 +6816,13 @@ mrb_load_exec(mrb_state *mrb, struct mrb_parser_state *p, mrbc_context *c)
mrb_int keep = 0;

if (!p) {
return mrb_undef_value();
if (mrb->gc.out_of_memory) {
mrb->exc = mrb->nomem_err;
}
else {
mrb->exc = mrb_obj_ptr(mrb_exc_new_lit(mrb, E_RUNTIME_ERROR, "wrong NULL as parser_state"));
}
return mrb_nil_value();
}
if (!p->tree || p->nerr) {
if (c) c->parser_nerr = p->nerr;
Expand All @@ -6829,14 +6835,14 @@ mrb_load_exec(mrb_state *mrb, struct mrb_parser_state *p, mrbc_context *c)
strncat(buf, p->error_buffer[0].message, sizeof(buf) - strlen(buf) - 1);
mrb->exc = mrb_obj_ptr(mrb_exc_new(mrb, E_SYNTAX_ERROR, buf, strlen(buf)));
mrb_parser_free(p);
return mrb_undef_value();
return mrb_nil_value();
}
else {
if (mrb->exc == NULL) {
mrb->exc = mrb_obj_ptr(mrb_exc_new_lit(mrb, E_SYNTAX_ERROR, "syntax error"));
}
mrb_parser_free(p);
return mrb_undef_value();
return mrb_nil_value();
}
}
proc = mrb_generate_code(mrb, p);
Expand All @@ -6845,7 +6851,7 @@ mrb_load_exec(mrb_state *mrb, struct mrb_parser_state *p, mrbc_context *c)
if (mrb->exc == NULL) {
mrb->exc = mrb_obj_ptr(mrb_exc_new_lit(mrb, E_SCRIPT_ERROR, "codegen error"));
}
return mrb_undef_value();
return mrb_nil_value();
}
if (c) {
if (c->dump_result) mrb_codedump_all(mrb, proc);
Expand Down
14 changes: 10 additions & 4 deletions mrbgems/mruby-compiler/core/y.tab.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13008,7 +13008,13 @@ mrb_load_exec(mrb_state *mrb, struct mrb_parser_state *p, mrbc_context *c)
mrb_int keep = 0;

if (!p) {
return mrb_undef_value();
if (mrb->gc.out_of_memory) {
mrb->exc = mrb->nomem_err;
}
else {
mrb->exc = mrb_obj_ptr(mrb_exc_new_lit(mrb, E_RUNTIME_ERROR, "wrong NULL as parser_state"));
}
return mrb_nil_value();
}
if (!p->tree || p->nerr) {
if (c) c->parser_nerr = p->nerr;
Expand All @@ -13021,14 +13027,14 @@ mrb_load_exec(mrb_state *mrb, struct mrb_parser_state *p, mrbc_context *c)
strncat(buf, p->error_buffer[0].message, sizeof(buf) - strlen(buf) - 1);
mrb->exc = mrb_obj_ptr(mrb_exc_new(mrb, E_SYNTAX_ERROR, buf, strlen(buf)));
mrb_parser_free(p);
return mrb_undef_value();
return mrb_nil_value();
}
else {
if (mrb->exc == NULL) {
mrb->exc = mrb_obj_ptr(mrb_exc_new_lit(mrb, E_SYNTAX_ERROR, "syntax error"));
}
mrb_parser_free(p);
return mrb_undef_value();
return mrb_nil_value();
}
}
proc = mrb_generate_code(mrb, p);
Expand All @@ -13037,7 +13043,7 @@ mrb_load_exec(mrb_state *mrb, struct mrb_parser_state *p, mrbc_context *c)
if (mrb->exc == NULL) {
mrb->exc = mrb_obj_ptr(mrb_exc_new_lit(mrb, E_SCRIPT_ERROR, "codegen error"));
}
return mrb_undef_value();
return mrb_nil_value();
}
if (c) {
if (c->dump_result) mrb_codedump_all(mrb, proc);
Expand Down