summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorYukihiro Matsumoto <[email protected]>2012-07-03 21:39:21 +0900
committerYukihiro Matsumoto <[email protected]>2012-07-03 21:39:21 +0900
commitbe8181a99a664d226b08d9d1f8348260c6e2bb95 (patch)
tree79d3e787a039ad08fbaf807b173a6db59085b66a /src
parentcd1e1a008987d61d06bbef99e9341738b36f3313 (diff)
downloadmruby-be8181a99a664d226b08d9d1f8348260c6e2bb95.tar.gz
mruby-be8181a99a664d226b08d9d1f8348260c6e2bb95.zip
raise SyntaxError only when capture_errors is set
Diffstat (limited to 'src')
-rw-r--r--src/parse.y8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/parse.y b/src/parse.y
index 217e82a37..63d39ec5f 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -4847,13 +4847,17 @@ load_exec(mrb_state *mrb, parser_state *p)
{
int n;
- if (!p || !p->tree || p->nerr) {
+ if (!p) {
+ mrb_pool_close(p->pool);
+ return mrb_nil_value();
+ }
+ if (p->capture_errors && (!p->tree || p->nerr)) {
char buf[256];
n = snprintf(buf, sizeof(buf), "line %d: %s\n",
p->error_buffer[0].lineno, p->error_buffer[0].message);
- mrb_pool_close(p->pool);
mrb->exc = (struct RObject*)mrb_object(mrb_exc_new(mrb, E_SYNTAX_ERROR, buf, n));
+ mrb_pool_close(p->pool);
return mrb_nil_value();
}
n = mrb_generate_code(mrb, p->tree);