Skip to content

Commit 7e359c6

Browse files
dpgeorgedpgeorge
committed
py: Move float e/pi consts to objfloat and make mp_obj_float_t private.
1 parent aaef185 commit 7e359c6

4 files changed

Lines changed: 17 additions & 20 deletions

File tree

‎py/modcmath.c‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,6 @@
3535
/// The `cmath` module provides some basic mathematical funtions for
3636
/// working with complex numbers.
3737

38-
// These are defined in modmath.c
39-
/// \constant e - base of the natural logarithm
40-
extern const mp_obj_float_t mp_math_e_obj;
41-
/// \constant pi - the ratio of a circle's circumference to its diameter
42-
extern const mp_obj_float_t mp_math_pi_obj;
43-
4438
/// \function phase(z)
4539
/// Returns the phase of the number `z`, in the range (-pi, +pi].
4640
STATIC mp_obj_t mp_cmath_phase(mp_obj_t z_obj) {
@@ -132,8 +126,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_cmath_sin_obj, mp_cmath_sin);
132126

133127
STATIC const mp_map_elem_t mp_module_cmath_globals_table[] = {
134128
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_cmath) },
135-
{ MP_OBJ_NEW_QSTR(MP_QSTR_e), (mp_obj_t)&mp_math_e_obj },
136-
{ MP_OBJ_NEW_QSTR(MP_QSTR_pi), (mp_obj_t)&mp_math_pi_obj },
129+
{ MP_OBJ_NEW_QSTR(MP_QSTR_e), mp_const_float_e },
130+
{ MP_OBJ_NEW_QSTR(MP_QSTR_pi), mp_const_float_pi },
137131
{ MP_OBJ_NEW_QSTR(MP_QSTR_phase), (mp_obj_t)&mp_cmath_phase_obj },
138132
{ MP_OBJ_NEW_QSTR(MP_QSTR_polar), (mp_obj_t)&mp_cmath_polar_obj },
139133
{ MP_OBJ_NEW_QSTR(MP_QSTR_rect), (mp_obj_t)&mp_cmath_rect_obj },

‎py/modmath.c‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,6 @@
5252
STATIC mp_obj_t mp_math_ ## py_name(mp_obj_t x_obj) { mp_int_t x = MICROPY_FLOAT_C_FUN(c_name)(mp_obj_get_float(x_obj)); return mp_obj_new_int(x); } \
5353
STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_math_## py_name ## _obj, mp_math_ ## py_name);
5454

55-
// These are also used by cmath.c
56-
/// \constant e - base of the natural logarithm
57-
const mp_obj_float_t mp_math_e_obj = {{&mp_type_float}, M_E};
58-
/// \constant pi - the ratio of a circle's circumference to its diameter
59-
const mp_obj_float_t mp_math_pi_obj = {{&mp_type_float}, M_PI};
60-
6155
/// \function sqrt(x)
6256
/// Returns the square root of `x`.
6357
MATH_FUN_1(sqrt, sqrt)
@@ -188,8 +182,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_math_degrees_obj, mp_math_degrees);
188182

189183
STATIC const mp_map_elem_t mp_module_math_globals_table[] = {
190184
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_math) },
191-
{ MP_OBJ_NEW_QSTR(MP_QSTR_e), (mp_obj_t)&mp_math_e_obj },
192-
{ MP_OBJ_NEW_QSTR(MP_QSTR_pi), (mp_obj_t)&mp_math_pi_obj },
185+
{ MP_OBJ_NEW_QSTR(MP_QSTR_e), mp_const_float_e },
186+
{ MP_OBJ_NEW_QSTR(MP_QSTR_pi), mp_const_float_pi },
193187
{ MP_OBJ_NEW_QSTR(MP_QSTR_sqrt), (mp_obj_t)&mp_math_sqrt_obj },
194188
{ MP_OBJ_NEW_QSTR(MP_QSTR_pow), (mp_obj_t)&mp_math_pow_obj },
195189
{ MP_OBJ_NEW_QSTR(MP_QSTR_exp), (mp_obj_t)&mp_math_exp_obj },

‎py/obj.h‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -564,10 +564,11 @@ void mp_str_print_quoted(const mp_print_t *print, const byte *str_data, mp_uint_
564564

565565
#if MICROPY_PY_BUILTINS_FLOAT
566566
// float
567-
typedef struct _mp_obj_float_t {
568-
mp_obj_base_t base;
569-
mp_float_t value;
570-
} mp_obj_float_t;
567+
#define mp_const_float_e ((mp_obj_t)&mp_const_float_e_obj)
568+
#define mp_const_float_pi ((mp_obj_t)&mp_const_float_pi_obj)
569+
extern const struct _mp_obj_float_t mp_const_float_e_obj;
570+
extern const struct _mp_obj_float_t mp_const_float_pi_obj;
571+
571572
#define mp_obj_is_float(o) MP_OBJ_IS_TYPE((o), &mp_type_float)
572573
mp_float_t mp_obj_float_get(mp_obj_t self_in);
573574
mp_obj_t mp_obj_float_binary_op(mp_uint_t op, mp_float_t lhs_val, mp_obj_t rhs); // can return MP_OBJ_NULL if op not supported

‎py/objfloat.c‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@
3939
#include <math.h>
4040
#include "py/formatfloat.h"
4141

42+
typedef struct _mp_obj_float_t {
43+
mp_obj_base_t base;
44+
mp_float_t value;
45+
} mp_obj_float_t;
46+
47+
const mp_obj_float_t mp_const_float_e_obj = {{&mp_type_float}, M_E};
48+
const mp_obj_float_t mp_const_float_pi_obj = {{&mp_type_float}, M_PI};
49+
4250
STATIC void float_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
4351
(void)kind;
4452
mp_obj_float_t *o = o_in;

0 commit comments

Comments
 (0)