2014-05-03 18:27:38 -04:00
|
|
|
/*
|
2017-06-30 03:22:17 -04:00
|
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
2014-05-03 18:27:38 -04:00
|
|
|
*
|
|
|
|
* The MIT License (MIT)
|
|
|
|
*
|
2020-06-03 18:40:05 -04:00
|
|
|
* SPDX-FileCopyrightText: Copyright (c) 2013, 2014 Damien P. George
|
2014-05-13 01:44:45 -04:00
|
|
|
* Copyright (c) 2014 Paul Sokolovsky
|
2014-05-03 18:27:38 -04:00
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
2014-04-09 20:45:38 -04:00
|
|
|
#include <assert.h>
|
|
|
|
#include <string.h>
|
2015-01-01 15:27:54 -05:00
|
|
|
|
2015-07-05 15:37:32 -04:00
|
|
|
#include "py/runtime.h"
|
2015-01-01 15:27:54 -05:00
|
|
|
#include "py/builtin.h"
|
|
|
|
#include "py/objtuple.h"
|
|
|
|
#include "py/binary.h"
|
|
|
|
#include "py/parsenum.h"
|
2018-07-31 19:53:54 -04:00
|
|
|
#include "supervisor/shared/translate.h"
|
2014-04-09 20:45:38 -04:00
|
|
|
|
2014-05-24 18:03:12 -04:00
|
|
|
#if MICROPY_PY_STRUCT
|
2014-04-09 20:45:38 -04:00
|
|
|
|
2014-06-02 09:04:26 -04:00
|
|
|
/*
|
|
|
|
This module implements most of character typecodes from CPython, with
|
|
|
|
some extensions:
|
|
|
|
|
|
|
|
O - (Pointer to) an arbitrary Python object. This is useful for callback
|
|
|
|
data, etc. Note that you must keep reference to passed object in
|
|
|
|
your Python application, otherwise it may be garbage-collected,
|
|
|
|
and then when you get back this value from callback it may be
|
|
|
|
invalid (and lead to crash).
|
|
|
|
S - Pointer to a string (returned as a Python string). Note the
|
|
|
|
difference from "Ns", - the latter says "in this place of structure
|
|
|
|
is character data of up to N bytes length", while "S" means
|
|
|
|
"in this place of a structure is a pointer to zero-terminated
|
|
|
|
character data".
|
|
|
|
*/
|
|
|
|
|
2014-04-09 20:45:38 -04:00
|
|
|
STATIC char get_fmt_type(const char **fmt) {
|
|
|
|
char t = **fmt;
|
|
|
|
switch (t) {
|
|
|
|
case '!':
|
|
|
|
t = '>';
|
|
|
|
break;
|
|
|
|
case '@':
|
|
|
|
case '=':
|
|
|
|
case '<':
|
|
|
|
case '>':
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return '@';
|
|
|
|
}
|
|
|
|
// Skip type char
|
|
|
|
(*fmt)++;
|
|
|
|
return t;
|
|
|
|
}
|
|
|
|
|
2014-07-03 08:25:24 -04:00
|
|
|
STATIC mp_uint_t get_fmt_num(const char **p) {
|
2014-05-12 16:45:50 -04:00
|
|
|
const char *num = *p;
|
|
|
|
uint len = 1;
|
|
|
|
while (unichar_isdigit(*++num)) {
|
|
|
|
len++;
|
|
|
|
}
|
2015-02-07 20:57:40 -05:00
|
|
|
mp_uint_t val = (mp_uint_t)MP_OBJ_SMALL_INT_VALUE(mp_parse_num_integer(*p, len, 10, NULL));
|
2014-05-12 16:45:50 -04:00
|
|
|
*p = num;
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2017-08-31 20:53:29 -04:00
|
|
|
STATIC size_t calc_size_items(const char *fmt, size_t *total_sz) {
|
2014-04-09 20:45:38 -04:00
|
|
|
char fmt_type = get_fmt_type(&fmt);
|
2017-08-31 20:53:29 -04:00
|
|
|
size_t total_cnt = 0;
|
|
|
|
size_t size;
|
2014-04-09 20:45:38 -04:00
|
|
|
for (size = 0; *fmt; fmt++) {
|
2014-07-03 08:25:24 -04:00
|
|
|
mp_uint_t cnt = 1;
|
2014-05-12 16:45:50 -04:00
|
|
|
if (unichar_isdigit(*fmt)) {
|
|
|
|
cnt = get_fmt_num(&fmt);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (*fmt == 's') {
|
2017-08-31 20:53:29 -04:00
|
|
|
total_cnt += 1;
|
2016-05-28 18:27:38 -04:00
|
|
|
size += cnt;
|
|
|
|
} else {
|
2019-01-20 15:10:09 -05:00
|
|
|
// Pad bytes are skipped and don't get included in the item count.
|
|
|
|
if (*fmt != 'x') {
|
|
|
|
total_cnt += cnt;
|
|
|
|
}
|
2021-04-23 15:26:42 -04:00
|
|
|
size_t align;
|
2016-05-28 18:27:38 -04:00
|
|
|
size_t sz = mp_binary_get_size(fmt_type, *fmt, &align);
|
|
|
|
while (cnt--) {
|
|
|
|
// Apply alignment
|
|
|
|
size = (size + align - 1) & ~(align - 1);
|
|
|
|
size += sz;
|
|
|
|
}
|
2014-05-12 16:45:50 -04:00
|
|
|
}
|
2014-04-09 20:45:38 -04:00
|
|
|
}
|
2017-08-31 20:53:29 -04:00
|
|
|
*total_sz = size;
|
|
|
|
return total_cnt;
|
|
|
|
}
|
|
|
|
|
|
|
|
STATIC mp_obj_t struct_calcsize(mp_obj_t fmt_in) {
|
|
|
|
const char *fmt = mp_obj_str_get_str(fmt_in);
|
|
|
|
size_t size;
|
|
|
|
calc_size_items(fmt, &size);
|
2014-04-09 20:45:38 -04:00
|
|
|
return MP_OBJ_NEW_SMALL_INT(size);
|
|
|
|
}
|
|
|
|
MP_DEFINE_CONST_FUN_OBJ_1(struct_calcsize_obj, struct_calcsize);
|
|
|
|
|
2015-12-23 22:11:27 -05:00
|
|
|
STATIC mp_obj_t struct_unpack_from(size_t n_args, const mp_obj_t *args) {
|
|
|
|
// unpack requires that the buffer be exactly the right size.
|
|
|
|
// unpack_from requires that the buffer be "big enough".
|
|
|
|
// Since we implement unpack and unpack_from using the same function
|
|
|
|
// we relax the "exact" requirement, and only implement "big enough".
|
|
|
|
const char *fmt = mp_obj_str_get_str(args[0]);
|
2017-08-31 20:53:29 -04:00
|
|
|
size_t total_sz;
|
|
|
|
size_t num_items = calc_size_items(fmt, &total_sz);
|
2014-04-09 20:45:38 -04:00
|
|
|
char fmt_type = get_fmt_type(&fmt);
|
2015-12-23 22:11:27 -05:00
|
|
|
mp_obj_tuple_t *res = MP_OBJ_TO_PTR(mp_obj_new_tuple(num_items, NULL));
|
2014-04-18 17:29:21 -04:00
|
|
|
mp_buffer_info_t bufinfo;
|
2015-12-23 22:11:27 -05:00
|
|
|
mp_get_buffer_raise(args[1], &bufinfo, MP_BUFFER_READ);
|
2014-04-09 20:45:38 -04:00
|
|
|
byte *p = bufinfo.buf;
|
2015-12-23 22:11:27 -05:00
|
|
|
byte *end_p = &p[bufinfo.len];
|
|
|
|
mp_int_t offset = 0;
|
2014-04-09 20:45:38 -04:00
|
|
|
|
2015-12-23 22:11:27 -05:00
|
|
|
if (n_args > 2) {
|
|
|
|
// offset arg provided
|
|
|
|
offset = mp_obj_get_int(args[2]);
|
|
|
|
if (offset < 0) {
|
|
|
|
// negative offsets are relative to the end of the buffer
|
|
|
|
offset = bufinfo.len + offset;
|
|
|
|
if (offset < 0) {
|
2018-07-31 19:53:54 -04:00
|
|
|
mp_raise_ValueError(translate("buffer too small"));
|
2015-12-23 22:11:27 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
p += offset;
|
|
|
|
}
|
2021-04-23 15:26:42 -04:00
|
|
|
byte *p_base = p;
|
2015-12-23 22:11:27 -05:00
|
|
|
|
2017-08-31 20:53:29 -04:00
|
|
|
// Check that the input buffer is big enough to unpack all the values
|
|
|
|
if (p + total_sz > end_p) {
|
2018-07-31 19:53:54 -04:00
|
|
|
mp_raise_ValueError(translate("buffer too small"));
|
2017-08-31 20:53:29 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
for (size_t i = 0; i < num_items;) {
|
|
|
|
mp_uint_t cnt = 1;
|
2014-05-12 16:45:50 -04:00
|
|
|
if (unichar_isdigit(*fmt)) {
|
2017-08-31 20:53:29 -04:00
|
|
|
cnt = get_fmt_num(&fmt);
|
2015-12-23 22:11:27 -05:00
|
|
|
}
|
2014-05-12 16:45:50 -04:00
|
|
|
mp_obj_t item;
|
|
|
|
if (*fmt == 's') {
|
2017-08-31 20:53:29 -04:00
|
|
|
item = mp_obj_new_bytes(p, cnt);
|
|
|
|
p += cnt;
|
2015-10-31 11:42:35 -04:00
|
|
|
res->items[i++] = item;
|
2014-05-12 16:45:50 -04:00
|
|
|
} else {
|
2017-08-31 20:53:29 -04:00
|
|
|
while (cnt--) {
|
2021-04-23 15:26:42 -04:00
|
|
|
item = mp_binary_get_val(fmt_type, *fmt, p_base, &p);
|
2019-01-20 15:10:09 -05:00
|
|
|
// Pad bytes ('x') are just skipped.
|
|
|
|
if (*fmt != 'x') {
|
|
|
|
res->items[i++] = item;
|
|
|
|
}
|
2015-10-31 11:42:35 -04:00
|
|
|
}
|
2014-05-12 16:45:50 -04:00
|
|
|
}
|
2015-10-31 11:42:35 -04:00
|
|
|
fmt++;
|
2014-04-09 20:45:38 -04:00
|
|
|
}
|
2015-11-27 12:01:44 -05:00
|
|
|
return MP_OBJ_FROM_PTR(res);
|
2014-04-09 20:45:38 -04:00
|
|
|
}
|
2015-12-23 22:11:27 -05:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(struct_unpack_from_obj, 2, 3, struct_unpack_from);
|
2014-04-09 20:45:38 -04:00
|
|
|
|
2017-08-31 21:11:09 -04:00
|
|
|
// This function assumes there is enough room in p to store all the values
|
|
|
|
STATIC void struct_pack_into_internal(mp_obj_t fmt_in, byte *p, size_t n_args, const mp_obj_t *args) {
|
modstruct: Improve compliance with python3
While checking whether we can enable -Wimplicit-fallthrough, I encountered
a diagnostic in mp_binary_set_val_array_from_int which led to discovering
the following bug:
```
>>> struct.pack("xb", 3)
b'\x03\x03'
```
That is, the next value (3) was used as the value of a padding byte, while
standard Python always fills "x" bytes with zeros. I initially thought
this had to do with the unintentional fallthrough, but it doesn't.
Instead, this code would relate to an array.array with a typecode of
padding ('x'), which is ALSO not desktop Python compliant:
```
>>> array.array('x', (1, 2, 3))
array('x', [1, 0, 0])
```
Possibly this is dead code that used to be shared between struct-setting
and array-setting, but it no longer is.
I also discovered that the argument list length for struct.pack
and struct.pack_into were not checked, and that the length of binary data
passed to array.array was not checked to be a multiple of the element
size.
I have corrected all of these to conform more closely to standard Python
and revised some tests where necessary. Some tests for micropython-specific
behavior that does not conform to standard Python and is not present
in CircuitPython was deleted outright.
2020-09-12 14:57:31 -04:00
|
|
|
size_t size;
|
|
|
|
size_t count = calc_size_items(mp_obj_str_get_str(fmt_in), &size);
|
|
|
|
if (count != n_args) {
|
2021-03-15 09:57:36 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
|
modstruct: Improve compliance with python3
While checking whether we can enable -Wimplicit-fallthrough, I encountered
a diagnostic in mp_binary_set_val_array_from_int which led to discovering
the following bug:
```
>>> struct.pack("xb", 3)
b'\x03\x03'
```
That is, the next value (3) was used as the value of a padding byte, while
standard Python always fills "x" bytes with zeros. I initially thought
this had to do with the unintentional fallthrough, but it doesn't.
Instead, this code would relate to an array.array with a typecode of
padding ('x'), which is ALSO not desktop Python compliant:
```
>>> array.array('x', (1, 2, 3))
array('x', [1, 0, 0])
```
Possibly this is dead code that used to be shared between struct-setting
and array-setting, but it no longer is.
I also discovered that the argument list length for struct.pack
and struct.pack_into were not checked, and that the length of binary data
passed to array.array was not checked to be a multiple of the element
size.
I have corrected all of these to conform more closely to standard Python
and revised some tests where necessary. Some tests for micropython-specific
behavior that does not conform to standard Python and is not present
in CircuitPython was deleted outright.
2020-09-12 14:57:31 -04:00
|
|
|
mp_raise_ValueError(NULL);
|
2021-03-15 09:57:36 -04:00
|
|
|
#else
|
modstruct: Improve compliance with python3
While checking whether we can enable -Wimplicit-fallthrough, I encountered
a diagnostic in mp_binary_set_val_array_from_int which led to discovering
the following bug:
```
>>> struct.pack("xb", 3)
b'\x03\x03'
```
That is, the next value (3) was used as the value of a padding byte, while
standard Python always fills "x" bytes with zeros. I initially thought
this had to do with the unintentional fallthrough, but it doesn't.
Instead, this code would relate to an array.array with a typecode of
padding ('x'), which is ALSO not desktop Python compliant:
```
>>> array.array('x', (1, 2, 3))
array('x', [1, 0, 0])
```
Possibly this is dead code that used to be shared between struct-setting
and array-setting, but it no longer is.
I also discovered that the argument list length for struct.pack
and struct.pack_into were not checked, and that the length of binary data
passed to array.array was not checked to be a multiple of the element
size.
I have corrected all of these to conform more closely to standard Python
and revised some tests where necessary. Some tests for micropython-specific
behavior that does not conform to standard Python and is not present
in CircuitPython was deleted outright.
2020-09-12 14:57:31 -04:00
|
|
|
mp_raise_ValueError_varg(translate("pack expected %d items for packing (got %d)"), count, n_args);
|
2021-03-15 09:57:36 -04:00
|
|
|
#endif
|
modstruct: Improve compliance with python3
While checking whether we can enable -Wimplicit-fallthrough, I encountered
a diagnostic in mp_binary_set_val_array_from_int which led to discovering
the following bug:
```
>>> struct.pack("xb", 3)
b'\x03\x03'
```
That is, the next value (3) was used as the value of a padding byte, while
standard Python always fills "x" bytes with zeros. I initially thought
this had to do with the unintentional fallthrough, but it doesn't.
Instead, this code would relate to an array.array with a typecode of
padding ('x'), which is ALSO not desktop Python compliant:
```
>>> array.array('x', (1, 2, 3))
array('x', [1, 0, 0])
```
Possibly this is dead code that used to be shared between struct-setting
and array-setting, but it no longer is.
I also discovered that the argument list length for struct.pack
and struct.pack_into were not checked, and that the length of binary data
passed to array.array was not checked to be a multiple of the element
size.
I have corrected all of these to conform more closely to standard Python
and revised some tests where necessary. Some tests for micropython-specific
behavior that does not conform to standard Python and is not present
in CircuitPython was deleted outright.
2020-09-12 14:57:31 -04:00
|
|
|
}
|
2015-12-23 22:11:27 -05:00
|
|
|
const char *fmt = mp_obj_str_get_str(fmt_in);
|
2014-04-18 20:13:15 -04:00
|
|
|
char fmt_type = get_fmt_type(&fmt);
|
|
|
|
|
2021-04-23 15:26:42 -04:00
|
|
|
byte *p_base = p;
|
2015-12-23 22:11:27 -05:00
|
|
|
size_t i;
|
|
|
|
for (i = 0; i < n_args;) {
|
2017-08-31 21:11:09 -04:00
|
|
|
mp_uint_t cnt = 1;
|
2014-05-12 16:45:50 -04:00
|
|
|
if (unichar_isdigit(*fmt)) {
|
2017-08-31 21:11:09 -04:00
|
|
|
cnt = get_fmt_num(&fmt);
|
2015-12-23 22:11:27 -05:00
|
|
|
}
|
2014-05-12 16:45:50 -04:00
|
|
|
|
|
|
|
if (*fmt == 's') {
|
|
|
|
mp_buffer_info_t bufinfo;
|
2015-10-31 11:42:35 -04:00
|
|
|
mp_get_buffer_raise(args[i++], &bufinfo, MP_BUFFER_READ);
|
2017-08-31 21:11:09 -04:00
|
|
|
mp_uint_t to_copy = cnt;
|
2014-05-12 16:45:50 -04:00
|
|
|
if (bufinfo.len < to_copy) {
|
|
|
|
to_copy = bufinfo.len;
|
|
|
|
}
|
|
|
|
memcpy(p, bufinfo.buf, to_copy);
|
2017-08-31 21:11:09 -04:00
|
|
|
memset(p + to_copy, 0, cnt - to_copy);
|
|
|
|
p += cnt;
|
2014-05-12 16:45:50 -04:00
|
|
|
} else {
|
modstruct: Improve compliance with python3
While checking whether we can enable -Wimplicit-fallthrough, I encountered
a diagnostic in mp_binary_set_val_array_from_int which led to discovering
the following bug:
```
>>> struct.pack("xb", 3)
b'\x03\x03'
```
That is, the next value (3) was used as the value of a padding byte, while
standard Python always fills "x" bytes with zeros. I initially thought
this had to do with the unintentional fallthrough, but it doesn't.
Instead, this code would relate to an array.array with a typecode of
padding ('x'), which is ALSO not desktop Python compliant:
```
>>> array.array('x', (1, 2, 3))
array('x', [1, 0, 0])
```
Possibly this is dead code that used to be shared between struct-setting
and array-setting, but it no longer is.
I also discovered that the argument list length for struct.pack
and struct.pack_into were not checked, and that the length of binary data
passed to array.array was not checked to be a multiple of the element
size.
I have corrected all of these to conform more closely to standard Python
and revised some tests where necessary. Some tests for micropython-specific
behavior that does not conform to standard Python and is not present
in CircuitPython was deleted outright.
2020-09-12 14:57:31 -04:00
|
|
|
while (cnt--) {
|
2019-01-20 15:10:09 -05:00
|
|
|
// Pad bytes don't have a corresponding argument.
|
2021-04-19 17:58:40 -04:00
|
|
|
if (*fmt == 'x') {
|
2021-04-23 15:26:42 -04:00
|
|
|
mp_binary_set_val(fmt_type, *fmt, MP_OBJ_NEW_SMALL_INT(0), p_base, &p);
|
2021-04-19 17:58:40 -04:00
|
|
|
} else {
|
2021-04-23 15:26:42 -04:00
|
|
|
mp_binary_set_val(fmt_type, *fmt, args[i], p_base, &p);
|
2019-01-20 15:10:09 -05:00
|
|
|
i++;
|
|
|
|
}
|
2015-10-31 11:42:35 -04:00
|
|
|
}
|
2014-05-12 16:45:50 -04:00
|
|
|
}
|
2015-10-31 11:42:35 -04:00
|
|
|
fmt++;
|
2014-04-18 20:13:15 -04:00
|
|
|
}
|
2015-12-23 22:11:27 -05:00
|
|
|
}
|
2015-01-21 17:48:37 -05:00
|
|
|
|
2015-12-23 22:11:27 -05:00
|
|
|
STATIC mp_obj_t struct_pack(size_t n_args, const mp_obj_t *args) {
|
|
|
|
mp_int_t size = MP_OBJ_SMALL_INT_VALUE(struct_calcsize(args[0]));
|
|
|
|
vstr_t vstr;
|
|
|
|
vstr_init_len(&vstr, size);
|
2021-03-15 09:57:36 -04:00
|
|
|
byte *p = (byte *)vstr.buf;
|
2015-12-23 22:11:27 -05:00
|
|
|
memset(p, 0, size);
|
2017-08-31 21:11:09 -04:00
|
|
|
struct_pack_into_internal(args[0], p, n_args - 1, &args[1]);
|
2015-01-21 17:48:37 -05:00
|
|
|
return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
|
2014-04-18 20:13:15 -04:00
|
|
|
}
|
2014-05-11 15:50:27 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(struct_pack_obj, 1, MP_OBJ_FUN_ARGS_MAX, struct_pack);
|
2014-04-18 20:13:15 -04:00
|
|
|
|
2015-12-23 22:11:27 -05:00
|
|
|
STATIC mp_obj_t struct_pack_into(size_t n_args, const mp_obj_t *args) {
|
|
|
|
mp_buffer_info_t bufinfo;
|
|
|
|
mp_get_buffer_raise(args[1], &bufinfo, MP_BUFFER_WRITE);
|
|
|
|
mp_int_t offset = mp_obj_get_int(args[2]);
|
|
|
|
if (offset < 0) {
|
|
|
|
// negative offsets are relative to the end of the buffer
|
|
|
|
offset = (mp_int_t)bufinfo.len + offset;
|
|
|
|
if (offset < 0) {
|
2018-07-31 19:53:54 -04:00
|
|
|
mp_raise_ValueError(translate("buffer too small"));
|
2015-12-23 22:11:27 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
byte *p = (byte *)bufinfo.buf;
|
|
|
|
byte *end_p = &p[bufinfo.len];
|
|
|
|
p += offset;
|
|
|
|
|
2017-08-31 21:11:09 -04:00
|
|
|
// Check that the output buffer is big enough to hold all the values
|
|
|
|
mp_int_t sz = MP_OBJ_SMALL_INT_VALUE(struct_calcsize(args[0]));
|
|
|
|
if (p + sz > end_p) {
|
2018-07-31 19:53:54 -04:00
|
|
|
mp_raise_ValueError(translate("buffer too small"));
|
2017-08-31 21:11:09 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
struct_pack_into_internal(args[0], p, n_args - 3, &args[3]);
|
2015-12-23 22:11:27 -05:00
|
|
|
return mp_const_none;
|
|
|
|
}
|
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(struct_pack_into_obj, 3, MP_OBJ_FUN_ARGS_MAX, struct_pack_into);
|
|
|
|
|
2015-11-27 08:38:15 -05:00
|
|
|
STATIC const mp_rom_map_elem_t mp_module_struct_globals_table[] = {
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ustruct) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_calcsize), MP_ROM_PTR(&struct_calcsize_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_pack), MP_ROM_PTR(&struct_pack_obj) },
|
2015-12-23 22:11:27 -05:00
|
|
|
{ MP_ROM_QSTR(MP_QSTR_pack_into), MP_ROM_PTR(&struct_pack_into_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_unpack), MP_ROM_PTR(&struct_unpack_from_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_unpack_from), MP_ROM_PTR(&struct_unpack_from_obj) },
|
2014-04-09 20:45:38 -04:00
|
|
|
};
|
|
|
|
|
2014-11-29 09:39:27 -05:00
|
|
|
STATIC MP_DEFINE_CONST_DICT(mp_module_struct_globals, mp_module_struct_globals_table);
|
2014-04-09 20:45:38 -04:00
|
|
|
|
2015-05-04 09:35:40 -04:00
|
|
|
const mp_obj_module_t mp_module_ustruct = {
|
2014-04-09 20:45:38 -04:00
|
|
|
.base = { &mp_type_module },
|
2021-03-15 09:57:36 -04:00
|
|
|
.globals = (mp_obj_dict_t *)&mp_module_struct_globals,
|
2014-04-09 20:45:38 -04:00
|
|
|
};
|
|
|
|
|
|
|
|
#endif
|