diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-04 07:12:49 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-04 07:12:49 +0000 |
| commit | c77a745aab4372227e7ed929ff4d532dc7753d70 (patch) | |
| tree | d9e228ed9c74e77891796eb54990602a87c5db91 /internal.h | |
| parent | 4b146b25333c52ca4503dfc3c4215b583e8e9963 (diff) | |
* string.c: remvoe STR_ASSOC related code.
By r44804, string objects can not have STR_ASSOC flag.
* internal.h: ditto.
* ext/objspace/objspace_dump.c (dump_object): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44805 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'internal.h')
| -rw-r--r-- | internal.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/internal.h b/internal.h index afcd67f369..3a6cb240b6 100644 --- a/internal.h +++ b/internal.h @@ -715,14 +715,12 @@ VALUE rb_str_locktmp_ensure(VALUE str, VALUE (*func)(VALUE), VALUE arg); #ifdef RUBY_ENCODING_H VALUE rb_external_str_with_enc(VALUE str, rb_encoding *eenc); #endif -#define STR_NOEMBED FL_USER1 -#define STR_SHARED FL_USER2 /* = ELTS_SHARED */ -#define STR_ASSOC FL_USER3 -#define STR_SHARED_P(s) FL_ALL((s), STR_NOEMBED|ELTS_SHARED) -#define STR_ASSOC_P(s) FL_ALL((s), STR_NOEMBED|STR_ASSOC) -#define STR_NOCAPA (STR_NOEMBED|ELTS_SHARED|STR_ASSOC) -#define STR_NOCAPA_P(s) (FL_TEST((s),STR_NOEMBED) && FL_ANY((s),ELTS_SHARED|STR_ASSOC)) +#define STR_NOEMBED FL_USER1 +#define STR_SHARED FL_USER2 /* = ELTS_SHARED */ +#define STR_NOCAPA (STR_NOEMBED|ELTS_SHARED) #define STR_EMBED_P(str) (!FL_TEST((str), STR_NOEMBED)) +#define STR_SHARED_P(s) FL_ALL((s), STR_NOCAPA) +#define STR_NOCAPA_P(s) FL_ALL((s), STR_NOCAPA) #define is_ascii_string(str) (rb_enc_str_coderange(str) == ENC_CODERANGE_7BIT) #define is_broken_string(str) (rb_enc_str_coderange(str) == ENC_CODERANGE_BROKEN) |