summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--py/objlist.c22
-rw-r--r--py/objstr.c53
-rw-r--r--stm/fatfs/00readme.txt147
-rw-r--r--tests/basics/tests/list_index.py24
-rw-r--r--tests/basics/tests/string1.py3
-rw-r--r--tests/basics/tests/types1.py28
6 files changed, 276 insertions, 1 deletions
diff --git a/py/objlist.c b/py/objlist.c
index 3018826113..6c0de405fe 100644
--- a/py/objlist.c
+++ b/py/objlist.c
@@ -177,10 +177,31 @@ static mp_obj_t list_count(mp_obj_t self_in, mp_obj_t value) {
return mp_obj_new_int(count);
}
+static mp_obj_t list_index(int n_args, const mp_obj_t *args) {
+ assert(2 <= n_args && n_args <= 4);
+ assert(MP_OBJ_IS_TYPE(args[0], &list_type));
+ mp_obj_list_t *self = args[0];
+ mp_obj_t *value = args[1];
+
+ uint start = mp_get_index(self->base.type, self->len,
+ n_args >= 3 ? args[2] : mp_obj_new_int(0));
+ uint stop = mp_get_index(self->base.type, self->len,
+ n_args >= 4 ? args[3] : mp_obj_new_int(-1));
+
+ for (uint i = start; i <= stop; i++) {
+ if (mp_obj_equal(self->items[i], value)) {
+ return mp_obj_new_int(i);
+ }
+ }
+
+ nlr_jump(mp_obj_new_exception_msg(MP_QSTR_ValueError, "object not in list"));
+}
+
static MP_DEFINE_CONST_FUN_OBJ_2(list_append_obj, mp_obj_list_append);
static MP_DEFINE_CONST_FUN_OBJ_1(list_clear_obj, list_clear);
static MP_DEFINE_CONST_FUN_OBJ_1(list_copy_obj, list_copy);
static MP_DEFINE_CONST_FUN_OBJ_2(list_count_obj, list_count);
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(list_index_obj, 2, 4, list_index);
static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(list_pop_obj, 1, 2, list_pop);
static MP_DEFINE_CONST_FUN_OBJ_2(list_sort_obj, list_sort);
@@ -199,6 +220,7 @@ const mp_obj_type_t list_type = {
{ "clear", &list_clear_obj },
{ "copy", &list_copy_obj },
{ "count", &list_count_obj },
+ { "index", &list_index_obj },
{ "pop", &list_pop_obj },
{ "sort", &list_sort_obj },
{ NULL, NULL }, // end-of-list sentinel
diff --git a/py/objstr.c b/py/objstr.c
index 27c9440d03..a1d139e83a 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -17,6 +17,11 @@ typedef struct _mp_obj_str_t {
qstr qstr;
} mp_obj_str_t;
+static mp_obj_t mp_obj_new_str_iterator(mp_obj_str_t *str, int cur);
+
+/******************************************************************************/
+/* str */
+
void str_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in) {
mp_obj_str_t *self = self_in;
// TODO need to escape chars etc
@@ -85,6 +90,10 @@ mp_obj_t str_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
return MP_OBJ_NULL; // op not supported
}
+static mp_obj_t str_getiter(mp_obj_t o_in) {
+ return mp_obj_new_str_iterator(o_in, 0);
+}
+
mp_obj_t str_join(mp_obj_t self_in, mp_obj_t arg) {
assert(MP_OBJ_IS_TYPE(self_in, &str_type));
mp_obj_str_t *self = self_in;
@@ -183,7 +192,7 @@ const mp_obj_type_t str_type = {
NULL, // call_n
NULL, // unary_op
str_binary_op, // binary_op
- NULL, // getiter
+ str_getiter, // getiter
NULL, // iternext
{ // method list
{ "join", &str_join_obj },
@@ -204,3 +213,45 @@ qstr mp_obj_str_get(mp_obj_t self_in) {
mp_obj_str_t *self = self_in;
return self->qstr;
}
+
+/******************************************************************************/
+/* str iterator */
+
+typedef struct _mp_obj_str_it_t {
+ mp_obj_base_t base;
+ mp_obj_str_t *str;
+ machine_uint_t cur;
+} mp_obj_str_it_t;
+
+mp_obj_t str_it_iternext(mp_obj_t self_in) {
+ mp_obj_str_it_t *self = self_in;
+ const char *str = qstr_str(self->str->qstr);
+ if (self->cur < strlen(str)) {
+ mp_obj_t o_out = mp_obj_new_str(qstr_from_strn_copy(str + self->cur, 1));
+ self->cur += 1;
+ return o_out;
+ } else {
+ return mp_const_stop_iteration;
+ }
+}
+
+static const mp_obj_type_t str_it_type = {
+ { &mp_const_type },
+ "str_iterator",
+ NULL, // print
+ NULL, // make_new
+ NULL, // call_n
+ NULL, // unary_op
+ NULL, // binary_op
+ NULL, // getiter
+ str_it_iternext, // iternext
+ { { NULL, NULL }, }, // method str
+};
+
+mp_obj_t mp_obj_new_str_iterator(mp_obj_str_t *str, int cur) {
+ mp_obj_str_it_t *o = m_new_obj(mp_obj_str_it_t);
+ o->base.type = &str_it_type;
+ o->str = str;
+ o->cur = cur;
+ return o;
+}
diff --git a/stm/fatfs/00readme.txt b/stm/fatfs/00readme.txt
new file mode 100644
index 0000000000..bd0939ffab
--- /dev/null
+++ b/stm/fatfs/00readme.txt
@@ -0,0 +1,147 @@
+FatFs Module Source Files R0.10 (C)ChaN, 2013
+
+
+FILES
+
+ ffconf.h Configuration file for FatFs module.
+ ff.h Common include file for FatFs and application module.
+ ff.c FatFs module.
+ diskio.h Common include file for FatFs and disk I/O module.
+ diskio.c An example of glue function to attach existing disk I/O module to FatFs.
+ integer.h Integer type definitions for FatFs.
+ option Optional external functions.
+
+ Low level disk I/O module is not included in this archive because the FatFs
+ module is only a generic file system layer and not depend on any specific
+ storage device. You have to provide a low level disk I/O module that written
+ to control your storage device.
+
+
+
+AGREEMENTS
+
+ FatFs module is an open source software to implement FAT file system to
+ small embedded systems. This is a free software and is opened for education,
+ research and commercial developments under license policy of following trems.
+
+ Copyright (C) 2013, ChaN, all right reserved.
+
+ * The FatFs module is a free software and there is NO WARRANTY.
+ * No restriction on use. You can use, modify and redistribute it for
+ personal, non-profit or commercial product UNDER YOUR RESPONSIBILITY.
+ * Redistributions of source code must retain the above copyright notice.
+
+
+
+REVISION HISTORY
+
+ Feb 26, 2006 R0.00 Prototype
+
+ Apr 29, 2006 R0.01 First release.
+
+ Jun 01, 2006 R0.02 Added FAT12.
+ Removed unbuffered mode.
+ Fixed a problem on small (<32M) patition.
+
+ Jun 10, 2006 R0.02a Added a configuration option _FS_MINIMUM.
+
+ Sep 22, 2006 R0.03 Added f_rename.
+ Changed option _FS_MINIMUM to _FS_MINIMIZE.
+
+ Dec 11, 2006 R0.03a Improved cluster scan algolithm to write files fast.
+ Fixed f_mkdir creates incorrect directory on FAT32.
+
+ Feb 04, 2007 R0.04 Supported multiple drive system. (FatFs)
+ Changed some APIs for multiple drive system.
+ Added f_mkfs. (FatFs)
+ Added _USE_FAT32 option. (Tiny-FatFs)
+
+ Apr 01, 2007 R0.04a Supported multiple partitions on a plysical drive. (FatFs)
+ Fixed an endian sensitive code in f_mkfs. (FatFs)
+ Added a capability of extending the file size to f_lseek.
+ Added minimization level 3.
+ Fixed a problem that can collapse a sector when recreate an
+ existing file in any sub-directory at non FAT32 cfg. (Tiny-FatFs)
+
+ May 05, 2007 R0.04b Added _USE_NTFLAG option.
+ Added FSInfo support.
+ Fixed some problems corresponds to FAT32. (Tiny-FatFs)
+ Fixed DBCS name can result FR_INVALID_NAME.
+ Fixed short seek (0 < ofs <= csize) collapses the file object.
+
+ Aug 25, 2007 R0.05 Changed arguments of f_read, f_write.
+ Changed arguments of f_mkfs. (FatFs)
+ Fixed f_mkfs on FAT32 creates incorrect FSInfo. (FatFs)
+ Fixed f_mkdir on FAT32 creates incorrect directory. (FatFs)
+
+ Feb 03, 2008 R0.05a Added f_truncate().
+ Added f_utime().
+ Fixed off by one error at FAT sub-type determination.
+ Fixed btr in f_read() can be mistruncated.
+ Fixed cached sector is not flushed when create and close without write.
+
+ Apr 01, 2008 R0.06 Added f_forward(). (Tiny-FatFs)
+ Added string functions: fputc(), fputs(), fprintf() and fgets().
+ Improved performance of f_lseek() on move to the same or following cluster.
+
+ Apr 01, 2009, R0.07 Merged Tiny-FatFs as a buffer configuration option.
+ Added long file name support.
+ Added multiple code page support.
+ Added re-entrancy for multitask operation.
+ Added auto cluster size selection to f_mkfs().
+ Added rewind option to f_readdir().
+ Changed result code of critical errors.
+ Renamed string functions to avoid name collision.
+
+ Apr 14, 2009, R0.07a Separated out OS dependent code on reentrant cfg.
+ Added multiple sector size support.
+
+ Jun 21, 2009, R0.07c Fixed f_unlink() may return FR_OK on error.
+ Fixed wrong cache control in f_lseek().
+ Added relative path feature.
+ Added f_chdir().
+ Added f_chdrive().
+ Added proper case conversion for extended characters.
+
+ Nov 03, 2009 R0.07e Separated out configuration options from ff.h to ffconf.h.
+ Added a configuration option, _LFN_UNICODE.
+ Fixed f_unlink() fails to remove a sub-dir on _FS_RPATH.
+ Fixed name matching error on the 13 char boundary.
+ Changed f_readdir() to return the SFN with always upper case on non-LFN cfg.
+
+ May 15, 2010, R0.08 Added a memory configuration option. (_USE_LFN)
+ Added file lock feature. (_FS_SHARE)
+ Added fast seek feature. (_USE_FASTSEEK)
+ Changed some types on the API, XCHAR->TCHAR.
+ Changed fname member in the FILINFO structure on Unicode cfg.
+ String functions support UTF-8 encoding files on Unicode cfg.
+
+ Aug 16,'10 R0.08a Added f_getcwd(). (_FS_RPATH = 2)
+ Added sector erase feature. (_USE_ERASE)
+ Moved file lock semaphore table from fs object to the bss.
+ Fixed a wrong directory entry is created on non-LFN cfg when the given name contains ';'.
+ Fixed f_mkfs() creates wrong FAT32 volume.
+
+ Jan 15,'11 R0.08b Fast seek feature is also applied to f_read() and f_write().
+ f_lseek() reports required table size on creating CLMP.
+ Extended format syntax of f_printf function.
+ Ignores duplicated directory separators in given path names.
+
+ Sep 06,'11 R0.09 f_mkfs() supports multiple partition to finish the multiple partition feature.
+ Added f_fdisk(). (_MULTI_PARTITION = 2)
+
+ Aug 27,'12 R0.09a Fixed assertion failure due to OS/2 EA on FAT12/16.
+ Changed f_open() and f_opendir() reject null object pointer to avoid crash.
+ Changed option name _FS_SHARE to _FS_LOCK.
+
+ Jan 23,'13 R0.09b Added f_getlabel() and f_setlabel(). (_USE_LABEL == 1)
+
+ Oct 02,'13 R0.10 Added selection of character encoding on the file. (_STRF_ENCODE)
+ Added f_closedir().
+ Added forced full FAT scan for f_getfree(). (_FS_NOFSINFO)
+ Added forced mount feature with changes of f_mount().
+ Improved behavior of volume auto detection.
+ Improved write throughput of f_puts() and f_printf().
+ Changed argument of f_chdrive(), f_mkfs(), disk_read() and disk_write().
+ Fixed f_write() can be truncated when the file size is close to 4GB.
+ Fixed f_open(), f_mkdir() and f_setlabel() can return incorrect error code.
diff --git a/tests/basics/tests/list_index.py b/tests/basics/tests/list_index.py
new file mode 100644
index 0000000000..f28263fba6
--- /dev/null
+++ b/tests/basics/tests/list_index.py
@@ -0,0 +1,24 @@
+a = [1, 2, 3]
+print(a.index(1))
+print(a.index(2))
+print(a.index(3))
+print(a.index(3, 2))
+try:
+ print(a.index(3, 2, 2))
+except ValueError:
+ print("Raised ValueError")
+else:
+ print("Did not raise ValueError")
+
+a = a + a
+b = [0, 0, a]
+print(a.index(2))
+print(b.index(a))
+print(a.index(2, 2))
+
+try:
+ a.index(2, 2, 2)
+except ValueError:
+ print("Raised ValueError")
+else:
+ print("Did not raise ValueError")
diff --git a/tests/basics/tests/string1.py b/tests/basics/tests/string1.py
index 28aeaddbc4..9d6f21d132 100644
--- a/tests/basics/tests/string1.py
+++ b/tests/basics/tests/string1.py
@@ -7,3 +7,6 @@ x += 'def'
print(x)
print('123' + "456")
+
+# iter
+print(list('str'))
diff --git a/tests/basics/tests/types1.py b/tests/basics/tests/types1.py
new file mode 100644
index 0000000000..850b31b08c
--- /dev/null
+++ b/tests/basics/tests/types1.py
@@ -0,0 +1,28 @@
+# basic types
+
+print(bool)
+print(int)
+print(float)
+print(complex)
+print(tuple)
+print(list)
+print(set)
+print(dict)
+
+print(type(bool()) == bool)
+print(type(int()) == int)
+print(type(float()) == float)
+print(type(complex()) == complex)
+print(type(tuple()) == tuple)
+print(type(list()) == list)
+print(type(set()) == set)
+print(type(dict()) == dict)
+
+print(type(False) == bool)
+print(type(0) == int)
+print(type(0.0) == float)
+print(type(1j) == complex)
+print(type(()) == tuple)
+print(type([]) == list)
+print(type({None}) == set)
+print(type({}) == dict)
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-14 04:27:01 +0000