summaryrefslogtreecommitdiffhomepage
path: root/mrbgems
diff options
context:
space:
mode:
Diffstat (limited to 'mrbgems')
-rw-r--r--mrbgems/mruby-compiler/core/parse.y2
-rw-r--r--mrbgems/mruby-eval/src/eval.c4
-rw-r--r--mrbgems/mruby-exit/src/mruby-exit.c2
-rw-r--r--mrbgems/mruby-fiber/src/fiber.c2
-rw-r--r--mrbgems/mruby-math/src/math.c4
-rw-r--r--mrbgems/mruby-print/src/print.c2
-rw-r--r--mrbgems/mruby-sprintf/src/sprintf.c23
-rw-r--r--mrbgems/mruby-string-ext/src/string.c6
-rw-r--r--mrbgems/mruby-test/driver.c2
-rw-r--r--mrbgems/mruby-time/src/time.c4
10 files changed, 27 insertions, 24 deletions
diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y
index 41fc36217..ddf5856c5 100644
--- a/mrbgems/mruby-compiler/core/parse.y
+++ b/mrbgems/mruby-compiler/core/parse.y
@@ -3452,7 +3452,7 @@ backref_error(parser_state *p, node *n)
c = (int)(intptr_t)n->car;
if (c == NODE_NTH_REF) {
- yyerror_i(p, "can't set variable $%" MRB_PRId, (mrb_int)(intptr_t)n->cdr);
+ yyerror_i(p, "can't set variable $%" MRB_PRId, (int)(intptr_t)n->cdr);
}
else if (c == NODE_BACK_REF) {
yyerror_i(p, "can't set variable $%c", (int)(intptr_t)n->cdr);
diff --git a/mrbgems/mruby-eval/src/eval.c b/mrbgems/mruby-eval/src/eval.c
index 5c0ea82f4..7fd4f1437 100644
--- a/mrbgems/mruby-eval/src/eval.c
+++ b/mrbgems/mruby-eval/src/eval.c
@@ -198,7 +198,7 @@ patch_irep(mrb_state *mrb, mrb_irep *irep, int bnest, mrb_irep *top)
void mrb_codedump_all(mrb_state*, struct RProc*);
static struct RProc*
-create_proc_from_string(mrb_state *mrb, char *s, int len, mrb_value binding, const char *file, mrb_int line)
+create_proc_from_string(mrb_state *mrb, char *s, mrb_int len, mrb_value binding, const char *file, mrb_int line)
{
mrbc_context *cxt;
struct mrb_parser_state *p;
@@ -211,7 +211,7 @@ create_proc_from_string(mrb_state *mrb, char *s, int len, mrb_value binding, con
}
cxt = mrbc_context_new(mrb);
- cxt->lineno = line;
+ cxt->lineno = (short)line;
mrbc_filename(mrb, cxt, file ? file : "(eval)");
cxt->capture_errors = TRUE;
diff --git a/mrbgems/mruby-exit/src/mruby-exit.c b/mrbgems/mruby-exit/src/mruby-exit.c
index 3e147f80b..05c929622 100644
--- a/mrbgems/mruby-exit/src/mruby-exit.c
+++ b/mrbgems/mruby-exit/src/mruby-exit.c
@@ -7,7 +7,7 @@ f_exit(mrb_state *mrb, mrb_value self)
mrb_int i = EXIT_SUCCESS;
mrb_get_args(mrb, "|i", &i);
- exit(i);
+ exit((int)i);
/* not reached */
return mrb_nil_value();
}
diff --git a/mrbgems/mruby-fiber/src/fiber.c b/mrbgems/mruby-fiber/src/fiber.c
index 9de175f34..57fe9401c 100644
--- a/mrbgems/mruby-fiber/src/fiber.c
+++ b/mrbgems/mruby-fiber/src/fiber.c
@@ -212,7 +212,7 @@ fiber_switch(mrb_state *mrb, mrb_value self, mrb_int len, const mrb_value *a, mr
while (b<e) {
*b++ = *a++;
}
- c->cibase->argc = len;
+ c->cibase->argc = (int)len;
value = c->stack[0] = c->ci->proc->env->stack[0];
}
else {
diff --git a/mrbgems/mruby-math/src/math.c b/mrbgems/mruby-math/src/math.c
index 7302b92d7..c182debea 100644
--- a/mrbgems/mruby-math/src/math.c
+++ b/mrbgems/mruby-math/src/math.c
@@ -486,7 +486,7 @@ static mrb_value
math_log(mrb_state *mrb, mrb_value obj)
{
mrb_float x, base;
- int argc;
+ mrb_int argc;
argc = mrb_get_args(mrb, "f|f", &x, &base);
if (x < 0.0) {
@@ -657,7 +657,7 @@ math_ldexp(mrb_state *mrb, mrb_value obj)
mrb_int i;
mrb_get_args(mrb, "fi", &x, &i);
- x = ldexp(x, i);
+ x = ldexp(x, (int)i);
return mrb_float_value(mrb, x);
}
diff --git a/mrbgems/mruby-print/src/print.c b/mrbgems/mruby-print/src/print.c
index d0c522d24..e181b06e0 100644
--- a/mrbgems/mruby-print/src/print.c
+++ b/mrbgems/mruby-print/src/print.c
@@ -19,7 +19,7 @@ printstr(mrb_state *mrb, mrb_value obj)
#if defined(_WIN32)
if (isatty(fileno(stdout))) {
DWORD written;
- int mlen = RSTRING_LEN(obj);
+ int mlen = (int)RSTRING_LEN(obj);
char* utf8 = RSTRING_PTR(obj);
int wlen = MultiByteToWideChar(CP_UTF8, 0, utf8, mlen, NULL, 0);
wchar_t* utf16 = (wchar_t*)mrb_malloc(mrb, (wlen+1) * sizeof(wchar_t));
diff --git a/mrbgems/mruby-sprintf/src/sprintf.c b/mrbgems/mruby-sprintf/src/sprintf.c
index d20699247..efa0b3d34 100644
--- a/mrbgems/mruby-sprintf/src/sprintf.c
+++ b/mrbgems/mruby-sprintf/src/sprintf.c
@@ -19,7 +19,7 @@
#define BITSPERDIG MRB_INT_BIT
#define EXTENDSIGN(n, l) (((~0U << (n)) >> (((n)*(l)) % BITSPERDIG)) & ~(~0U << (n)))
-mrb_value mrb_str_format(mrb_state *, int, const mrb_value *, mrb_value);
+mrb_value mrb_str_format(mrb_state *, mrb_int, const mrb_value *, mrb_value);
static void fmt_setup(char*,size_t,int,int,mrb_int,mrb_int);
static char*
@@ -153,7 +153,7 @@ check_next_arg(mrb_state *mrb, int posarg, int nextarg)
}
static void
-check_pos_arg(mrb_state *mrb, int posarg, int n)
+check_pos_arg(mrb_state *mrb, mrb_int posarg, mrb_int n)
{
if (posarg > 0) {
mrb_raisef(mrb, E_ARGUMENT_ERROR, "numbered(%S) after unnumbered(%S)",
@@ -168,7 +168,7 @@ check_pos_arg(mrb_state *mrb, int posarg, int n)
}
static void
-check_name_arg(mrb_state *mrb, int posarg, const char *name, int len)
+check_name_arg(mrb_state *mrb, int posarg, const char *name, mrb_int len)
{
if (posarg > 0) {
mrb_raisef(mrb, E_ARGUMENT_ERROR, "named%S after unnumbered(%S)",
@@ -198,7 +198,7 @@ check_name_arg(mrb_state *mrb, int posarg, const char *name, int len)
#define GETNUM(n, val) \
for (; p < end && ISDIGIT(*p); p++) {\
- int next_n = 10 * n + (*p - '0'); \
+ mrb_int next_n = 10 * n + (*p - '0'); \
if (next_n / 10 != n) {\
mrb_raise(mrb, E_ARGUMENT_ERROR, #val " too big"); \
} \
@@ -224,7 +224,7 @@ check_name_arg(mrb_state *mrb, int posarg, const char *name, int len)
} while (0)
static mrb_value
-get_hash(mrb_state *mrb, mrb_value *hash, int argc, const mrb_value *argv)
+get_hash(mrb_state *mrb, mrb_value *hash, mrb_int argc, const mrb_value *argv)
{
mrb_value tmp;
@@ -518,7 +518,7 @@ mrb_f_sprintf(mrb_state *mrb, mrb_value obj)
}
mrb_value
-mrb_str_format(mrb_state *mrb, int argc, const mrb_value *argv, mrb_value fmt)
+mrb_str_format(mrb_state *mrb, mrb_int argc, const mrb_value *argv, mrb_value fmt)
{
const char *p, *end;
char *buf;
@@ -643,7 +643,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));
+ nextvalue = GETNAMEARG(mrb_symbol_value(id), start, (mrb_int)(p - start + 1));
if (mrb_undef_p(nextvalue)) {
mrb_raisef(mrb, E_KEY_ERROR, "key%S not found", mrb_str_new(mrb, start, p - start + 1));
}
@@ -999,13 +999,15 @@ retry:
case 'A': {
mrb_value val = GETARG();
double fval;
- int i, need = 6;
+ mrb_int i;
+ mrb_int need = 6;
char fbuf[32];
+ int frexp_result;
fval = mrb_float(mrb_Float(mrb, val));
if (!isfinite(fval)) {
const char *expr;
- const int elen = 3;
+ const mrb_int elen = 3;
char sign = '\0';
if (isnan(fval)) {
@@ -1045,7 +1047,8 @@ retry:
need = 0;
if (*p != 'e' && *p != 'E') {
i = INT_MIN;
- frexp(fval, &i);
+ frexp(fval, &frexp_result);
+ i = (mrb_int)frexp_result;
if (i > 0)
need = BIT_DIGITS(i);
}
diff --git a/mrbgems/mruby-string-ext/src/string.c b/mrbgems/mruby-string-ext/src/string.c
index 6bc035d6a..63f181749 100644
--- a/mrbgems/mruby-string-ext/src/string.c
+++ b/mrbgems/mruby-string-ext/src/string.c
@@ -23,7 +23,7 @@ static mrb_value
mrb_str_setbyte(mrb_state *mrb, mrb_value str)
{
mrb_int pos, byte;
- long len;
+ mrb_int len;
mrb_get_args(mrb, "ii", &pos, &byte);
@@ -35,7 +35,7 @@ mrb_str_setbyte(mrb_state *mrb, mrb_value str)
mrb_str_modify(mrb, mrb_str_ptr(str));
byte &= 0xff;
- RSTRING_PTR(str)[pos] = byte;
+ RSTRING_PTR(str)[pos] = (unsigned char)byte;
return mrb_fixnum_value((unsigned char)byte);
}
@@ -44,7 +44,7 @@ mrb_str_byteslice(mrb_state *mrb, mrb_value str)
{
mrb_value a1;
mrb_int len;
- int argc;
+ mrb_int argc;
argc = mrb_get_args(mrb, "o|i", &a1, &len);
if (argc == 2) {
diff --git a/mrbgems/mruby-test/driver.c b/mrbgems/mruby-test/driver.c
index 14e93ff33..da0d721d4 100644
--- a/mrbgems/mruby-test/driver.c
+++ b/mrbgems/mruby-test/driver.c
@@ -60,7 +60,7 @@ static void
t_printstr(mrb_state *mrb, mrb_value obj)
{
char *s;
- int len;
+ mrb_int len;
if (mrb_string_p(obj)) {
s = RSTRING_PTR(obj);
diff --git a/mrbgems/mruby-time/src/time.c b/mrbgems/mruby-time/src/time.c
index 205c6dc33..e6c6b9904 100644
--- a/mrbgems/mruby-time/src/time.c
+++ b/mrbgems/mruby-time/src/time.c
@@ -369,7 +369,7 @@ time_mktime(mrb_state *mrb, mrb_int ayear, mrb_int amonth, mrb_int aday,
mrb_raise(mrb, E_ARGUMENT_ERROR, "Not a valid time.");
}
- return time_alloc(mrb, (double)nowsecs, ausec, timezone);
+ return time_alloc(mrb, (double)nowsecs, (double)ausec, timezone);
}
/* 15.2.19.6.2 */
@@ -634,7 +634,7 @@ mrb_time_initialize(mrb_state *mrb, mrb_value self)
{
mrb_int ayear = 0, amonth = 1, aday = 1, ahour = 0,
amin = 0, asec = 0, ausec = 0;
- int n;
+ mrb_int n;
struct mrb_time *tm;
n = mrb_get_args(mrb, "|iiiiiii",
generated by cgit v1.2.3 (git 2.39.1) at 2026-04-17 12:07:33 +0000