diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2021-09-25 14:44:43 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2021-09-25 14:44:43 +0900 |
| commit | 89ea41f15e92006051d443b29b6e8e32f11c68bc (patch) | |
| tree | 426caaddad14e506cb36b6e9790b43a4cf40e300 /include | |
| parent | c70159b3562e09a37577b4c6913de3ec7b8f06b4 (diff) | |
| download | mruby-89ea41f15e92006051d443b29b6e8e32f11c68bc.tar.gz mruby-89ea41f15e92006051d443b29b6e8e32f11c68bc.zip | |
mrbconf.h: rename a configuration macro for no truncate floats.
Rename `MRB_WORDBOX_USE_HEAP_FLOAT` to `MRB_WORDBOX_NO_FLOAT_TRUNCATE'.
Diffstat (limited to 'include')
| -rw-r--r-- | include/mrbconf.h | 2 | ||||
| -rw-r--r-- | include/mruby/boxing_word.h | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/mrbconf.h b/include/mrbconf.h index edc81d74d..e11a55e8c 100644 --- a/include/mrbconf.h +++ b/include/mrbconf.h @@ -80,7 +80,7 @@ #endif /* if defined mruby allocates Float objects in the heap to keep full precision if needed */ -//#define MRB_WORDBOX_USE_HEAP_FLOAT +//#define MRB_WORDBOX_NO_FLOAT_TRUNCATE /* add -DMRB_INT32 to use 32bit integer for mrb_int; conflict with MRB_INT64; Default for 32-bit CPU mode. */ diff --git a/include/mruby/boxing_word.h b/include/mruby/boxing_word.h index 357de2df0..89c6f6f2d 100644 --- a/include/mruby/boxing_word.h +++ b/include/mruby/boxing_word.h @@ -8,10 +8,10 @@ #define MRUBY_BOXING_WORD_H #if defined(MRB_32BIT) && !defined(MRB_USE_FLOAT32) -# define MRB_WORDBOX_USE_HEAP_FLOAT +# define MRB_WORDBOX_NO_FLOAT_TRUNCATE #endif -#if !defined(MRB_NO_FLOAT) && defined(MRB_WORDBOX_USE_HEAP_FLOAT) +#if !defined(MRB_NO_FLOAT) && defined(MRB_WORDBOX_NO_FLOAT_TRUNCATE) struct RFloat { MRB_OBJECT_HEADER; mrb_float f; @@ -50,7 +50,7 @@ enum mrb_special_consts { #define WORDBOX_FIXNUM_FLAG (1 << (WORDBOX_FIXNUM_BIT_POS - 1)) #define WORDBOX_FIXNUM_MASK ((1 << WORDBOX_FIXNUM_BIT_POS) - 1) -#if defined(MRB_WORDBOX_USE_HEAP_FLOAT) +#if defined(MRB_WORDBOX_NO_FLOAT_TRUNCATE) /* floats are allocated in heaps */ #define WORDBOX_SYMBOL_BIT_POS 2 #define WORDBOX_SYMBOL_SHIFT WORDBOX_SYMBOL_BIT_POS @@ -118,7 +118,7 @@ union mrb_value_ { void *p; struct RBasic *bp; #ifndef MRB_NO_FLOAT -#ifndef MRB_WORDBOX_USE_HEAP_FLOAT +#ifndef MRB_WORDBOX_NO_FLOAT_TRUNCATE mrb_float f; #else struct RFloat *fp; @@ -151,7 +151,7 @@ MRB_API mrb_value mrb_word_boxing_int_value(struct mrb_state*, mrb_int); #define mrb_ptr(o) mrb_val_union(o).p #define mrb_cptr(o) mrb_val_union(o).vp->p #ifndef MRB_NO_FLOAT -#ifndef MRB_WORDBOX_USE_HEAP_FLOAT +#ifndef MRB_WORDBOX_NO_FLOAT_TRUNCATE MRB_API mrb_float mrb_word_boxing_value_float(mrb_value v); #define mrb_float(o) mrb_word_boxing_value_float(o) #else @@ -176,7 +176,7 @@ mrb_integer_func(mrb_value o) { #define mrb_false_p(o) ((o).w == MRB_Qfalse) #define mrb_true_p(o) ((o).w == MRB_Qtrue) #ifndef MRB_NO_FLOAT -#ifndef MRB_WORDBOX_USE_HEAP_FLOAT +#ifndef MRB_WORDBOX_NO_FLOAT_TRUNCATE #define mrb_float_p(o) WORDBOX_SHIFT_VALUE_P(o, FLOAT) #else #define mrb_float_p(o) WORDBOX_OBJ_TYPE_P(o, FLOAT) |