diff options
| -rw-r--r-- | include/mruby/error.h | 2 | ||||
| -rw-r--r-- | include/mruby/gc.h | 2 | ||||
| -rw-r--r-- | include/mruby/khash.h | 6 | ||||
| -rw-r--r-- | include/mruby/opcode.h | 8 | ||||
| -rw-r--r-- | include/mruby/version.h | 6 | ||||
| -rw-r--r-- | mrbgems/mruby-object-ext/src/object.c | 6 | ||||
| -rw-r--r-- | mrbgems/mruby-string-ext/src/string.c | 2 | ||||
| -rw-r--r-- | src/class.c | 18 | ||||
| -rw-r--r-- | src/etc.c | 40 |
9 files changed, 45 insertions, 45 deletions
diff --git a/include/mruby/error.h b/include/mruby/error.h index b8b6c2c97..a686a6aab 100644 --- a/include/mruby/error.h +++ b/include/mruby/error.h @@ -1,5 +1,5 @@ /* -** error.h - Exception class +** mruby/error.h - Exception class ** ** See Copyright Notice in mruby.h */ diff --git a/include/mruby/gc.h b/include/mruby/gc.h index 29253fa08..ebc57d2aa 100644 --- a/include/mruby/gc.h +++ b/include/mruby/gc.h @@ -1,5 +1,5 @@ /* -** gc.h - garbage collector for mruby +** mruby/gc.h - garbage collector for mruby ** ** See Copyright Notice in mruby.h */ diff --git a/include/mruby/khash.h b/include/mruby/khash.h index d2501dd52..8a62e3ee6 100644 --- a/include/mruby/khash.h +++ b/include/mruby/khash.h @@ -4,8 +4,8 @@ ** See Copyright Notice in mruby.h */ -#ifndef KHASH_H -#define KHASH_H +#ifndef MRUBY_KHASH_H +#define MRUBY_KHASH_H #if defined(__cplusplus) extern "C" { @@ -267,4 +267,4 @@ typedef const char *kh_cstr_t; } /* extern "C" { */ #endif -#endif /* KHASH_H */ +#endif /* MRUBY_KHASH_H */ diff --git a/include/mruby/opcode.h b/include/mruby/opcode.h index c8a47c273..4774e78c6 100644 --- a/include/mruby/opcode.h +++ b/include/mruby/opcode.h @@ -1,11 +1,11 @@ /* -** opcode.h - RiteVM operation codes +** mruby/opcode.h - RiteVM operation codes ** ** See Copyright Notice in mruby.h */ -#ifndef OPCODE_H -#define OPCODE_H +#ifndef MRUBY_OPCODE_H +#define MRUBY_OPCODE_H #define MAXARG_Bx (0xffff) #define MAXARG_sBx (MAXARG_Bx>>1) /* `sBx' is signed */ @@ -157,4 +157,4 @@ enum { #define OP_R_BREAK 1 #define OP_R_RETURN 2 -#endif /* OPCODE_H */ +#endif /* MRUBY_OPCODE_H */ diff --git a/include/mruby/version.h b/include/mruby/version.h index d451dfb31..2ec584baa 100644 --- a/include/mruby/version.h +++ b/include/mruby/version.h @@ -1,3 +1,9 @@ +/* +** mruby/version.h - mruby version definition +** +** See Copyright Notice in mruby.h +*/ + #ifndef MRUBY_VERSION_H #define MRUBY_VERSION_H diff --git a/mrbgems/mruby-object-ext/src/object.c b/mrbgems/mruby-object-ext/src/object.c index 0dcc3cba7..dc1924db0 100644 --- a/mrbgems/mruby-object-ext/src/object.c +++ b/mrbgems/mruby-object-ext/src/object.c @@ -12,7 +12,7 @@ static mrb_value nil_to_a(mrb_state *mrb, mrb_value obj) { - return mrb_ary_new(mrb); + return mrb_ary_new(mrb); } /* @@ -25,7 +25,7 @@ nil_to_a(mrb_state *mrb, mrb_value obj) static mrb_value nil_to_f(mrb_state *mrb, mrb_value obj) { - return mrb_float_value(mrb, 0.0); + return mrb_float_value(mrb, 0.0); } /* @@ -38,7 +38,7 @@ nil_to_f(mrb_state *mrb, mrb_value obj) static mrb_value nil_to_i(mrb_state *mrb, mrb_value obj) { - return mrb_fixnum_value(0); + return mrb_fixnum_value(0); } /* diff --git a/mrbgems/mruby-string-ext/src/string.c b/mrbgems/mruby-string-ext/src/string.c index 085de76ef..9db3589c7 100644 --- a/mrbgems/mruby-string-ext/src/string.c +++ b/mrbgems/mruby-string-ext/src/string.c @@ -291,7 +291,7 @@ mrb_str_succ_bang(mrb_state *mrb, mrb_value self) while (e >= b) { if (!ISALNUM(*e)) { if (*e == 0xff) { - mrb_str_cat_cstr(mrb, result, "\x01"); + mrb_str_cat_lit(mrb, result, "\x01"); (*e) = 0; } else (*e)++; diff --git a/src/class.c b/src/class.c index 37ac751a7..d3a2403f1 100644 --- a/src/class.c +++ b/src/class.c @@ -1550,18 +1550,6 @@ mod_define_method(mrb_state *mrb, mrb_value self) } static void -check_cv_name_sym(mrb_state *mrb, mrb_sym id) -{ - const char *s; - mrb_int len; - - s = mrb_sym2name_len(mrb, id, &len); - if (len < 3 || !(s[0] == '@' && s[1] == '@')) { - mrb_name_error(mrb, id, "`%S' is not allowed as a class variable name", mrb_sym2str(mrb, id)); - } -} - -static void check_cv_name_str(mrb_state *mrb, mrb_value str) { const char *s = RSTRING_PTR(str); @@ -1572,6 +1560,12 @@ check_cv_name_str(mrb_state *mrb, mrb_value str) } } +static void +check_cv_name_sym(mrb_state *mrb, mrb_sym id) +{ + check_cv_name_str(mrb, mrb_sym2str(mrb, id)); +} + static mrb_value get_sym_or_str_arg(mrb_state *mrb) { @@ -113,34 +113,34 @@ mrb_obj_id(mrb_value obj) #define MakeID(p) MakeID2(p,tt) switch (tt) { - case MRB_TT_FREE: - case MRB_TT_UNDEF: + case MRB_TT_FREE: + case MRB_TT_UNDEF: return MakeID(0); /* not define */ - case MRB_TT_FALSE: + case MRB_TT_FALSE: if (mrb_nil_p(obj)) return MakeID(1); return MakeID(0); - case MRB_TT_TRUE: + case MRB_TT_TRUE: return MakeID(1); - case MRB_TT_SYMBOL: + case MRB_TT_SYMBOL: return MakeID(mrb_symbol(obj)); - case MRB_TT_FIXNUM: + case MRB_TT_FIXNUM: return MakeID2(mrb_float_id((mrb_float)mrb_fixnum(obj)), MRB_TT_FLOAT); - case MRB_TT_FLOAT: + case MRB_TT_FLOAT: return MakeID(mrb_float_id(mrb_float(obj))); - case MRB_TT_STRING: - case MRB_TT_OBJECT: - case MRB_TT_CLASS: - case MRB_TT_MODULE: - case MRB_TT_ICLASS: - case MRB_TT_SCLASS: - case MRB_TT_PROC: - case MRB_TT_ARRAY: - case MRB_TT_HASH: - case MRB_TT_RANGE: - case MRB_TT_EXCEPTION: - case MRB_TT_FILE: - case MRB_TT_DATA: + case MRB_TT_STRING: + case MRB_TT_OBJECT: + case MRB_TT_CLASS: + case MRB_TT_MODULE: + case MRB_TT_ICLASS: + case MRB_TT_SCLASS: + case MRB_TT_PROC: + case MRB_TT_ARRAY: + case MRB_TT_HASH: + case MRB_TT_RANGE: + case MRB_TT_EXCEPTION: + case MRB_TT_FILE: + case MRB_TT_DATA: default: return MakeID(mrb_ptr(obj)); } |