Skip to content

Commit 1a1ccea

Browse files
committed
py/objpolyiter: Implement instance-polymorphic iterator type.
This allows to have single itertaor type for various internal iterator types (save rodata space by not having repeating almost-empty type structures). It works by looking "iternext" method stored in particular object instance (should be first object field after "base").
1 parent 8fb255d commit 1a1ccea

3 files changed

Lines changed: 56 additions & 0 deletions

File tree

py/obj.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,7 @@ extern const mp_obj_type_t mp_type_property;
539539
extern const mp_obj_type_t mp_type_stringio;
540540
extern const mp_obj_type_t mp_type_bytesio;
541541
extern const mp_obj_type_t mp_type_reversed;
542+
extern const mp_obj_type_t mp_type_polymorph_iter;
542543

543544
// Exceptions
544545
extern const mp_obj_type_t mp_type_BaseException;

py/objpolyiter.c

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2015 Paul Sokolovsky
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+
27+
#include <stdlib.h>
28+
29+
#include "py/nlr.h"
30+
#include "py/runtime.h"
31+
32+
// This is universal iterator type which calls "iternext" method stored in
33+
// particular object instance. (So, each instance of this time can have its
34+
// own iteration behavior.) Having this type saves to define type objects
35+
// for various internal iterator objects.
36+
37+
// Any instance should have these 2 fields at the beginning
38+
typedef struct _mp_obj_polymorph_iter_t {
39+
mp_obj_base_t base;
40+
mp_fun_1_t iternext;
41+
} mp_obj_polymorph_iter_t;
42+
43+
STATIC mp_obj_t polymorph_it_iternext(mp_obj_t self_in) {
44+
mp_obj_polymorph_iter_t *self = MP_OBJ_TO_PTR(self_in);
45+
// Redirect call to object instance's iternext method
46+
return self->iternext(self_in);
47+
}
48+
49+
const mp_obj_type_t mp_type_polymorph_iter = {
50+
{ &mp_type_type },
51+
.name = MP_QSTR_iterator,
52+
.getiter = mp_identity,
53+
.iternext = polymorph_it_iternext,
54+
};

py/py.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ PY_O_BASENAME = \
122122
objmap.o \
123123
objmodule.o \
124124
objobject.o \
125+
objpolyiter.o \
125126
objproperty.o \
126127
objnone.o \
127128
objnamedtuple.o \

0 commit comments

Comments
 (0)