Skip to content

Commit 897fe0c

Browse files
dpgeorgedpgeorge
committed
py: Add builtin functions bin and oct, and some tests for them.
1 parent d5323f0 commit 897fe0c

10 files changed

Lines changed: 64 additions & 2 deletions

File tree

‎py/builtin.c‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "mpconfig.h"
77
#include "qstr.h"
88
#include "obj.h"
9+
#include "objstr.h"
910
#include "runtime0.h"
1011
#include "runtime.h"
1112
#include "builtin.h"
@@ -125,6 +126,13 @@ STATIC mp_obj_t mp_builtin_any(mp_obj_t o_in) {
125126

126127
MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_any_obj, mp_builtin_any);
127128

129+
STATIC mp_obj_t mp_builtin_bin(mp_obj_t o_in) {
130+
mp_obj_t args[] = { MP_OBJ_NEW_QSTR(MP_QSTR__brace_open__colon__hash_b_brace_close_), o_in };
131+
return mp_obj_str_format(sizeof(args) / sizeof(args[0]), args);
132+
}
133+
134+
MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_bin_obj, mp_builtin_bin);
135+
128136
STATIC mp_obj_t mp_builtin_callable(mp_obj_t o_in) {
129137
if (mp_obj_is_callable(o_in)) {
130138
return mp_const_true;
@@ -299,6 +307,12 @@ STATIC mp_obj_t mp_builtin_next(mp_obj_t o) {
299307

300308
MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_next_obj, mp_builtin_next);
301309

310+
STATIC mp_obj_t mp_builtin_oct(mp_obj_t o_in) {
311+
return mp_binary_op(MP_BINARY_OP_MODULO, MP_OBJ_NEW_QSTR(MP_QSTR__percent__hash_o), o_in);
312+
}
313+
314+
MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_oct_obj, mp_builtin_oct);
315+
302316
STATIC mp_obj_t mp_builtin_ord(mp_obj_t o_in) {
303317
uint len;
304318
const char *str = mp_obj_str_get_data(o_in, &len);

‎py/builtin.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ MP_DECLARE_CONST_FUN_OBJ(mp_builtin___repl_print___obj);
66
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_abs_obj);
77
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_all_obj);
88
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_any_obj);
9+
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_bin_obj);
910
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_callable_obj);
1011
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_chr_obj);
1112
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_dir_obj);
@@ -26,6 +27,7 @@ MP_DECLARE_CONST_FUN_OBJ(mp_builtin_locals_obj);
2627
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_max_obj);
2728
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_min_obj);
2829
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_next_obj);
30+
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_oct_obj);
2931
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_ord_obj);
3032
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_pow_obj);
3133
MP_DECLARE_CONST_FUN_OBJ(mp_builtin_print_obj);

‎py/builtintables.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ STATIC const mp_map_elem_t mp_builtin_object_table[] = {
5151
{ MP_OBJ_NEW_QSTR(MP_QSTR_abs), (mp_obj_t)&mp_builtin_abs_obj },
5252
{ MP_OBJ_NEW_QSTR(MP_QSTR_all), (mp_obj_t)&mp_builtin_all_obj },
5353
{ MP_OBJ_NEW_QSTR(MP_QSTR_any), (mp_obj_t)&mp_builtin_any_obj },
54+
{ MP_OBJ_NEW_QSTR(MP_QSTR_bin), (mp_obj_t)&mp_builtin_bin_obj },
5455
{ MP_OBJ_NEW_QSTR(MP_QSTR_callable), (mp_obj_t)&mp_builtin_callable_obj },
5556
{ MP_OBJ_NEW_QSTR(MP_QSTR_chr), (mp_obj_t)&mp_builtin_chr_obj },
5657
{ MP_OBJ_NEW_QSTR(MP_QSTR_dir), (mp_obj_t)&mp_builtin_dir_obj },
@@ -70,6 +71,7 @@ STATIC const mp_map_elem_t mp_builtin_object_table[] = {
7071
{ MP_OBJ_NEW_QSTR(MP_QSTR_max), (mp_obj_t)&mp_builtin_max_obj },
7172
{ MP_OBJ_NEW_QSTR(MP_QSTR_min), (mp_obj_t)&mp_builtin_min_obj },
7273
{ MP_OBJ_NEW_QSTR(MP_QSTR_next), (mp_obj_t)&mp_builtin_next_obj },
74+
{ MP_OBJ_NEW_QSTR(MP_QSTR_oct), (mp_obj_t)&mp_builtin_oct_obj },
7375
{ MP_OBJ_NEW_QSTR(MP_QSTR_ord), (mp_obj_t)&mp_builtin_ord_obj },
7476
{ MP_OBJ_NEW_QSTR(MP_QSTR_pow), (mp_obj_t)&mp_builtin_pow_obj },
7577
{ MP_OBJ_NEW_QSTR(MP_QSTR_print), (mp_obj_t)&mp_builtin_print_obj },

‎py/makeqstrdata.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
codepoint2name[ord('/')] = 'slash'
1919
codepoint2name[ord('%')] = 'percent'
2020
codepoint2name[ord('#')] = 'hash'
21+
codepoint2name[ord('{')] = 'brace_open'
22+
codepoint2name[ord('}')] = 'brace_close'
2123

2224
# this must match the equivalent function in qstr.c
2325
def compute_hash(qstr):

‎py/objstr.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ static mp_obj_t arg_as_int(mp_obj_t arg) {
579579
return arg;
580580
}
581581

582-
mp_obj_t str_format(uint n_args, const mp_obj_t *args) {
582+
mp_obj_t mp_obj_str_format(uint n_args, const mp_obj_t *args) {
583583
assert(MP_OBJ_IS_STR(args[0]));
584584

585585
GET_STR_DATA_LEN(args[0], str, len);
@@ -1346,7 +1346,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(str_join_obj, str_join);
13461346
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_split_obj, 1, 3, str_split);
13471347
STATIC MP_DEFINE_CONST_FUN_OBJ_2(str_startswith_obj, str_startswith);
13481348
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_strip_obj, 1, 2, str_strip);
1349-
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR(str_format_obj, 1, str_format);
1349+
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR(str_format_obj, 1, mp_obj_str_format);
13501350
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_replace_obj, 3, 4, str_replace);
13511351
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_count_obj, 2, 4, str_count);
13521352
STATIC MP_DEFINE_CONST_FUN_OBJ_2(str_partition_obj, str_partition);

‎py/objstr.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ typedef struct _mp_obj_str_t {
88
} mp_obj_str_t;
99

1010
#define MP_DEFINE_STR_OBJ(obj_name, str) mp_obj_str_t obj_name = {{&mp_type_str}, 0, sizeof(str) - 1, (const byte*)str};
11+
12+
mp_obj_t mp_obj_str_format(uint n_args, const mp_obj_t *args);

‎py/qstrdefs.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ Q(all)
8383
Q(any)
8484
Q(args)
8585
Q(array)
86+
Q(bin)
87+
Q({:#b})
8688
Q(bool)
8789
Q(bytearray)
8890
Q(bytes)
@@ -122,6 +124,8 @@ Q(max)
122124
Q(min)
123125
Q(namedtuple)
124126
Q(next)
127+
Q(oct)
128+
Q(%#o)
125129
Q(open)
126130
Q(ord)
127131
Q(path)

‎tests/basics/builtin-bin.py‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# test builtin bin function
2+
3+
print(bin(1))
4+
print(bin(-1))
5+
print(bin(15))
6+
print(bin(-15))
7+
8+
print(bin(12345))
9+
print(bin(0b10101))
10+
11+
print(bin(12345678901234567890))
12+
print(bin(0b10101010101010101010))

‎tests/basics/builtin-hex.py‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# test builtin hex function
2+
3+
print(hex(1))
4+
print(hex(-1))
5+
print(hex(15))
6+
print(hex(-15))
7+
8+
print(hex(12345))
9+
print(hex(0x12345))
10+
11+
print(hex(12345678901234567890))
12+
print(hex(0x12345678901234567890))

‎tests/basics/builtin-oct.py‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# test builtin oct function
2+
3+
print(oct(1))
4+
print(oct(-1))
5+
print(oct(15))
6+
print(oct(-15))
7+
8+
print(oct(12345))
9+
print(oct(0o12345))
10+
11+
print(oct(12345678901234567890))
12+
print(oct(0o12345670123456701234))

0 commit comments

Comments
 (0)