30ee7019ca
Fixes for stmhal USB mass storage, lwIP bindings and VFS regressions This release provides an important fix for the USB mass storage device in the stmhal port by implementing the SCSI SYNCHRONIZE_CACHE command, which is now require by some Operating Systems. There are also fixes for the lwIP bindings to improve non-blocking sockets and error codes. The VFS has some regressions fixed including the ability to statvfs the root. All changes are listed below. py core: - modbuiltins: add core-provided version of input() function - objstr: catch case of negative "maxsplit" arg to str.rsplit() - persistentcode: allow to compile with complex numbers disabled - objstr: allow to compile with obj-repr D, and unicode disabled - modsys: allow to compile with obj-repr D and PY_ATTRTUPLE disabled - provide mp_decode_uint_skip() to help reduce stack usage - makeqstrdefs.py: make script run correctly with Python 2.6 - objstringio: if created from immutable object, follow copy on write policy extmod: - modlwip: connect: for non-blocking mode, return EINPROGRESS - modlwip: fix error codes for duplicate calls to connect() - modlwip: accept: fix error code for non-blocking mode - vfs: allow to statvfs the root directory - vfs: allow "buffering" and "encoding" args to VFS's open() - modframebuf: fix signed/unsigned comparison pendantic warning lib: - libm: use isfinite instead of finitef, for C99 compatibility - utils/interrupt_char: remove support for KBD_EXCEPTION disabled tests: - basics/string_rsplit: add tests for negative "maxsplit" argument - float: convert "sys.exit()" to "raise SystemExit" - float/builtin_float_minmax: PEP8 fixes - basics: convert "sys.exit()" to "raise SystemExit" - convert remaining "sys.exit()" to "raise SystemExit" unix port: - convert to use core-provided version of built-in import() - Makefile: replace references to make with $(MAKE) windows port: - convert to use core-provided version of built-in import() qemu-arm port: - Makefile: adjust object-file lists to get correct dependencies - enable micropython.mem_*() functions to allow more tests stmhal port: - boards: enable DAC for NUCLEO_F767ZI board - add support for NUCLEO_F446RE board - pass USB handler as parameter to allow more than one USB handler - usb: use local USB handler variable in Start-of-Frame handler - usb: make state for USB device private to top-level USB driver - usbdev: for MSC implement SCSI SYNCHRONIZE_CACHE command - convert from using stmhal's input() to core provided version cc3200 port: - convert from using stmhal's input() to core provided version teensy port: - convert from using stmhal's input() to core provided version esp8266 port: - Makefile: replace references to make with $(MAKE) - Makefile: add clean-modules target - convert from using stmhal's input() to core provided version zephyr port: - modusocket: getaddrinfo: Fix mp_obj_len() usage - define MICROPY_PY_SYS_PLATFORM (to "zephyr") - machine_pin: use native Zephyr types for Zephyr API calls docs: - machine.Pin: remove out_value() method - machine.Pin: add on() and off() methods - esp8266: consistently replace Pin.high/low methods with .on/off - esp8266/quickref: polish Pin.on()/off() examples - network: move confusingly-named cc3200 Server class to its reference - uos: deconditionalize, remove minor port-specific details - uos: move cc3200 port legacy VFS mounting functions to its ref doc - machine: sort machine classes in logical order, not alphabetically - network: first step to describe standard network class interface examples: - embedding: use core-provided KeyboardInterrupt object
253 lines
8.4 KiB
C
253 lines
8.4 KiB
C
/*
|
|
* This file is part of the Micro Python project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2014 Paul Sokolovsky
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <assert.h>
|
|
#include <string.h>
|
|
|
|
#include "py/nlr.h"
|
|
#include "py/runtime.h"
|
|
#include "py/binary.h"
|
|
|
|
#if MICROPY_PY_URE
|
|
|
|
#include "re1.5/re1.5.h"
|
|
|
|
#define FLAG_DEBUG 0x1000
|
|
|
|
typedef struct _mp_obj_re_t {
|
|
mp_obj_base_t base;
|
|
ByteProg re;
|
|
} mp_obj_re_t;
|
|
|
|
typedef struct _mp_obj_match_t {
|
|
mp_obj_base_t base;
|
|
int num_matches;
|
|
mp_obj_t str;
|
|
const char *caps[0];
|
|
} mp_obj_match_t;
|
|
|
|
|
|
STATIC void match_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
|
|
(void)kind;
|
|
mp_obj_match_t *self = MP_OBJ_TO_PTR(self_in);
|
|
mp_printf(print, "<match num=%d>", self->num_matches);
|
|
}
|
|
|
|
STATIC mp_obj_t match_group(mp_obj_t self_in, mp_obj_t no_in) {
|
|
mp_obj_match_t *self = MP_OBJ_TO_PTR(self_in);
|
|
mp_int_t no = mp_obj_get_int(no_in);
|
|
if (no < 0 || no >= self->num_matches) {
|
|
nlr_raise(mp_obj_new_exception_arg1(&mp_type_IndexError, no_in));
|
|
}
|
|
|
|
const char *start = self->caps[no * 2];
|
|
if (start == NULL) {
|
|
// no match for this group
|
|
return mp_const_none;
|
|
}
|
|
return mp_obj_new_str(start, self->caps[no * 2 + 1] - start, false);
|
|
}
|
|
MP_DEFINE_CONST_FUN_OBJ_2(match_group_obj, match_group);
|
|
|
|
STATIC const mp_rom_map_elem_t match_locals_dict_table[] = {
|
|
{ MP_ROM_QSTR(MP_QSTR_group), MP_ROM_PTR(&match_group_obj) },
|
|
};
|
|
|
|
STATIC MP_DEFINE_CONST_DICT(match_locals_dict, match_locals_dict_table);
|
|
|
|
STATIC const mp_obj_type_t match_type = {
|
|
{ &mp_type_type },
|
|
.name = MP_QSTR_match,
|
|
.print = match_print,
|
|
.locals_dict = (void*)&match_locals_dict,
|
|
};
|
|
|
|
STATIC void re_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
|
|
(void)kind;
|
|
mp_obj_re_t *self = MP_OBJ_TO_PTR(self_in);
|
|
mp_printf(print, "<re %p>", self);
|
|
}
|
|
|
|
STATIC mp_obj_t ure_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {
|
|
(void)n_args;
|
|
mp_obj_re_t *self = MP_OBJ_TO_PTR(args[0]);
|
|
Subject subj;
|
|
size_t len;
|
|
subj.begin = mp_obj_str_get_data(args[1], &len);
|
|
subj.end = subj.begin + len;
|
|
int caps_num = (self->re.sub + 1) * 2;
|
|
mp_obj_match_t *match = m_new_obj_var(mp_obj_match_t, char*, caps_num);
|
|
// cast is a workaround for a bug in msvc: it treats const char** as a const pointer instead of a pointer to pointer to const char
|
|
memset((char*)match->caps, 0, caps_num * sizeof(char*));
|
|
int res = re1_5_recursiveloopprog(&self->re, &subj, match->caps, caps_num, is_anchored);
|
|
if (res == 0) {
|
|
m_del_var(mp_obj_match_t, char*, caps_num, match);
|
|
return mp_const_none;
|
|
}
|
|
|
|
match->base.type = &match_type;
|
|
match->num_matches = caps_num / 2; // caps_num counts start and end pointers
|
|
match->str = args[1];
|
|
return MP_OBJ_FROM_PTR(match);
|
|
}
|
|
|
|
STATIC mp_obj_t re_match(size_t n_args, const mp_obj_t *args) {
|
|
return ure_exec(true, n_args, args);
|
|
}
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(re_match_obj, 2, 4, re_match);
|
|
|
|
STATIC mp_obj_t re_search(size_t n_args, const mp_obj_t *args) {
|
|
return ure_exec(false, n_args, args);
|
|
}
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(re_search_obj, 2, 4, re_search);
|
|
|
|
STATIC mp_obj_t re_split(size_t n_args, const mp_obj_t *args) {
|
|
mp_obj_re_t *self = MP_OBJ_TO_PTR(args[0]);
|
|
Subject subj;
|
|
size_t len;
|
|
subj.begin = mp_obj_str_get_data(args[1], &len);
|
|
subj.end = subj.begin + len;
|
|
int caps_num = (self->re.sub + 1) * 2;
|
|
|
|
int maxsplit = 0;
|
|
if (n_args > 2) {
|
|
maxsplit = mp_obj_get_int(args[2]);
|
|
}
|
|
|
|
mp_obj_t retval = mp_obj_new_list(0, NULL);
|
|
const char **caps = alloca(caps_num * sizeof(char*));
|
|
while (true) {
|
|
// cast is a workaround for a bug in msvc: it treats const char** as a const pointer instead of a pointer to pointer to const char
|
|
memset((char**)caps, 0, caps_num * sizeof(char*));
|
|
int res = re1_5_recursiveloopprog(&self->re, &subj, caps, caps_num, false);
|
|
|
|
// if we didn't have a match, or had an empty match, it's time to stop
|
|
if (!res || caps[0] == caps[1]) {
|
|
break;
|
|
}
|
|
|
|
mp_obj_t s = mp_obj_new_str(subj.begin, caps[0] - subj.begin, false);
|
|
mp_obj_list_append(retval, s);
|
|
if (self->re.sub > 0) {
|
|
mp_raise_NotImplementedError("Splitting with sub-captures");
|
|
}
|
|
subj.begin = caps[1];
|
|
if (maxsplit > 0 && --maxsplit == 0) {
|
|
break;
|
|
}
|
|
}
|
|
|
|
mp_obj_t s = mp_obj_new_str(subj.begin, subj.end - subj.begin, false);
|
|
mp_obj_list_append(retval, s);
|
|
return retval;
|
|
}
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(re_split_obj, 2, 3, re_split);
|
|
|
|
STATIC const mp_rom_map_elem_t re_locals_dict_table[] = {
|
|
{ MP_ROM_QSTR(MP_QSTR_match), MP_ROM_PTR(&re_match_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_search), MP_ROM_PTR(&re_search_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_split), MP_ROM_PTR(&re_split_obj) },
|
|
};
|
|
|
|
STATIC MP_DEFINE_CONST_DICT(re_locals_dict, re_locals_dict_table);
|
|
|
|
STATIC const mp_obj_type_t re_type = {
|
|
{ &mp_type_type },
|
|
.name = MP_QSTR_ure,
|
|
.print = re_print,
|
|
.locals_dict = (void*)&re_locals_dict,
|
|
};
|
|
|
|
STATIC mp_obj_t mod_re_compile(size_t n_args, const mp_obj_t *args) {
|
|
const char *re_str = mp_obj_str_get_str(args[0]);
|
|
int size = re1_5_sizecode(re_str);
|
|
if (size == -1) {
|
|
goto error;
|
|
}
|
|
mp_obj_re_t *o = m_new_obj_var(mp_obj_re_t, char, size);
|
|
o->base.type = &re_type;
|
|
int flags = 0;
|
|
if (n_args > 1) {
|
|
flags = mp_obj_get_int(args[1]);
|
|
}
|
|
int error = re1_5_compilecode(&o->re, re_str);
|
|
if (error != 0) {
|
|
error:
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Error in regex"));
|
|
}
|
|
if (flags & FLAG_DEBUG) {
|
|
re1_5_dumpcode(&o->re);
|
|
}
|
|
return MP_OBJ_FROM_PTR(o);
|
|
}
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_re_compile_obj, 1, 2, mod_re_compile);
|
|
|
|
STATIC mp_obj_t mod_re_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {
|
|
(void)n_args;
|
|
mp_obj_t self = mod_re_compile(1, args);
|
|
|
|
const mp_obj_t args2[] = {self, args[1]};
|
|
mp_obj_t match = ure_exec(is_anchored, 2, args2);
|
|
return match;
|
|
}
|
|
|
|
STATIC mp_obj_t mod_re_match(size_t n_args, const mp_obj_t *args) {
|
|
return mod_re_exec(true, n_args, args);
|
|
}
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_re_match_obj, 2, 4, mod_re_match);
|
|
|
|
STATIC mp_obj_t mod_re_search(size_t n_args, const mp_obj_t *args) {
|
|
return mod_re_exec(false, n_args, args);
|
|
}
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_re_search_obj, 2, 4, mod_re_search);
|
|
|
|
STATIC const mp_rom_map_elem_t mp_module_re_globals_table[] = {
|
|
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ure) },
|
|
{ MP_ROM_QSTR(MP_QSTR_compile), MP_ROM_PTR(&mod_re_compile_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_match), MP_ROM_PTR(&mod_re_match_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_search), MP_ROM_PTR(&mod_re_search_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_DEBUG), MP_ROM_INT(FLAG_DEBUG) },
|
|
};
|
|
|
|
STATIC MP_DEFINE_CONST_DICT(mp_module_re_globals, mp_module_re_globals_table);
|
|
|
|
const mp_obj_module_t mp_module_ure = {
|
|
.base = { &mp_type_module },
|
|
.globals = (mp_obj_dict_t*)&mp_module_re_globals,
|
|
};
|
|
|
|
// Source files #include'd here to make sure they're compiled in
|
|
// only if module is enabled by config setting.
|
|
|
|
#define re1_5_fatal(x) assert(!x)
|
|
#include "re1.5/compilecode.c"
|
|
#include "re1.5/dumpcode.c"
|
|
#include "re1.5/recursiveloop.c"
|
|
#include "re1.5/charclass.c"
|
|
|
|
#endif //MICROPY_PY_URE
|