diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-08-18 20:37:31 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-08-18 20:37:31 +0900 |
| commit | f229ed917e1d067532c1abf2a8c2dbbab77f3460 (patch) | |
| tree | 768bdf13bf71480a16c67fd70b92cb0ac8aa8f92 /include | |
| parent | 0789ec71e037d55c60516ef831b565ec74e12a22 (diff) | |
| parent | 75ec86ed008cc17a6b494ee8629507756a9315ac (diff) | |
| download | mruby-f229ed917e1d067532c1abf2a8c2dbbab77f3460.tar.gz mruby-f229ed917e1d067532c1abf2a8c2dbbab77f3460.zip | |
Merge pull request #3785 from miura1729/original
Improve Array structure
Diffstat (limited to 'include')
| -rw-r--r-- | include/mruby/array.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/include/mruby/array.h b/include/mruby/array.h index 946897a22..11c36b675 100644 --- a/include/mruby/array.h +++ b/include/mruby/array.h @@ -41,13 +41,12 @@ struct RArray { #define mrb_ary_value(p) mrb_obj_value((void*)(p)) #define RARRAY(v) ((struct RArray*)(mrb_ptr(v))) -#define MRB_ARY_EMBED 4 -#define MRB_ARY_EMBED_MASK 3 -#define ARY_EMBED_P(a) ((a)->flags & MRB_ARY_EMBED) -#define ARY_SET_EMBED_FLAG(a) ((a)->flags |= MRB_ARY_EMBED) -#define ARY_UNSET_EMBED_FLAG(a) ((a)->flags &= ~(MRB_ARY_EMBED|MRB_ARY_EMBED_MASK)) -#define ARY_EMBED_LEN(a) ((mrb_int)((a)->flags & MRB_ARY_EMBED_MASK)) -#define ARY_SET_EMBED_LEN(a,len) (a)->flags = ((a)->flags&~MRB_ARY_EMBED_MASK) | ((len)&MRB_ARY_EMBED_MASK); +#define MRB_ARY_EMBED_MASK 7 +#define ARY_EMBED_P(a) ((a)->flags & MRB_ARY_EMBED_MASK) +//#define ARY_SET_EMBED_FLAG(a) ((a)->flags |= MRB_ARY_EMBED) +#define ARY_UNSET_EMBED_FLAG(a) ((a)->flags &= ~(MRB_ARY_EMBED_MASK)) +#define ARY_EMBED_LEN(a) (((a)->flags & MRB_ARY_EMBED_MASK) - 1) +#define ARY_SET_EMBED_LEN(a,len) ((a)->flags = ((a)->flags&~MRB_ARY_EMBED_MASK) | (len + 1)) #define ARY_EMBED_PTR(a) (&((a)->as.embed[0])) #define ARY_LEN(a) (ARY_EMBED_P(a)?ARY_EMBED_LEN(a):(a)->as.heap.len) |