From e75654a991f8bf029f9b997e2eb50f3e9a58413b Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Wed, 8 Jan 2025 14:24:12 +0900 Subject: [PATCH] string.h (RSTR_SET_TYPE): simplify macro definition --- include/mruby/string.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/mruby/string.h b/include/mruby/string.h index 639f62248..7e6f1d461 100644 --- a/include/mruby/string.h +++ b/include/mruby/string.h @@ -38,8 +38,7 @@ struct RStringEmbed { char ary[RSTRING_EMBED_LEN_MAX+1]; }; -#define RSTR_SET_TYPE(s, type) (RSTR_UNSET_TYPE_FLAG(s), (s)->flags |= MRB_STR_##type) -#define RSTR_UNSET_TYPE_FLAG(s) ((s)->flags &= ~(MRB_STR_TYPE_MASK|MRB_STR_EMBED_LEN_MASK)) +#define RSTR_SET_TYPE(s, type) ((s)->flags = ((s)->flags & ~(MRB_STR_TYPE_MASK|MRB_STR_EMBED_LEN_MASK)) | MRB_STR_##type) #define RSTR_EMBED_P(s) ((s)->flags & MRB_STR_EMBED) #define RSTR_SET_EMBED_FLAG(s) ((s)->flags |= MRB_STR_EMBED)