change mrb_int to size_t that would take strlen()

parent 3e24e06b
...@@ -244,12 +244,12 @@ mrb_value mrb_funcall(mrb_state*, mrb_value, const char*, int,...); ...@@ -244,12 +244,12 @@ mrb_value mrb_funcall(mrb_state*, mrb_value, const char*, int,...);
mrb_value mrb_funcall_argv(mrb_state*, mrb_value, mrb_sym, int, mrb_value*); mrb_value mrb_funcall_argv(mrb_state*, mrb_value, mrb_sym, int, mrb_value*);
mrb_value mrb_funcall_with_block(mrb_state*, mrb_value, mrb_sym, int, mrb_value*, mrb_value); mrb_value mrb_funcall_with_block(mrb_state*, mrb_value, mrb_sym, int, mrb_value*, mrb_value);
mrb_sym mrb_intern_cstr(mrb_state*,const char*); mrb_sym mrb_intern_cstr(mrb_state*,const char*);
mrb_sym mrb_intern(mrb_state*,const char*,mrb_int); mrb_sym mrb_intern(mrb_state*,const char*,size_t);
mrb_sym mrb_intern_static(mrb_state*,const char*,mrb_int); mrb_sym mrb_intern_static(mrb_state*,const char*,size_t);
#define mrb_intern_lit(mrb, lit) mrb_intern_static(mrb, lit, (mrb_int)mrb_strlen_lit(lit)) #define mrb_intern_lit(mrb, lit) mrb_intern_static(mrb, lit, mrb_strlen_lit(lit))
mrb_sym mrb_intern_str(mrb_state*,mrb_value); mrb_sym mrb_intern_str(mrb_state*,mrb_value);
mrb_value mrb_check_intern_cstr(mrb_state*,const char*); mrb_value mrb_check_intern_cstr(mrb_state*,const char*);
mrb_value mrb_check_intern(mrb_state*,const char*,mrb_int); mrb_value mrb_check_intern(mrb_state*,const char*,size_t);
mrb_value mrb_check_intern_str(mrb_state*,mrb_value); mrb_value mrb_check_intern_str(mrb_state*,mrb_value);
const char *mrb_sym2name(mrb_state*,mrb_sym); const char *mrb_sym2name(mrb_state*,mrb_sym);
const char *mrb_sym2name_len(mrb_state*,mrb_sym,mrb_int*); const char *mrb_sym2name_len(mrb_state*,mrb_sym,mrb_int*);
......
...@@ -35,7 +35,7 @@ KHASH_DECLARE(n2s, symbol_name, mrb_sym, 1) ...@@ -35,7 +35,7 @@ KHASH_DECLARE(n2s, symbol_name, mrb_sym, 1)
KHASH_DEFINE (n2s, symbol_name, mrb_sym, 1, sym_hash_func, sym_hash_equal) KHASH_DEFINE (n2s, symbol_name, mrb_sym, 1, sym_hash_func, sym_hash_equal)
/* ------------------------------------------------------ */ /* ------------------------------------------------------ */
static mrb_sym static mrb_sym
sym_intern(mrb_state *mrb, const char *name, mrb_int len, mrb_bool lit) sym_intern(mrb_state *mrb, const char *name, size_t len, mrb_bool lit)
{ {
khash_t(n2s) *h = mrb->name2sym; khash_t(n2s) *h = mrb->name2sym;
symbol_name sname; symbol_name sname;
...@@ -70,13 +70,13 @@ sym_intern(mrb_state *mrb, const char *name, mrb_int len, mrb_bool lit) ...@@ -70,13 +70,13 @@ sym_intern(mrb_state *mrb, const char *name, mrb_int len, mrb_bool lit)
} }
mrb_sym mrb_sym
mrb_intern(mrb_state *mrb, const char *name, mrb_int len) mrb_intern(mrb_state *mrb, const char *name, size_t len)
{ {
return sym_intern(mrb, name, len, FALSE); return sym_intern(mrb, name, len, FALSE);
} }
mrb_sym mrb_sym
mrb_intern_static(mrb_state *mrb, const char *name, mrb_int len) mrb_intern_static(mrb_state *mrb, const char *name, size_t len)
{ {
return sym_intern(mrb, name, len, TRUE); return sym_intern(mrb, name, len, TRUE);
} }
...@@ -84,7 +84,7 @@ mrb_intern_static(mrb_state *mrb, const char *name, mrb_int len) ...@@ -84,7 +84,7 @@ mrb_intern_static(mrb_state *mrb, const char *name, mrb_int len)
mrb_sym mrb_sym
mrb_intern_cstr(mrb_state *mrb, const char *name) mrb_intern_cstr(mrb_state *mrb, const char *name)
{ {
return mrb_intern(mrb, name, (mrb_int)strlen(name)); return mrb_intern(mrb, name, strlen(name));
} }
mrb_sym mrb_sym
...@@ -94,7 +94,7 @@ mrb_intern_str(mrb_state *mrb, mrb_value str) ...@@ -94,7 +94,7 @@ mrb_intern_str(mrb_state *mrb, mrb_value str)
} }
mrb_value mrb_value
mrb_check_intern(mrb_state *mrb, const char *name, mrb_int len) mrb_check_intern(mrb_state *mrb, const char *name, size_t len)
{ {
khash_t(n2s) *h = mrb->name2sym; khash_t(n2s) *h = mrb->name2sym;
symbol_name sname = { 0 }; symbol_name sname = { 0 };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment