Introduce, use MP_PROPERTY_GETTER, _GETSET · csamuelson/circuitpython@31da335 · GitHub
Skip to content

Commit 31da335

Browse files
jeplerjepler
committed
Introduce, use MP_PROPERTY_GETTER, _GETSET
Later, these can be changed in cunning ways to save flash storage.
1 parent dddf541 commit 31da335

80 files changed

Lines changed: 589 additions & 1472 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ports/atmel-samd/bindings/samd/Clock.c‎

Lines changed: 9 additions & 24 deletions

‎ports/broadcom/bindings/videocore/Framebuffer.c‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,8 @@ STATIC mp_obj_t videocore_framebuffer_get_width(mp_obj_t self_in) {
9696
return MP_OBJ_NEW_SMALL_INT(common_hal_videocore_framebuffer_get_width(self));
9797
}
9898
MP_DEFINE_CONST_FUN_OBJ_1(videocore_framebuffer_get_width_obj, videocore_framebuffer_get_width);
99-
const mp_obj_property_t videocore_framebuffer_width_obj = {
100-
.base.type = &mp_type_property,
101-
.proxy = {(mp_obj_t)&videocore_framebuffer_get_width_obj,
102-
MP_ROM_NONE,
103-
MP_ROM_NONE},
104-
};
99+
const mp_obj_property_getter_t videocore_framebuffer_width_obj = MP_PROPERTY_GETTER(videocore_framebuffer_width_obj,
100+
(mp_obj_t)&videocore_framebuffer_get_width_obj);
105101

106102
//| height: int
107103
//| """The height of the display, in pixels"""
@@ -113,12 +109,8 @@ STATIC mp_obj_t videocore_framebuffer_get_height(mp_obj_t self_in) {
113109
}
114110
MP_DEFINE_CONST_FUN_OBJ_1(videocore_framebuffer_get_height_obj, videocore_framebuffer_get_height);
115111

116-
const mp_obj_property_t videocore_framebuffer_height_obj = {
117-
.base.type = &mp_type_property,
118-
.proxy = {(mp_obj_t)&videocore_framebuffer_get_height_obj,
119-
MP_ROM_NONE,
120-
MP_ROM_NONE},
121-
};
112+
const mp_obj_property_getter_t videocore_framebuffer_height_obj = MP_PROPERTY_GETTER(videocore_framebuffer_height_obj,
113+
(mp_obj_t)&videocore_framebuffer_get_height_obj);
122114

123115
STATIC const mp_rom_map_elem_t videocore_framebuffer_locals_dict_table[] = {
124116
{ MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&videocore_framebuffer_deinit_obj) },

‎ports/raspberrypi/bindings/rp2pio/StateMachine.c‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -729,12 +729,9 @@ STATIC mp_obj_t rp2pio_statemachine_obj_set_frequency(mp_obj_t self_in, mp_obj_t
729729
}
730730
MP_DEFINE_CONST_FUN_OBJ_2(rp2pio_statemachine_set_frequency_obj, rp2pio_statemachine_obj_set_frequency);
731731

732-
const mp_obj_property_t rp2pio_statemachine_frequency_obj = {
733-
.base.type = &mp_type_property,
734-
.proxy = {(mp_obj_t)&rp2pio_statemachine_get_frequency_obj,
735-
(mp_obj_t)&rp2pio_statemachine_set_frequency_obj,
736-
MP_ROM_NONE},
737-
};
732+
const mp_obj_property_getset_t rp2pio_statemachine_frequency_obj = MP_PROPERTY_GETSET(rp2pio_statemachine_frequency_obj,
733+
(mp_obj_t)&rp2pio_statemachine_get_frequency_obj,
734+
(mp_obj_t)&rp2pio_statemachine_set_frequency_obj);
738735

739736
//| rxstall: bool
740737
//| """True when the state machine has stalled due to a full RX FIFO since the last
@@ -748,12 +745,8 @@ STATIC mp_obj_t rp2pio_statemachine_obj_get_rxstall(mp_obj_t self_in) {
748745
}
749746
MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_get_rxstall_obj, rp2pio_statemachine_obj_get_rxstall);
750747

751-
const mp_obj_property_t rp2pio_statemachine_rxstall_obj = {
752-
.base.type = &mp_type_property,
753-
.proxy = {(mp_obj_t)&rp2pio_statemachine_get_rxstall_obj,
754-
MP_ROM_NONE,
755-
MP_ROM_NONE},
756-
};
748+
const mp_obj_property_getter_t rp2pio_statemachine_rxstall_obj = MP_PROPERTY_GETTER(rp2pio_statemachine_rxstall_obj,
749+
(mp_obj_t)&rp2pio_statemachine_get_rxstall_obj);
757750

758751
//| in_waiting: int
759752
//| """The number of words available to readinto"""
@@ -766,12 +759,8 @@ STATIC mp_obj_t rp2pio_statemachine_obj_get_in_waiting(mp_obj_t self_in) {
766759
}
767760
MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_get_in_waiting_obj, rp2pio_statemachine_obj_get_in_waiting);
768761

769-
const mp_obj_property_t rp2pio_statemachine_in_waiting_obj = {
770-
.base.type = &mp_type_property,
771-
.proxy = {(mp_obj_t)&rp2pio_statemachine_get_in_waiting_obj,
772-
MP_ROM_NONE,
773-
MP_ROM_NONE},
774-
};
762+
const mp_obj_property_getter_t rp2pio_statemachine_in_waiting_obj = MP_PROPERTY_GETTER(rp2pio_statemachine_in_waiting_obj,
763+
(mp_obj_t)&rp2pio_statemachine_get_in_waiting_obj);
775764

776765
STATIC const mp_rom_map_elem_t rp2pio_statemachine_locals_dict_table[] = {
777766
{ MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&rp2pio_statemachine_deinit_obj) },

‎py/objproperty.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ typedef struct _mp_obj_property_t {
3535
mp_obj_t proxy[3]; // getter, setter, deleter
3636
} mp_obj_property_t;
3737

38+
typedef struct _mp_obj_property_t mp_obj_property_getter_t;
39+
typedef struct _mp_obj_property_t mp_obj_property_getset_t;
40+
41+
#define MP_PROPERTY_GETTER(P, G) {.base.type = &mp_type_property, .proxy = {G, MP_ROM_NONE, MP_ROM_NONE}}
42+
#define MP_PROPERTY_GETSET(P, G, S) {.base.type = &mp_type_property, .proxy = {G, S, MP_ROM_NONE}}
43+
3844
#endif // MICROPY_PY_BUILTINS_PROPERTY
3945

4046
#endif // MICROPY_INCLUDED_PY_OBJPROPERTY_H

‎shared-bindings/_bleio/Adapter.c‎

Lines changed: 15 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,9 @@ static mp_obj_t bleio_adapter_set_enabled(mp_obj_t self, mp_obj_t value) {
128128
}
129129
STATIC MP_DEFINE_CONST_FUN_OBJ_2(bleio_adapter_set_enabled_obj, bleio_adapter_set_enabled);
130130

131-
const mp_obj_property_t bleio_adapter_enabled_obj = {
132-
.base.type = &mp_type_property,
133-
.proxy = { (mp_obj_t)&bleio_adapter_get_enabled_obj,
134-
(mp_obj_t)&bleio_adapter_set_enabled_obj,
135-
MP_ROM_NONE },
136-
};
131+
const mp_obj_property_getset_t bleio_adapter_enabled_obj = MP_PROPERTY_GETSET(bleio_adapter_enabled_obj,
132+
(mp_obj_t)&bleio_adapter_get_enabled_obj,
133+
(mp_obj_t)&bleio_adapter_set_enabled_obj);
137134

138135
//| address: Address
139136
//| """MAC address of the BLE adapter."""
@@ -152,12 +149,9 @@ STATIC mp_obj_t bleio_adapter_set_address(mp_obj_t self, mp_obj_t new_address) {
152149
}
153150
MP_DEFINE_CONST_FUN_OBJ_2(bleio_adapter_set_address_obj, bleio_adapter_set_address);
154151

155-
const mp_obj_property_t bleio_adapter_address_obj = {
156-
.base.type = &mp_type_property,
157-
.proxy = { (mp_obj_t)&bleio_adapter_get_address_obj,
158-
(mp_obj_t)&bleio_adapter_set_address_obj,
159-
MP_ROM_NONE },
160-
};
152+
const mp_obj_property_getset_t bleio_adapter_address_obj = MP_PROPERTY_GETSET(bleio_adapter_address_obj,
153+
(mp_obj_t)&bleio_adapter_get_address_obj,
154+
(mp_obj_t)&bleio_adapter_set_address_obj);
161155

162156
//| name: str
163157
//| """name of the BLE adapter used once connected.
@@ -176,12 +170,9 @@ STATIC mp_obj_t bleio_adapter_set_name(mp_obj_t self, mp_obj_t new_name) {
176170
}
177171
MP_DEFINE_CONST_FUN_OBJ_2(bleio_adapter_set_name_obj, bleio_adapter_set_name);
178172

179-
const mp_obj_property_t bleio_adapter_name_obj = {
180-
.base.type = &mp_type_property,
181-
.proxy = { (mp_obj_t)&bleio_adapter_get_name_obj,
182-
(mp_obj_t)&bleio_adapter_set_name_obj,
183-
MP_ROM_NONE },
184-
};
173+
const mp_obj_property_getset_t bleio_adapter_name_obj = MP_PROPERTY_GETSET(bleio_adapter_name_obj,
174+
(mp_obj_t)&bleio_adapter_get_name_obj,
175+
(mp_obj_t)&bleio_adapter_set_name_obj);
185176

186177
//| def start_advertising(self, data: ReadableBuffer, *,
187178
//| scan_response: Optional[ReadableBuffer] = None, connectable: bool = True,
@@ -380,12 +371,8 @@ STATIC mp_obj_t bleio_adapter_get_advertising(mp_obj_t self) {
380371
}
381372
MP_DEFINE_CONST_FUN_OBJ_1(bleio_adapter_get_advertising_obj, bleio_adapter_get_advertising);
382373

383-
const mp_obj_property_t bleio_adapter_advertising_obj = {
384-
.base.type = &mp_type_property,
385-
.proxy = { (mp_obj_t)&bleio_adapter_get_advertising_obj,
386-
MP_ROM_NONE,
387-
MP_ROM_NONE },
388-
};
374+
const mp_obj_property_getter_t bleio_adapter_advertising_obj = MP_PROPERTY_GETTER(bleio_adapter_advertising_obj,
375+
(mp_obj_t)&bleio_adapter_get_advertising_obj);
389376

390377
//| connected: bool
391378
//| """True when the adapter is connected to another device regardless of who initiated the
@@ -397,12 +384,8 @@ STATIC mp_obj_t bleio_adapter_get_connected(mp_obj_t self) {
397384
}
398385
MP_DEFINE_CONST_FUN_OBJ_1(bleio_adapter_get_connected_obj, bleio_adapter_get_connected);
399386

400-
const mp_obj_property_t bleio_adapter_connected_obj = {
401-
.base.type = &mp_type_property,
402-
.proxy = { (mp_obj_t)&bleio_adapter_get_connected_obj,
403-
MP_ROM_NONE,
404-
MP_ROM_NONE },
405-
};
387+
const mp_obj_property_getter_t bleio_adapter_connected_obj = MP_PROPERTY_GETTER(bleio_adapter_connected_obj,
388+
(mp_obj_t)&bleio_adapter_get_connected_obj);
406389

407390
//| connections: Tuple[Connection]
408391
//| """Tuple of active connections including those initiated through
@@ -413,12 +396,8 @@ STATIC mp_obj_t bleio_adapter_get_connections(mp_obj_t self) {
413396
}
414397
MP_DEFINE_CONST_FUN_OBJ_1(bleio_adapter_get_connections_obj, bleio_adapter_get_connections);
415398

416-
const mp_obj_property_t bleio_adapter_connections_obj = {
417-
.base.type = &mp_type_property,
418-
.proxy = { (mp_obj_t)&bleio_adapter_get_connections_obj,
419-
MP_ROM_NONE,
420-
MP_ROM_NONE },
421-
};
399+
const mp_obj_property_getter_t bleio_adapter_connections_obj = MP_PROPERTY_GETTER(bleio_adapter_connections_obj,
400+
(mp_obj_t)&bleio_adapter_get_connections_obj);
422401

423402
//| def connect(self, address: Address, *, timeout: float) -> Connection:
424403
//| """Attempts a connection to the device with the given address.

‎shared-bindings/_bleio/Address.c‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,8 @@ STATIC mp_obj_t bleio_address_get_address_bytes(mp_obj_t self_in) {
101101
}
102102
MP_DEFINE_CONST_FUN_OBJ_1(bleio_address_get_address_bytes_obj, bleio_address_get_address_bytes);
103103

104-
const mp_obj_property_t bleio_address_address_bytes_obj = {
105-
.base.type = &mp_type_property,
106-
.proxy = {(mp_obj_t)&bleio_address_get_address_bytes_obj,
107-
MP_ROM_NONE,
108-
MP_ROM_NONE},
109-
};
104+
const mp_obj_property_getter_t bleio_address_address_bytes_obj = MP_PROPERTY_GETTER(bleio_address_address_bytes_obj,
105+
(mp_obj_t)&bleio_address_get_address_bytes_obj);
110106

111107
//| type: int
112108
//| """The address type (read-only).
@@ -121,12 +117,8 @@ STATIC mp_obj_t bleio_address_get_type(mp_obj_t self_in) {
121117
}
122118
MP_DEFINE_CONST_FUN_OBJ_1(bleio_address_get_type_obj, bleio_address_get_type);
123119

124-
const mp_obj_property_t bleio_address_type_obj = {
125-
.base.type = &mp_type_property,
126-
.proxy = {(mp_obj_t)&bleio_address_get_type_obj,
127-
MP_ROM_NONE,
128-
MP_ROM_NONE},
129-
};
120+
const mp_obj_property_getter_t bleio_address_type_obj = MP_PROPERTY_GETTER(bleio_address_type_obj,
121+
(mp_obj_t)&bleio_address_get_type_obj);
130122

131123
//| def __eq__(self, other: object) -> bool:
132124
//| """Two Address objects are equal if their addresses and address types are equal."""

‎shared-bindings/_bleio/Characteristic.c‎

Lines changed: 13 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,8 @@ STATIC mp_obj_t bleio_characteristic_get_properties(mp_obj_t self_in) {
167167
}
168168
STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_get_properties_obj, bleio_characteristic_get_properties);
169169

170-
const mp_obj_property_t bleio_characteristic_properties_obj = {
171-
.base.type = &mp_type_property,
172-
.proxy = { (mp_obj_t)&bleio_characteristic_get_properties_obj,
173-
MP_ROM_NONE,
174-
MP_ROM_NONE },
175-
};
170+
const mp_obj_property_getter_t bleio_characteristic_properties_obj = MP_PROPERTY_GETTER(bleio_characteristic_properties_obj,
171+
(mp_obj_t)&bleio_characteristic_get_properties_obj);
176172

177173
//| uuid: Optional[UUID]
178174
//| """The UUID of this characteristic. (read-only)
@@ -187,12 +183,8 @@ STATIC mp_obj_t bleio_characteristic_get_uuid(mp_obj_t self_in) {
187183
}
188184
STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_get_uuid_obj, bleio_characteristic_get_uuid);
189185

190-
const mp_obj_property_t bleio_characteristic_uuid_obj = {
191-
.base.type = &mp_type_property,
192-
.proxy = { (mp_obj_t)&bleio_characteristic_get_uuid_obj,
193-
MP_ROM_NONE,
194-
MP_ROM_NONE },
195-
};
186+
const mp_obj_property_getter_t bleio_characteristic_uuid_obj = MP_PROPERTY_GETTER(bleio_characteristic_uuid_obj,
187+
(mp_obj_t)&bleio_characteristic_get_uuid_obj);
196188

197189
//| value: bytearray
198190
//| """The value of this characteristic."""
@@ -218,12 +210,9 @@ STATIC mp_obj_t bleio_characteristic_set_value(mp_obj_t self_in, mp_obj_t value_
218210
}
219211
STATIC MP_DEFINE_CONST_FUN_OBJ_2(bleio_characteristic_set_value_obj, bleio_characteristic_set_value);
220212

221-
const mp_obj_property_t bleio_characteristic_value_obj = {
222-
.base.type = &mp_type_property,
223-
.proxy = { (mp_obj_t)&bleio_characteristic_get_value_obj,
224-
(mp_obj_t)&bleio_characteristic_set_value_obj,
225-
MP_ROM_NONE },
226-
};
213+
const mp_obj_property_getset_t bleio_characteristic_value_obj = MP_PROPERTY_GETSET(bleio_characteristic_value_obj,
214+
(mp_obj_t)&bleio_characteristic_get_value_obj,
215+
(mp_obj_t)&bleio_characteristic_set_value_obj);
227216

228217
//| max_length: int
229218
//| """The max length of this characteristic."""
@@ -235,12 +224,8 @@ STATIC mp_obj_t bleio_characteristic_get_max_length(mp_obj_t self_in) {
235224
}
236225
STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_get_max_length_obj, bleio_characteristic_get_max_length);
237226

238-
const mp_obj_property_t bleio_characteristic_max_length_obj = {
239-
.base.type = &mp_type_property,
240-
.proxy = { (mp_obj_t)&bleio_characteristic_get_max_length_obj,
241-
MP_ROM_NONE,
242-
MP_ROM_NONE },
243-
};
227+
const mp_obj_property_getter_t bleio_characteristic_max_length_obj = MP_PROPERTY_GETTER(bleio_characteristic_max_length_obj,
228+
(mp_obj_t)&bleio_characteristic_get_max_length_obj);
244229

245230
//| descriptors: Descriptor
246231
//| """A tuple of :py:class:`Descriptor` objects related to this characteristic. (read-only)"""
@@ -253,12 +238,8 @@ STATIC mp_obj_t bleio_characteristic_get_descriptors(mp_obj_t self_in) {
253238

254239
STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_get_descriptors_obj, bleio_characteristic_get_descriptors);
255240

256-
const mp_obj_property_t bleio_characteristic_descriptors_obj = {
257-
.base.type = &mp_type_property,
258-
.proxy = { (mp_obj_t)&bleio_characteristic_get_descriptors_obj,
259-
MP_ROM_NONE,
260-
MP_ROM_NONE },
261-
};
241+
const mp_obj_property_getter_t bleio_characteristic_descriptors_obj = MP_PROPERTY_GETTER(bleio_characteristic_descriptors_obj,
242+
(mp_obj_t)&bleio_characteristic_get_descriptors_obj);
262243

263244
//| service: Service
264245
//| """The Service this Characteristic is a part of."""
@@ -270,12 +251,8 @@ STATIC mp_obj_t bleio_characteristic_get_service(mp_obj_t self_in) {
270251
}
271252
STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_get_service_obj, bleio_characteristic_get_service);
272253

273-
const mp_obj_property_t bleio_characteristic_service_obj = {
274-
.base.type = &mp_type_property,
275-
.proxy = { (mp_obj_t)&bleio_characteristic_get_service_obj,
276-
MP_ROM_NONE,
277-
MP_ROM_NONE },
278-
};
254+
const mp_obj_property_getter_t bleio_characteristic_service_obj = MP_PROPERTY_GETTER(bleio_characteristic_service_obj,
255+
(mp_obj_t)&bleio_characteristic_get_service_obj);
279256

280257
//| def set_cccd(self, *, notify: bool = False, indicate: bool = False) -> None:
281258
//| """Set the remote characteristic's CCCD to enable or disable notification and indication.

‎shared-bindings/_bleio/CharacteristicBuffer.c‎

Lines changed: 2 additions & 6 deletions

0 commit comments

Comments
 (0)