Skip to content
Browse files

rename MRUBY_OBJECT_HEADER to MRB_OBJECT_HEADER

  • Loading branch information...
1 parent 41e7d0b commit 97b7eb60968fcd9f3a6a56f1e64d854137e5f732 @matz matz committed Aug 18, 2012
Showing with 15 additions and 20 deletions.
  1. +1 −1 include/mruby/array.h
  2. +1 −1 include/mruby/class.h
  3. +1 −1 include/mruby/data.h
  4. +1 −1 include/mruby/hash.h
  5. +3 −3 include/mruby/object.h
  6. +2 −2 include/mruby/proc.h
  7. +1 −1 include/mruby/range.h
  8. +1 −1 include/mruby/string.h
  9. +1 −1 src/error.h
  10. +1 −1 src/gc.c
  11. +2 −7 src/re.h
View
2 include/mruby/array.h
@@ -18,7 +18,7 @@ struct mrb_shared_array {
};
struct RArray {
- MRUBY_OBJECT_HEADER;
+ MRB_OBJECT_HEADER;
int len;
union {
int capa;
View
2 include/mruby/class.h
@@ -12,7 +12,7 @@ extern "C" {
#endif
struct RClass {
- MRUBY_OBJECT_HEADER;
+ MRB_OBJECT_HEADER;
struct iv_tbl *iv;
struct kh_mt *mt;
struct RClass *super;
View
2 include/mruby/data.h
@@ -17,7 +17,7 @@ struct mrb_data_type {
};
struct RData {
- MRUBY_OBJECT_HEADER;
+ MRB_OBJECT_HEADER;
struct iv_tbl *iv;
struct mrb_data_type *type;
void *data;
View
2 include/mruby/hash.h
@@ -12,7 +12,7 @@ extern "C" {
#endif
struct RHash {
- MRUBY_OBJECT_HEADER;
+ MRB_OBJECT_HEADER;
struct iv_tbl *iv;
struct kh_ht *ht;
};
View
6 include/mruby/object.h
@@ -7,7 +7,7 @@
#ifndef MRUBY_OBJECT_H
#define MRUBY_OBJECT_H
-#define MRUBY_OBJECT_HEADER \
+#define MRB_OBJECT_HEADER \
enum mrb_vtype tt:8;\
unsigned int color:3;\
unsigned int flags:21;\
@@ -34,11 +34,11 @@
#define other_white_part(s) ((s)->current_white_part ^ MRB_GC_WHITES)
struct RBasic {
- MRUBY_OBJECT_HEADER;
+ MRB_OBJECT_HEADER;
};
struct RObject {
- MRUBY_OBJECT_HEADER;
+ MRB_OBJECT_HEADER;
struct iv_tbl *iv;
};
View
4 include/mruby/proc.h
@@ -14,14 +14,14 @@ extern "C" {
#endif
struct REnv {
- MRUBY_OBJECT_HEADER;
+ MRB_OBJECT_HEADER;
mrb_value *stack;
mrb_sym mid;
int cioff;
};
struct RProc {
- MRUBY_OBJECT_HEADER;
+ MRB_OBJECT_HEADER;
union {
mrb_irep *irep;
mrb_func_t func;
View
2 include/mruby/range.h
@@ -17,7 +17,7 @@ struct mrb_range_edges {
};
struct RRange {
- MRUBY_OBJECT_HEADER;
+ MRB_OBJECT_HEADER;
struct mrb_range_edges *edges;
int excl;
};
View
2 include/mruby/string.h
@@ -32,7 +32,7 @@ struct mrb_shared_string {
};
struct RString {
- MRUBY_OBJECT_HEADER;
+ MRB_OBJECT_HEADER;
int len;
union {
int capa;
View
2 src/error.h
@@ -8,7 +8,7 @@
#define MRUBY_ERROR_H
struct RException {
- MRUBY_OBJECT_HEADER;
+ MRB_OBJECT_HEADER;
};
void mrb_sys_fail(mrb_state *mrb, const char *mesg);
View
2 src/gc.c
@@ -77,7 +77,7 @@
#endif
struct free_obj {
- MRUBY_OBJECT_HEADER;
+ MRB_OBJECT_HEADER;
struct RBasic *next;
};
View
9 src/re.h
@@ -31,20 +31,15 @@ struct rmatch {
struct rmatch_offset *char_offset;
};
-//struct RMatch {
-// MRUBY_OBJECT_HEADER;
-// mrb_value str;
-// struct re_registers *regs;
-//};
struct RMatch {
- MRUBY_OBJECT_HEADER;
+ MRB_OBJECT_HEADER;
struct RString *str;
struct rmatch *rmatch;
struct RRegexp *regexp;
};
struct RRegexp {
- MRUBY_OBJECT_HEADER;
+ MRB_OBJECT_HEADER;
struct re_pattern_buffer *ptr;
struct RString *src;
unsigned long usecnt;

0 comments on commit 97b7eb6

Please sign in to comment.
Something went wrong with that request. Please try again.