diff options
| author | Yukihiro Matz Matsumoto <[email protected]> | 2013-03-26 21:07:20 +0900 |
|---|---|---|
| committer | Yukihiro Matz Matsumoto <[email protected]> | 2013-03-26 21:07:20 +0900 |
| commit | 5c6be2e518db9500c10db3ed2614499444936904 (patch) | |
| tree | 5540d4fdc9bc14138a64570a1a4a5e6269e56a86 /include | |
| parent | 471ad60688be5ea8834fe4aaa404ef67cc8a9977 (diff) | |
| parent | 930e4c71c01562dc6ff03af87486acc2de81cc9b (diff) | |
| download | mruby-5c6be2e518db9500c10db3ed2614499444936904.tar.gz mruby-5c6be2e518db9500c10db3ed2614499444936904.zip | |
Merge branch 'selftopiv' of https://github.com/carsonmcdonald/mruby into carsonmcdonald-selftopiv
Diffstat (limited to 'include')
| -rw-r--r-- | include/mruby.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/mruby.h b/include/mruby.h index c5c607893..1c26be1ea 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -74,6 +74,7 @@ typedef struct mrb_state { mrb_value *stack; mrb_value *stbase, *stend; + mrb_value *top_self; mrb_callinfo *ci; mrb_callinfo *cibase, *ciend; @@ -138,6 +139,7 @@ typedef struct mrb_state { struct RClass *eStandardError_class; void *ud; /* auxiliary data */ + } mrb_state; typedef mrb_value (*mrb_func_t)(mrb_state *mrb, mrb_value); @@ -238,11 +240,11 @@ int mrb_gc_arena_save(mrb_state*); void mrb_gc_arena_restore(mrb_state*,int); void mrb_gc_mark(mrb_state*,struct RBasic*); #define mrb_gc_mark_value(mrb,val) do {\ - if (mrb_type(val) >= MRB_TT_OBJECT) mrb_gc_mark((mrb), mrb_basic_ptr(val));\ + if (mrb_type(val) >= MRB_TT_MAIN) mrb_gc_mark((mrb), mrb_basic_ptr(val));\ } while (0) void mrb_field_write_barrier(mrb_state *, struct RBasic*, struct RBasic*); #define mrb_field_write_barrier_value(mrb, obj, val) do{\ - if ((val.tt >= MRB_TT_OBJECT)) mrb_field_write_barrier((mrb), (obj), mrb_basic_ptr(val));\ + if ((val.tt >= MRB_TT_MAIN)) mrb_field_write_barrier((mrb), (obj), mrb_basic_ptr(val));\ } while (0) void mrb_write_barrier(mrb_state *, struct RBasic*); |