summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2019-08-30 15:55:03 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2019-08-31 22:14:25 +0900
commitd48a2190bf45422c6ad3ae6998fe382f7c654ce1 (patch)
treed34a122c8429e2eb82a7adc6e652ee077d3c12a6 /include
parent49967097edb65dad65ed87f7ff9d531bf562919b (diff)
downloadmruby-d48a2190bf45422c6ad3ae6998fe382f7c654ce1.tar.gz
mruby-d48a2190bf45422c6ad3ae6998fe382f7c654ce1.zip
Refactor #4662 with different names.
Diffstat (limited to 'include')
-rw-r--r--include/mruby/boxing_no.h4
-rw-r--r--include/mruby/error.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/include/mruby/boxing_no.h b/include/mruby/boxing_no.h
index b22580bf6..b3b40b2cd 100644
--- a/include/mruby/boxing_no.h
+++ b/include/mruby/boxing_no.h
@@ -10,7 +10,7 @@
#define MRB_FIXNUM_SHIFT 0
#define MRB_TT_HAS_BASIC MRB_TT_OBJECT
-union mrb_value_value {
+union mrb_value_union {
#ifndef MRB_WITHOUT_FLOAT
mrb_float f;
#endif
@@ -20,7 +20,7 @@ union mrb_value_value {
};
typedef struct mrb_value {
- union mrb_value_value value;
+ union mrb_value_union value;
enum mrb_vtype tt;
} mrb_value;
diff --git a/include/mruby/error.h b/include/mruby/error.h
index 15855f96e..7e7ef3b71 100644
--- a/include/mruby/error.h
+++ b/include/mruby/error.h
@@ -44,21 +44,21 @@ struct RBreak {
struct RBreak {
MRB_OBJECT_HEADER;
struct RProc *proc;
- union mrb_value_value val_val;
+ union mrb_value_union value;
};
#define RBREAK_VALUE_TT_MASK ((1 << 8) - 1)
static inline mrb_value
mrb_break_value_get(struct RBreak *brk)
{
mrb_value val;
- val.value = brk->val_val;
+ val.value = brk->value;
val.tt = brk->flags & RBREAK_VALUE_TT_MASK;
return val;
}
static inline void
mrb_break_value_set(struct RBreak *brk, mrb_value val)
{
- brk->val_val = val.value;
+ brk->val_union = val.value;
brk->flags &= ~RBREAK_VALUE_TT_MASK;
brk->flags |= val.tt;
}