From 9fbd12f2faae97ca29a6f3fe514f6216656ed3c7 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Sat, 25 Aug 2018 22:54:27 +0300
Subject: [PATCH] extmod/moductypes: Accept OrderedDict as a structure
description.
Using OrderedDict (i.e. stable order of fields) would for example allow to
automatically calculate field offsets in structures.
---
extmod/moductypes.c | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index f7d3b6a5f..ddcfc853f 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -3,7 +3,7 @@
*
* The MIT License (MIT)
*
- * Copyright (c) 2014 Paul Sokolovsky
+ * Copyright (c) 2014-2018 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
@@ -137,7 +137,11 @@ STATIC void uctypes_struct_print(const mp_print_t *print, mp_obj_t self_in, mp_p
(void)kind;
mp_obj_uctypes_struct_t *self = MP_OBJ_TO_PTR(self_in);
const char *typen = "unk";
- if (MP_OBJ_IS_TYPE(self->desc, &mp_type_dict)) {
+ if (MP_OBJ_IS_TYPE(self->desc, &mp_type_dict)
+ #if MICROPY_PY_COLLECTIONS_ORDEREDDICT
+ || MP_OBJ_IS_TYPE(self->desc, &mp_type_ordereddict)
+ #endif
+ ) {
typen = "STRUCT";
} else if (MP_OBJ_IS_TYPE(self->desc, &mp_type_tuple)) {
mp_obj_tuple_t *t = MP_OBJ_TO_PTR(self->desc);
@@ -206,7 +210,11 @@ STATIC mp_uint_t uctypes_struct_agg_size(mp_obj_tuple_t *t, int layout_type, mp_
}
STATIC mp_uint_t uctypes_struct_size(mp_obj_t desc_in, int layout_type, mp_uint_t *max_field_size) {
- if (!MP_OBJ_IS_TYPE(desc_in, &mp_type_dict)) {
+ if (!MP_OBJ_IS_TYPE(desc_in, &mp_type_dict)
+ #if MICROPY_PY_COLLECTIONS_ORDEREDDICT
+ && !MP_OBJ_IS_TYPE(desc_in, &mp_type_ordereddict)
+ #endif
+ ) {
if (MP_OBJ_IS_TYPE(desc_in, &mp_type_tuple)) {
return uctypes_struct_agg_size((mp_obj_tuple_t*)MP_OBJ_TO_PTR(desc_in), layout_type, max_field_size);
} else if (MP_OBJ_IS_SMALL_INT(desc_in)) {
@@ -390,8 +398,11 @@ STATIC void set_aligned(uint val_type, void *p, mp_int_t index, mp_obj_t val) {
STATIC mp_obj_t uctypes_struct_attr_op(mp_obj_t self_in, qstr attr, mp_obj_t set_val) {
mp_obj_uctypes_struct_t *self = MP_OBJ_TO_PTR(self_in);
- // TODO: Support at least OrderedDict in addition
- if (!MP_OBJ_IS_TYPE(self->desc, &mp_type_dict)) {
+ if (!MP_OBJ_IS_TYPE(self->desc, &mp_type_dict)
+ #if MICROPY_PY_COLLECTIONS_ORDEREDDICT
+ && !MP_OBJ_IS_TYPE(self->desc, &mp_type_ordereddict)
+ #endif
+ ) {
mp_raise_TypeError("struct: no fields");
}
--
GitLab