Damien George | 04b9147 | 2014-05-03 23:27:38 +0100 | [diff] [blame] | 1 | /* |
| 2 | * This file is part of the Micro Python project, http://micropython.org/ |
| 3 | * |
| 4 | * The MIT License (MIT) |
| 5 | * |
| 6 | * Copyright (c) 2013, 2014 Damien P. George |
| 7 | * |
| 8 | * Permission is hereby granted, free of charge, to any person obtaining a copy |
| 9 | * of this software and associated documentation files (the "Software"), to deal |
| 10 | * in the Software without restriction, including without limitation the rights |
| 11 | * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
| 12 | * copies of the Software, and to permit persons to whom the Software is |
| 13 | * furnished to do so, subject to the following conditions: |
| 14 | * |
| 15 | * The above copyright notice and this permission notice shall be included in |
| 16 | * all copies or substantial portions of the Software. |
| 17 | * |
| 18 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
| 19 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
| 20 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
| 21 | * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
| 22 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
| 23 | * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
| 24 | * THE SOFTWARE. |
| 25 | */ |
| 26 | |
Damien George | 660aef6 | 2014-04-02 12:22:07 +0100 | [diff] [blame] | 27 | #include <stdlib.h> |
Damien George | 45b43c2 | 2014-01-05 01:50:45 +0000 | [diff] [blame] | 28 | #include <stdint.h> |
Damien George | 45b43c2 | 2014-01-05 01:50:45 +0000 | [diff] [blame] | 29 | #include <assert.h> |
Dave Hylands | c4029e5 | 2014-04-07 11:19:51 -0700 | [diff] [blame] | 30 | #include <string.h> |
Damien George | 45b43c2 | 2014-01-05 01:50:45 +0000 | [diff] [blame] | 31 | |
Paul Sokolovsky | f54bcbf | 2014-05-02 17:47:01 +0300 | [diff] [blame] | 32 | #include "mpconfig.h" |
Damien George | 45b43c2 | 2014-01-05 01:50:45 +0000 | [diff] [blame] | 33 | #include "nlr.h" |
| 34 | #include "misc.h" |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 35 | #include "qstr.h" |
Damien George | 45b43c2 | 2014-01-05 01:50:45 +0000 | [diff] [blame] | 36 | #include "obj.h" |
Damien George | 2077397 | 2014-02-22 18:12:43 +0000 | [diff] [blame] | 37 | #include "parsenum.h" |
Damien George | d1e355e | 2014-05-28 14:51:12 +0100 | [diff] [blame] | 38 | #include "smallint.h" |
Damien George | 438c88d | 2014-02-22 19:25:23 +0000 | [diff] [blame] | 39 | #include "mpz.h" |
Paul Sokolovsky | 76a90f2 | 2014-01-13 22:31:01 +0200 | [diff] [blame] | 40 | #include "objint.h" |
Damien George | 660aef6 | 2014-04-02 12:22:07 +0100 | [diff] [blame] | 41 | #include "runtime0.h" |
| 42 | #include "runtime.h" |
Paul Sokolovsky | 48b3572 | 2014-01-12 17:30:48 +0200 | [diff] [blame] | 43 | |
Damien George | fb510b3 | 2014-06-01 13:32:54 +0100 | [diff] [blame] | 44 | #if MICROPY_PY_BUILTINS_FLOAT |
Damien George | 6433bd9 | 2014-03-30 23:13:16 +0100 | [diff] [blame] | 45 | #include <math.h> |
| 46 | #endif |
| 47 | |
Damien George | e8208a7 | 2014-04-04 15:08:23 +0100 | [diff] [blame] | 48 | // This dispatcher function is expected to be independent of the implementation of long int |
| 49 | STATIC mp_obj_t mp_obj_int_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) { |
Damien George | ee7a880 | 2014-05-11 18:37:21 +0100 | [diff] [blame] | 50 | mp_arg_check_num(n_args, n_kw, 0, 2, false); |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 51 | |
Damien George | 45b43c2 | 2014-01-05 01:50:45 +0000 | [diff] [blame] | 52 | switch (n_args) { |
| 53 | case 0: |
| 54 | return MP_OBJ_NEW_SMALL_INT(0); |
| 55 | |
| 56 | case 1: |
Damien George | 813ed3b | 2014-05-28 14:09:46 +0100 | [diff] [blame] | 57 | if (MP_OBJ_IS_INT(args[0])) { |
| 58 | // already an int (small or long), just return it |
| 59 | return args[0]; |
| 60 | } else if (MP_OBJ_IS_STR(args[0])) { |
Damien George | 5573f9f | 2014-01-15 22:58:39 +0000 | [diff] [blame] | 61 | // a string, parse it |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 62 | uint l; |
Damien George | 698ec21 | 2014-02-08 18:17:23 +0000 | [diff] [blame] | 63 | const char *s = mp_obj_str_get_data(args[0], &l); |
Damien George | 2077397 | 2014-02-22 18:12:43 +0000 | [diff] [blame] | 64 | return mp_parse_num_integer(s, l, 0); |
Damien George | fb510b3 | 2014-06-01 13:32:54 +0100 | [diff] [blame] | 65 | #if MICROPY_PY_BUILTINS_FLOAT |
Damien George | 6433bd9 | 2014-03-30 23:13:16 +0100 | [diff] [blame] | 66 | } else if (MP_OBJ_IS_TYPE(args[0], &mp_type_float)) { |
| 67 | return MP_OBJ_NEW_SMALL_INT((machine_int_t)(MICROPY_FLOAT_C_FUN(trunc)(mp_obj_float_get(args[0])))); |
| 68 | #endif |
Damien George | 5573f9f | 2014-01-15 22:58:39 +0000 | [diff] [blame] | 69 | } else { |
Damien George | 813ed3b | 2014-05-28 14:09:46 +0100 | [diff] [blame] | 70 | // try to convert to small int (eg from bool) |
Damien George | 5573f9f | 2014-01-15 22:58:39 +0000 | [diff] [blame] | 71 | return MP_OBJ_NEW_SMALL_INT(mp_obj_get_int(args[0])); |
| 72 | } |
Damien George | 45b43c2 | 2014-01-05 01:50:45 +0000 | [diff] [blame] | 73 | |
xyb | c178ea4 | 2014-01-14 21:39:05 +0800 | [diff] [blame] | 74 | case 2: |
Damien George | ee7a880 | 2014-05-11 18:37:21 +0100 | [diff] [blame] | 75 | default: { |
Damien George | 5573f9f | 2014-01-15 22:58:39 +0000 | [diff] [blame] | 76 | // should be a string, parse it |
| 77 | // TODO proper error checking of argument types |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 78 | uint l; |
Damien George | 698ec21 | 2014-02-08 18:17:23 +0000 | [diff] [blame] | 79 | const char *s = mp_obj_str_get_data(args[0], &l); |
Damien George | 2077397 | 2014-02-22 18:12:43 +0000 | [diff] [blame] | 80 | return mp_parse_num_integer(s, l, mp_obj_get_int(args[1])); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 81 | } |
Damien George | 45b43c2 | 2014-01-05 01:50:45 +0000 | [diff] [blame] | 82 | } |
| 83 | } |
| 84 | |
Damien George | e8208a7 | 2014-04-04 15:08:23 +0100 | [diff] [blame] | 85 | void mp_obj_int_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) { |
Dave Hylands | c4029e5 | 2014-04-07 11:19:51 -0700 | [diff] [blame] | 86 | // The size of this buffer is rather arbitrary. If it's not large |
| 87 | // enough, a dynamic one will be allocated. |
| 88 | char stack_buf[sizeof(machine_int_t) * 4]; |
| 89 | char *buf = stack_buf; |
| 90 | int buf_size = sizeof(stack_buf); |
| 91 | int fmt_size; |
| 92 | |
| 93 | char *str = mp_obj_int_formatted(&buf, &buf_size, &fmt_size, self_in, 10, NULL, '\0', '\0'); |
| 94 | print(env, "%s", str); |
| 95 | |
| 96 | if (buf != stack_buf) { |
| 97 | m_free(buf, buf_size); |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 98 | } |
Damien George | 45b43c2 | 2014-01-05 01:50:45 +0000 | [diff] [blame] | 99 | } |
Paul Sokolovsky | 48b3572 | 2014-01-12 17:30:48 +0200 | [diff] [blame] | 100 | |
Dave Hylands | c4029e5 | 2014-04-07 11:19:51 -0700 | [diff] [blame] | 101 | #if MICROPY_LONGINT_IMPL == MICROPY_LONGINT_IMPL_LONGLONG |
Damien George | 88d7bba | 2014-04-08 23:30:46 +0100 | [diff] [blame] | 102 | typedef mp_longint_impl_t fmt_int_t; |
Dave Hylands | c4029e5 | 2014-04-07 11:19:51 -0700 | [diff] [blame] | 103 | #else |
Damien George | 88d7bba | 2014-04-08 23:30:46 +0100 | [diff] [blame] | 104 | typedef mp_small_int_t fmt_int_t; |
Dave Hylands | c4029e5 | 2014-04-07 11:19:51 -0700 | [diff] [blame] | 105 | #endif |
| 106 | |
Damien George | 88d7bba | 2014-04-08 23:30:46 +0100 | [diff] [blame] | 107 | STATIC const uint log_base2_floor[] = { |
Dave Hylands | c4029e5 | 2014-04-07 11:19:51 -0700 | [diff] [blame] | 108 | 0, |
| 109 | 0, 1, 1, 2, |
| 110 | 2, 2, 2, 3, |
| 111 | 3, 3, 3, 3, |
| 112 | 3, 3, 3, 4, |
| 113 | 4, 4, 4, 4, |
| 114 | 4, 4, 4, 4, |
| 115 | 4, 4, 4, 4, |
| 116 | 4, 4, 4, 5 |
| 117 | }; |
| 118 | |
Damien George | 88d7bba | 2014-04-08 23:30:46 +0100 | [diff] [blame] | 119 | STATIC uint int_as_str_size_formatted(uint base, const char *prefix, char comma) { |
Dave Hylands | c4029e5 | 2014-04-07 11:19:51 -0700 | [diff] [blame] | 120 | if (base < 2 || base > 32) { |
| 121 | return 0; |
| 122 | } |
| 123 | |
| 124 | uint num_digits = sizeof(fmt_int_t) * 8 / log_base2_floor[base] + 1; |
| 125 | uint num_commas = comma ? num_digits / 3: 0; |
| 126 | uint prefix_len = prefix ? strlen(prefix) : 0; |
| 127 | return num_digits + num_commas + prefix_len + 2; // +1 for sign, +1 for null byte |
| 128 | } |
| 129 | |
Paul Sokolovsky | d72bc27 | 2014-06-06 23:08:37 +0300 | [diff] [blame^] | 130 | // This routine expects you to pass in a buffer and size (in *buf and *buf_size). |
Dave Hylands | c4029e5 | 2014-04-07 11:19:51 -0700 | [diff] [blame] | 131 | // If, for some reason, this buffer is too small, then it will allocate a |
| 132 | // buffer and return the allocated buffer and size in *buf and *buf_size. It |
| 133 | // is the callers responsibility to free this allocated buffer. |
| 134 | // |
| 135 | // The resulting formatted string will be returned from this function and the |
| 136 | // formatted size will be in *fmt_size. |
Paul Sokolovsky | ab7bf28 | 2014-05-17 11:08:33 +0300 | [diff] [blame] | 137 | char *mp_obj_int_formatted(char **buf, int *buf_size, int *fmt_size, mp_const_obj_t self_in, |
Dave Hylands | c4029e5 | 2014-04-07 11:19:51 -0700 | [diff] [blame] | 138 | int base, const char *prefix, char base_char, char comma) { |
Damien George | 88d7bba | 2014-04-08 23:30:46 +0100 | [diff] [blame] | 139 | fmt_int_t num; |
| 140 | if (MP_OBJ_IS_SMALL_INT(self_in)) { |
| 141 | // A small int; get the integer value to format. |
| 142 | num = mp_obj_get_int(self_in); |
| 143 | #if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE |
| 144 | } else if (MP_OBJ_IS_TYPE(self_in, &mp_type_int)) { |
| 145 | // Not a small int. |
| 146 | #if MICROPY_LONGINT_IMPL == MICROPY_LONGINT_IMPL_LONGLONG |
Damien George | 503d611 | 2014-05-28 14:07:21 +0100 | [diff] [blame] | 147 | const mp_obj_int_t *self = self_in; |
Damien George | 88d7bba | 2014-04-08 23:30:46 +0100 | [diff] [blame] | 148 | // Get the value to format; mp_obj_get_int truncates to machine_int_t. |
| 149 | num = self->val; |
| 150 | #else |
| 151 | // Delegate to the implementation for the long int. |
| 152 | return mp_obj_int_formatted_impl(buf, buf_size, fmt_size, self_in, base, prefix, base_char, comma); |
| 153 | #endif |
| 154 | #endif |
| 155 | } else { |
| 156 | // Not an int. |
Paul Sokolovsky | d72bc27 | 2014-06-06 23:08:37 +0300 | [diff] [blame^] | 157 | **buf = '\0'; |
Dave Hylands | c4029e5 | 2014-04-07 11:19:51 -0700 | [diff] [blame] | 158 | *fmt_size = 0; |
| 159 | return *buf; |
| 160 | } |
Damien George | 88d7bba | 2014-04-08 23:30:46 +0100 | [diff] [blame] | 161 | |
Dave Hylands | c4029e5 | 2014-04-07 11:19:51 -0700 | [diff] [blame] | 162 | char sign = '\0'; |
| 163 | if (num < 0) { |
| 164 | num = -num; |
| 165 | sign = '-'; |
| 166 | } |
| 167 | |
| 168 | uint needed_size = int_as_str_size_formatted(base, prefix, comma); |
| 169 | if (needed_size > *buf_size) { |
| 170 | *buf = m_new(char, needed_size); |
| 171 | *buf_size = needed_size; |
| 172 | } |
| 173 | char *str = *buf; |
| 174 | |
| 175 | char *b = str + needed_size; |
| 176 | *(--b) = '\0'; |
| 177 | char *last_comma = b; |
| 178 | |
| 179 | if (num == 0) { |
| 180 | *(--b) = '0'; |
| 181 | } else { |
| 182 | do { |
| 183 | int c = num % base; |
| 184 | num /= base; |
| 185 | if (c >= 10) { |
| 186 | c += base_char - 10; |
| 187 | } else { |
| 188 | c += '0'; |
| 189 | } |
| 190 | *(--b) = c; |
| 191 | if (comma && num != 0 && b > str && (last_comma - b) == 3) { |
| 192 | *(--b) = comma; |
| 193 | last_comma = b; |
| 194 | } |
| 195 | } |
| 196 | while (b > str && num != 0); |
| 197 | } |
| 198 | if (prefix) { |
| 199 | size_t prefix_len = strlen(prefix); |
| 200 | char *p = b - prefix_len; |
| 201 | if (p > str) { |
| 202 | b = p; |
| 203 | while (*prefix) { |
| 204 | *p++ = *prefix++; |
| 205 | } |
| 206 | } |
| 207 | } |
| 208 | if (sign && b > str) { |
| 209 | *(--b) = sign; |
| 210 | } |
| 211 | *fmt_size = *buf + needed_size - b - 1; |
| 212 | |
| 213 | return b; |
| 214 | } |
| 215 | |
Damien George | 88d7bba | 2014-04-08 23:30:46 +0100 | [diff] [blame] | 216 | #if MICROPY_LONGINT_IMPL == MICROPY_LONGINT_IMPL_NONE |
| 217 | |
Dave Hylands | c4029e5 | 2014-04-07 11:19:51 -0700 | [diff] [blame] | 218 | bool mp_obj_int_is_positive(mp_obj_t self_in) { |
| 219 | return mp_obj_get_int(self_in) >= 0; |
| 220 | } |
Dave Hylands | c4029e5 | 2014-04-07 11:19:51 -0700 | [diff] [blame] | 221 | |
Damien George | 660aef6 | 2014-04-02 12:22:07 +0100 | [diff] [blame] | 222 | // This is called for operations on SMALL_INT that are not handled by mp_unary_op |
Damien George | e8208a7 | 2014-04-04 15:08:23 +0100 | [diff] [blame] | 223 | mp_obj_t mp_obj_int_unary_op(int op, mp_obj_t o_in) { |
Damien George | 6ac5dce | 2014-05-21 19:42:43 +0100 | [diff] [blame] | 224 | return MP_OBJ_NULL; // op not supported |
Paul Sokolovsky | 9b00dad | 2014-01-27 09:05:50 +0200 | [diff] [blame] | 225 | } |
| 226 | |
Damien George | 660aef6 | 2014-04-02 12:22:07 +0100 | [diff] [blame] | 227 | // This is called for operations on SMALL_INT that are not handled by mp_binary_op |
Damien George | e8208a7 | 2014-04-04 15:08:23 +0100 | [diff] [blame] | 228 | mp_obj_t mp_obj_int_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) { |
| 229 | return mp_obj_int_binary_op_extra_cases(op, lhs_in, rhs_in); |
Paul Sokolovsky | 48b3572 | 2014-01-12 17:30:48 +0200 | [diff] [blame] | 230 | } |
| 231 | |
| 232 | // This is called only with strings whose value doesn't fit in SMALL_INT |
Damien George | 503d611 | 2014-05-28 14:07:21 +0100 | [diff] [blame] | 233 | mp_obj_t mp_obj_new_int_from_str_len(const char **str, uint len, bool neg, uint base) { |
Damien George | ea13f40 | 2014-04-05 18:32:08 +0100 | [diff] [blame] | 234 | nlr_raise(mp_obj_new_exception_msg(&mp_type_OverflowError, "long int not supported in this build")); |
Damien George | 2300537 | 2014-01-13 19:39:01 +0000 | [diff] [blame] | 235 | return mp_const_none; |
Paul Sokolovsky | 48b3572 | 2014-01-12 17:30:48 +0200 | [diff] [blame] | 236 | } |
| 237 | |
Damien George | 9d68e9c | 2014-03-12 15:38:15 +0000 | [diff] [blame] | 238 | // This is called when an integer larger than a SMALL_INT is needed (although val might still fit in a SMALL_INT) |
| 239 | mp_obj_t mp_obj_new_int_from_ll(long long val) { |
Damien George | ea13f40 | 2014-04-05 18:32:08 +0100 | [diff] [blame] | 240 | nlr_raise(mp_obj_new_exception_msg(&mp_type_OverflowError, "small int overflow")); |
Damien George | 9d68e9c | 2014-03-12 15:38:15 +0000 | [diff] [blame] | 241 | return mp_const_none; |
| 242 | } |
| 243 | |
Paul Sokolovsky | 48b3572 | 2014-01-12 17:30:48 +0200 | [diff] [blame] | 244 | mp_obj_t mp_obj_new_int_from_uint(machine_uint_t value) { |
| 245 | // SMALL_INT accepts only signed numbers, of one bit less size |
| 246 | // then word size, which totals 2 bits less for unsigned numbers. |
| 247 | if ((value & (WORD_MSBIT_HIGH | (WORD_MSBIT_HIGH >> 1))) == 0) { |
| 248 | return MP_OBJ_NEW_SMALL_INT(value); |
| 249 | } |
Damien George | ea13f40 | 2014-04-05 18:32:08 +0100 | [diff] [blame] | 250 | nlr_raise(mp_obj_new_exception_msg(&mp_type_OverflowError, "small int overflow")); |
Damien George | 2300537 | 2014-01-13 19:39:01 +0000 | [diff] [blame] | 251 | return mp_const_none; |
Paul Sokolovsky | 48b3572 | 2014-01-12 17:30:48 +0200 | [diff] [blame] | 252 | } |
| 253 | |
| 254 | mp_obj_t mp_obj_new_int(machine_int_t value) { |
Damien George | d1e355e | 2014-05-28 14:51:12 +0100 | [diff] [blame] | 255 | if (MP_SMALL_INT_FITS(value)) { |
Paul Sokolovsky | 48b3572 | 2014-01-12 17:30:48 +0200 | [diff] [blame] | 256 | return MP_OBJ_NEW_SMALL_INT(value); |
| 257 | } |
Damien George | ea13f40 | 2014-04-05 18:32:08 +0100 | [diff] [blame] | 258 | nlr_raise(mp_obj_new_exception_msg(&mp_type_OverflowError, "small int overflow")); |
Damien George | 2300537 | 2014-01-13 19:39:01 +0000 | [diff] [blame] | 259 | return mp_const_none; |
Paul Sokolovsky | 48b3572 | 2014-01-12 17:30:48 +0200 | [diff] [blame] | 260 | } |
Paul Sokolovsky | d26b379 | 2014-01-18 16:07:16 +0200 | [diff] [blame] | 261 | |
Damien George | 503d611 | 2014-05-28 14:07:21 +0100 | [diff] [blame] | 262 | machine_int_t mp_obj_int_get(mp_const_obj_t self_in) { |
Paul Sokolovsky | d26b379 | 2014-01-18 16:07:16 +0200 | [diff] [blame] | 263 | return MP_OBJ_SMALL_INT_VALUE(self_in); |
| 264 | } |
| 265 | |
Sven Wegener | 7ba0fed | 2014-05-17 11:17:48 +0200 | [diff] [blame] | 266 | machine_int_t mp_obj_int_get_checked(mp_const_obj_t self_in) { |
Paul Sokolovsky | d26b379 | 2014-01-18 16:07:16 +0200 | [diff] [blame] | 267 | return MP_OBJ_SMALL_INT_VALUE(self_in); |
| 268 | } |
| 269 | |
Damien George | fb510b3 | 2014-06-01 13:32:54 +0100 | [diff] [blame] | 270 | #if MICROPY_PY_BUILTINS_FLOAT |
Damien George | eabdf67 | 2014-03-22 20:54:01 +0000 | [diff] [blame] | 271 | mp_float_t mp_obj_int_as_float(mp_obj_t self_in) { |
| 272 | return MP_OBJ_SMALL_INT_VALUE(self_in); |
| 273 | } |
| 274 | #endif |
| 275 | |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 276 | #endif // MICROPY_LONGINT_IMPL == MICROPY_LONGINT_IMPL_NONE |
| 277 | |
Damien George | e8208a7 | 2014-04-04 15:08:23 +0100 | [diff] [blame] | 278 | // This dispatcher function is expected to be independent of the implementation of long int |
| 279 | // It handles the extra cases for integer-like arithmetic |
| 280 | mp_obj_t mp_obj_int_binary_op_extra_cases(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) { |
| 281 | if (rhs_in == mp_const_false) { |
| 282 | // false acts as 0 |
| 283 | return mp_binary_op(op, lhs_in, MP_OBJ_NEW_SMALL_INT(0)); |
| 284 | } else if (rhs_in == mp_const_true) { |
| 285 | // true acts as 0 |
| 286 | return mp_binary_op(op, lhs_in, MP_OBJ_NEW_SMALL_INT(1)); |
| 287 | } else if (op == MP_BINARY_OP_MULTIPLY) { |
| 288 | if (MP_OBJ_IS_STR(rhs_in) || MP_OBJ_IS_TYPE(rhs_in, &mp_type_tuple) || MP_OBJ_IS_TYPE(rhs_in, &mp_type_list)) { |
| 289 | // multiply is commutative for these types, so delegate to them |
| 290 | return mp_binary_op(op, rhs_in, lhs_in); |
| 291 | } |
| 292 | } |
Damien George | 6ac5dce | 2014-05-21 19:42:43 +0100 | [diff] [blame] | 293 | return MP_OBJ_NULL; // op not supported |
Damien George | e8208a7 | 2014-04-04 15:08:23 +0100 | [diff] [blame] | 294 | } |
| 295 | |
Damien George | 5213eb3 | 2014-04-13 12:24:13 +0100 | [diff] [blame] | 296 | // this is a classmethod |
Paul Sokolovsky | a985b45 | 2014-04-09 00:40:58 +0300 | [diff] [blame] | 297 | STATIC mp_obj_t int_from_bytes(uint n_args, const mp_obj_t *args) { |
Paul Sokolovsky | a985b45 | 2014-04-09 00:40:58 +0300 | [diff] [blame] | 298 | // TODO: Support long ints |
Damien George | 5213eb3 | 2014-04-13 12:24:13 +0100 | [diff] [blame] | 299 | // TODO: Support byteorder param (assumes 'little' at the moment) |
| 300 | // TODO: Support signed param (assumes signed=False at the moment) |
| 301 | |
| 302 | // get the buffer info |
Damien George | 57a4b4f | 2014-04-18 22:29:21 +0100 | [diff] [blame] | 303 | mp_buffer_info_t bufinfo; |
Damien George | b11b85a | 2014-04-18 22:59:24 +0100 | [diff] [blame] | 304 | mp_get_buffer_raise(args[1], &bufinfo, MP_BUFFER_READ); |
Damien George | 5213eb3 | 2014-04-13 12:24:13 +0100 | [diff] [blame] | 305 | |
| 306 | // convert the bytes to an integer |
| 307 | machine_uint_t value = 0; |
stijn | 01d6be4 | 2014-05-05 12:18:27 +0200 | [diff] [blame] | 308 | for (const byte* buf = (const byte*)bufinfo.buf + bufinfo.len - 1; buf >= (byte*)bufinfo.buf; buf--) { |
Damien George | b9e7ed4 | 2014-04-13 12:40:50 +0100 | [diff] [blame] | 309 | value = (value << 8) | *buf; |
Damien George | 5213eb3 | 2014-04-13 12:24:13 +0100 | [diff] [blame] | 310 | } |
| 311 | |
| 312 | return mp_obj_new_int_from_uint(value); |
Paul Sokolovsky | a985b45 | 2014-04-09 00:40:58 +0300 | [diff] [blame] | 313 | } |
| 314 | |
Damien George | 5213eb3 | 2014-04-13 12:24:13 +0100 | [diff] [blame] | 315 | STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(int_from_bytes_fun_obj, 2, 3, int_from_bytes); |
| 316 | STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(int_from_bytes_obj, (const mp_obj_t)&int_from_bytes_fun_obj); |
Paul Sokolovsky | a985b45 | 2014-04-09 00:40:58 +0300 | [diff] [blame] | 317 | |
| 318 | STATIC mp_obj_t int_to_bytes(uint n_args, const mp_obj_t *args) { |
| 319 | machine_int_t val = mp_obj_int_get_checked(args[0]); |
| 320 | |
| 321 | uint len = MP_OBJ_SMALL_INT_VALUE(args[1]); |
| 322 | byte *data; |
| 323 | |
| 324 | // TODO: Support long ints |
| 325 | // TODO: Support byteorder param |
| 326 | // TODO: Support signed param |
| 327 | mp_obj_t o = mp_obj_str_builder_start(&mp_type_bytes, len, &data); |
| 328 | memset(data, 0, len); |
| 329 | memcpy(data, &val, len < sizeof(machine_int_t) ? len : sizeof(machine_int_t)); |
| 330 | return mp_obj_str_builder_end(o); |
| 331 | } |
| 332 | |
| 333 | STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(int_to_bytes_obj, 2, 4, int_to_bytes); |
| 334 | |
| 335 | STATIC const mp_map_elem_t int_locals_dict_table[] = { |
| 336 | { MP_OBJ_NEW_QSTR(MP_QSTR_from_bytes), (mp_obj_t)&int_from_bytes_obj }, |
| 337 | { MP_OBJ_NEW_QSTR(MP_QSTR_to_bytes), (mp_obj_t)&int_to_bytes_obj }, |
| 338 | }; |
| 339 | |
| 340 | STATIC MP_DEFINE_CONST_DICT(int_locals_dict, int_locals_dict_table); |
| 341 | |
Damien George | 3e1a5c1 | 2014-03-29 13:43:38 +0000 | [diff] [blame] | 342 | const mp_obj_type_t mp_type_int = { |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 343 | { &mp_type_type }, |
Damien George | a71c83a | 2014-02-15 11:34:50 +0000 | [diff] [blame] | 344 | .name = MP_QSTR_int, |
Damien George | e8208a7 | 2014-04-04 15:08:23 +0100 | [diff] [blame] | 345 | .print = mp_obj_int_print, |
| 346 | .make_new = mp_obj_int_make_new, |
| 347 | .unary_op = mp_obj_int_unary_op, |
| 348 | .binary_op = mp_obj_int_binary_op, |
Paul Sokolovsky | a985b45 | 2014-04-09 00:40:58 +0300 | [diff] [blame] | 349 | .locals_dict = (mp_obj_t)&int_locals_dict, |
Damien George | 5fa93b6 | 2014-01-22 14:35:10 +0000 | [diff] [blame] | 350 | }; |