summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/mruby.h2
-rw-r--r--src/kernel.c2
-rw-r--r--src/parse.y23
-rw-r--r--src/sprintf.c8
-rw-r--r--tools/mrbc/mrbc.c28
-rw-r--r--tools/mruby/mruby.c9
6 files changed, 38 insertions, 34 deletions
diff --git a/include/mruby.h b/include/mruby.h
index a9027d896..1124ba89c 100644
--- a/include/mruby.h
+++ b/include/mruby.h
@@ -81,7 +81,7 @@ typedef struct mrb_value {
#define mrb_symbol(o) (o).value.sym
#define mrb_object(o) ((struct RBasic *) (o).value.p)
#define FIXNUM_P(o) ((o).tt == MRB_TT_FIXNUM)
-#define UNDEF_P(o) ((o).tt == MRB_TT_UNDEF)
+#define mrb_undef_p(o) ((o).tt == MRB_TT_UNDEF)
#include "mruby/object.h"
diff --git a/src/kernel.c b/src/kernel.c
index 1040dbe05..240c0dcb3 100644
--- a/src/kernel.c
+++ b/src/kernel.c
@@ -1038,7 +1038,7 @@ mrb_obj_remove_instance_variable(mrb_state *mrb, mrb_value self)
mrb_get_args(mrb, "n", &sym);
val = mrb_iv_remove(mrb, self, sym);
- if (UNDEF_P(val)) {
+ if (mrb_undef_p(val)) {
mrb_name_error(mrb, sym, "instance variable %s not defined", mrb_sym2name(mrb, sym));
}
return val;
diff --git a/src/parse.y b/src/parse.y
index f27cc0822..75a33c5b7 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -4874,22 +4874,27 @@ load_exec(mrb_state *mrb, parser_state *p, mrbc_context *c)
if (!p) {
mrb_parser_free(p);
- return mrb_nil_value();
+ return mrb_undef_value();
}
- if (p->capture_errors && (!p->tree || p->nerr)) {
- char buf[256];
+ if (!p->tree || p->nerr) {
+ if (p->capture_errors) {
+ char buf[256];
- n = snprintf(buf, sizeof(buf), "line %d: %s\n",
- p->error_buffer[0].lineno, p->error_buffer[0].message);
- mrb->exc = (struct RObject*)mrb_object(mrb_exc_new(mrb, E_SYNTAX_ERROR, buf, n));
+ n = snprintf(buf, sizeof(buf), "line %d: %s\n",
+ p->error_buffer[0].lineno, p->error_buffer[0].message);
+ mrb->exc = (struct RObject*)mrb_object(mrb_exc_new(mrb, E_SYNTAX_ERROR, buf, n));
+ }
+ else {
+ mrb->exc = (struct RObject*)mrb_object(mrb_exc_new(mrb, E_SYNTAX_ERROR, "", 0));
+ }
mrb_parser_free(p);
- return mrb_nil_value();
+ return mrb_undef_value();
}
n = mrb_generate_code(mrb, p->tree);
mrb_parser_free(p);
if (n < 0) {
- mrb->exc = (struct RObject*)mrb_object(mrb_exc_new(mrb, E_SCRIPT_ERROR, "codegen error", 13));
- return mrb_nil_value();
+ mrb->exc = (struct RObject*)mrb_object(mrb_exc_new(mrb, E_SCRIPT_ERROR, "", 0));
+ return mrb_undef_value();
}
if (c) {
if (c->dump_result) codedump_all(mrb, n);
diff --git a/src/sprintf.c b/src/sprintf.c
index d6104ad48..b597ff343 100644
--- a/src/sprintf.c
+++ b/src/sprintf.c
@@ -145,7 +145,7 @@ mrb_fix2binstr(mrb_state *mrb, mrb_value x, int base)
blen += (l);\
} while (0)
-#define GETARG() (!UNDEF_P(nextvalue) ? nextvalue : \
+#define GETARG() (!mrb_undef_p(nextvalue) ? nextvalue : \
posarg == -1 ? \
(mrb_raise(mrb, E_ARGUMENT_ERROR, "unnumbered(%d) mixed with numbered", nextarg), mrb_undef_value()) : \
posarg == -2 ? \
@@ -201,7 +201,7 @@ get_hash(mrb_state *mrb, mrb_value *hash, int argc, const mrb_value *argv)
{
mrb_value tmp;
- if (!UNDEF_P(*hash)) return *hash;
+ if (!mrb_undef_p(*hash)) return *hash;
if (argc != 2) {
mrb_raise(mrb, E_ARGUMENT_ERROR, "one hash required");
}
@@ -586,7 +586,7 @@ retry:
n = 0;
GETNUM(n, width);
if (*p == '$') {
- if (!UNDEF_P(nextvalue)) {
+ if (!mrb_undef_p(nextvalue)) {
mrb_raise(mrb, E_ARGUMENT_ERROR, "value given twice - %d$", n);
}
nextvalue = GETPOSARG(n);
@@ -614,7 +614,7 @@ retry:
symname = mrb_str_new(mrb, start + 1, p - start - 1);
id = mrb_intern_str(mrb, symname);
nextvalue = GETNAMEARG(mrb_symbol_value(id), start, (int)(p - start + 1));
- if (UNDEF_P(nextvalue)) {
+ if (mrb_undef_p(nextvalue)) {
mrb_raise(mrb, E_KEY_ERROR, "key%.*s not found", (int)(p - start + 1), start);
}
if (term == '}') goto format_s;
diff --git a/tools/mrbc/mrbc.c b/tools/mrbc/mrbc.c
index a70353d63..428a3b781 100644
--- a/tools/mrbc/mrbc.c
+++ b/tools/mrbc/mrbc.c
@@ -144,12 +144,13 @@ parse_args(mrb_state *mrb, int argc, char **argv, struct _args *args)
}
static void
-cleanup(struct _args *args)
+cleanup(mrb_state *mrb, struct _args *args)
{
if (args->rfp)
fclose(args->rfp);
if (args->wfp)
fclose(args->wfp);
+ mrb_close(mrb);
}
int
@@ -168,9 +169,8 @@ main(int argc, char **argv)
n = parse_args(mrb, argc, argv, &args);
if (n < 0 || args.rfp == NULL) {
- cleanup(&args);
+ cleanup(mrb, &args);
usage(argv[0]);
- mrb_close(mrb);
return n;
}
@@ -179,16 +179,14 @@ main(int argc, char **argv)
c->dump_result = 1;
c->no_exec = 1;
result = mrb_load_file_cxt(mrb, args.rfp, c);
- if (mrb_nil_p(result)) {
- cleanup(&args);
- mrb_close(mrb);
- return -1;
+ if (mrb_undef_p(result) || mrb_fixnum(result) < 0) {
+ cleanup(mrb, &args);
+ return EXIT_FAILURE;
}
- n = mrb_fixnum(result);
- if (n < 0 || args.check_syntax) {
- cleanup(&args);
- mrb_close(mrb);
- return n;
+ if (args.check_syntax) {
+ printf("Syntax OK\n");
+ cleanup(mrb, &args);
+ return EXIT_SUCCESS;
}
if (args.initname) {
if (args.dump_type == DUMP_TYPE_BIN)
@@ -200,10 +198,8 @@ main(int argc, char **argv)
n = mrb_dump_irep(mrb, n, args.wfp);
}
- cleanup(&args);
- mrb_close(mrb);
-
- return n;
+ cleanup(mrb, &args);
+ return EXIT_SUCCESS;
}
void
diff --git a/tools/mruby/mruby.c b/tools/mruby/mruby.c
index 65eae57e1..a8b0b99df 100644
--- a/tools/mruby/mruby.c
+++ b/tools/mruby/mruby.c
@@ -180,6 +180,7 @@ main(int argc, char **argv)
}
else {
mrbc_context *c = mrbc_context_new(mrb);
+ mrb_value v;
if (args.verbose)
c->dump_result = 1;
@@ -188,14 +189,16 @@ main(int argc, char **argv)
if (args.cmdline) {
mrbc_filename(mrb, c, "-e");
- mrb_load_string_cxt(mrb, (char*)args.cmdline, c);
+ v = mrb_load_string_cxt(mrb, (char*)args.cmdline, c);
}
else {
mrbc_filename(mrb, c, argv[1]);
- mrb_load_file_cxt(mrb, args.rfp, c);
+ v = mrb_load_file_cxt(mrb, args.rfp, c);
}
mrbc_context_free(mrb, c);
- return -1;
+ if (!mrb->exc && args.check_syntax) {
+ printf("Syntax OK\n");
+ }
}
cleanup(mrb, &args);
generated by cgit v1.2.3 (git 2.39.1) at 2026-09-15 13:14:44 +0000