summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorKOBAYASHI Shuji <[email protected]>2019-11-23 20:02:55 +0900
committerKOBAYASHI Shuji <[email protected]>2019-11-23 20:40:23 +0900
commit375c1ebc411ac2dd088f6897a2913c504fbc0852 (patch)
tree2fd9b0f5169404997ee6b56b10dd638c6b9b9d89 /include
parent56f9106d94bce48daf60a8d18a0792f98c204bbe (diff)
downloadmruby-375c1ebc411ac2dd088f6897a2913c504fbc0852.tar.gz
mruby-375c1ebc411ac2dd088f6897a2913c504fbc0852.zip
Rename `BITSIZE` to `BIT` and `BIT` to `BIT_POS` for consistency
The bit width terminology is unified to `BIT` according to `MRB_INT_BIT` and `CHAR_BIT`. Also the bit position terminology is unified to `BIT_POS`.
Diffstat (limited to 'include')
-rw-r--r--include/mruby/boxing_word.h4
-rw-r--r--include/mruby/string.h4
-rw-r--r--include/mruby/value.h6
3 files changed, 7 insertions, 7 deletions
diff --git a/include/mruby/boxing_word.h b/include/mruby/boxing_word.h
index d763ffaf8..73dffc5ef 100644
--- a/include/mruby/boxing_word.h
+++ b/include/mruby/boxing_word.h
@@ -43,10 +43,10 @@ enum mrb_special_consts {
#define MRB_IMMEDIATE_MASK 0x07
#ifdef MRB_64BIT
-#define MRB_SYMBOL_BITSIZE (sizeof(mrb_sym) * CHAR_BIT)
+#define MRB_SYMBOL_BIT (sizeof(mrb_sym) * CHAR_BIT)
#define MRB_SYMBOL_MAX UINT32_MAX
#else
-#define MRB_SYMBOL_BITSIZE (sizeof(mrb_sym) * CHAR_BIT - MRB_SYMBOL_SHIFT)
+#define MRB_SYMBOL_BIT (sizeof(mrb_sym) * CHAR_BIT - MRB_SYMBOL_SHIFT)
#define MRB_SYMBOL_MAX (UINT32_MAX >> MRB_SYMBOL_SHIFT)
#endif
diff --git a/include/mruby/string.h b/include/mruby/string.h
index e5a046073..80b8fbaf8 100644
--- a/include/mruby/string.h
+++ b/include/mruby/string.h
@@ -115,8 +115,8 @@ MRB_API mrb_int mrb_str_strlen(mrb_state*, struct RString*);
#define MRB_STR_POOL 16 /* status flags from here */
#define MRB_STR_ASCII 32
#define MRB_STR_EMBED_LEN_SHIFT 6
-#define MRB_STR_EMBED_LEN_BITSIZE 5
-#define MRB_STR_EMBED_LEN_MASK (((1 << MRB_STR_EMBED_LEN_BITSIZE) - 1) << MRB_STR_EMBED_LEN_SHIFT)
+#define MRB_STR_EMBED_LEN_BIT 5
+#define MRB_STR_EMBED_LEN_MASK (((1 << MRB_STR_EMBED_LEN_BIT) - 1) << MRB_STR_EMBED_LEN_SHIFT)
#define MRB_STR_TYPE_MASK (MRB_STR_POOL - 1)
diff --git a/include/mruby/value.h b/include/mruby/value.h
index 5a909a5cf..4c1ea098f 100644
--- a/include/mruby/value.h
+++ b/include/mruby/value.h
@@ -169,9 +169,9 @@ typedef void mrb_value;
#include "boxing_no.h"
#endif
-#if !defined(MRB_SYMBOL_BITSIZE)
-#define MRB_SYMBOL_BITSIZE (sizeof(mrb_sym) * CHAR_BIT)
-#define MRB_SYMBOL_MAX UINT32_MAX
+#if !defined(MRB_SYMBOL_BIT)
+#define MRB_SYMBOL_BIT (sizeof(mrb_sym) * CHAR_BIT)
+#define MRB_SYMBOL_MAX UINT32_MAX
#endif
#if INTPTR_MAX < MRB_INT_MAX