Merge pull request #458 from DuToitSpies/dict_type_add

Add dictionary type to HPyContext

Author: fangerer

hpy/debug/src/autogen_debug_ctx_init.h

@@ -328,6 +328,7 @@ static const char *get_builtin_shape_name(HPyType_BuiltinShape shape)
     SHAPE_NAME(HPyType_BuiltinShape_Unicode)
     SHAPE_NAME(HPyType_BuiltinShape_Tuple)
     SHAPE_NAME(HPyType_BuiltinShape_List)
+    SHAPE_NAME(HPyType_BuiltinShape_Dict)
     }
     return "<unknown shape>";
 #undef SHAPE_NAME
@@ -372,6 +373,8 @@ MAKE_debug_ctx_AsStruct(Tuple)
 
 MAKE_debug_ctx_AsStruct(List)
 
+MAKE_debug_ctx_AsStruct(Dict)
+
 /* ~~~ debug mode implementation of HPyTracker ~~~
 
    This is a bit special and it's worth explaining what is going on.

hpy/debug/src/debug_ctx.c

@@ -144,6 +144,7 @@ HPyAPI_FUNC HPyContext * _HPyGetContext(void) {
         ctx->h_MemoryViewType = _py2h((PyObject *)&PyMemoryView_Type);
         ctx->h_CapsuleType = _py2h((PyObject *)&PyCapsule_Type);
         ctx->h_SliceType = _py2h((PyObject *)&PySlice_Type);
+        ctx->h_DictType = _py2h((PyObject *)&PyDict_Type);
         /* Reflection */
         ctx->h_Builtins = _py2h(PyEval_GetBuiltins());
     }
@@ -271,6 +272,11 @@ HPyAPI_FUNC void* _HPy_AsStruct_List(HPyContext *ctx, HPy h)
     return ctx_AsStruct_List(ctx, h);
 }
 
+HPyAPI_FUNC void* _HPy_AsStruct_Dict(HPyContext *ctx, HPy h)
+{
+    return ctx_AsStruct_Dict(ctx, h);
+}
+
 HPyAPI_FUNC HPy HPy_CallTupleDict(HPyContext *ctx, HPy callable, HPy args, HPy kw)
 {
     return ctx_CallTupleDict(ctx, callable, args, kw);

hpy/devel/include/hpy/cpython/autogen_ctx.h

@@ -73,6 +73,12 @@ typedef enum {
      * need to specify base class ``ctx->h_ListType``.
      */
     HPyType_BuiltinShape_List = 6,
+
+    /**
+     * The type inherits from built-in type ``dict``. If using this shape, you
+     * need to specify base class ``ctx->h_DictType``.
+     */
+    HPyType_BuiltinShape_Dict = 7,
 } HPyType_BuiltinShape;
 
 typedef struct {
@@ -292,5 +298,6 @@ _HPyType_HELPER_X(_HPyType_HELPER_FNAME(__VA_ARGS__))(HPyContext *ctx, HPy h) \
 #define HPyType_BuiltinShape_Unicode_AsStruct _HPy_AsStruct_Unicode
 #define HPyType_BuiltinShape_Tuple_AsStruct _HPy_AsStruct_Tuple
 #define HPyType_BuiltinShape_List_AsStruct _HPy_AsStruct_List
+#define HPyType_BuiltinShape_Dict_AsStruct _HPy_AsStruct_Dict
 
 #endif /* HPY_UNIVERSAL_HPYTYPE_H */

hpy/devel/include/hpy/cpython/misc.h

@@ -87,6 +87,7 @@ _HPy_HIDDEN void* ctx_AsStruct_Float(HPyContext *ctx, HPy h);
 _HPy_HIDDEN void* ctx_AsStruct_Unicode(HPyContext *ctx, HPy h);
 _HPy_HIDDEN void* ctx_AsStruct_Tuple(HPyContext *ctx, HPy h);
 _HPy_HIDDEN void* ctx_AsStruct_List(HPyContext *ctx, HPy h);
+_HPy_HIDDEN void* ctx_AsStruct_Dict(HPyContext *ctx, HPy h);
 _HPy_HIDDEN void* ctx_AsStruct_Slow(HPyContext *ctx, HPy h);
 _HPy_HIDDEN HPy ctx_Type_FromSpec(HPyContext *ctx, HPyType_Spec *hpyspec,
                                   HPyType_SpecParam *params);

hpy/devel/include/hpy/hpytype.h

@@ -76,6 +76,7 @@ FULLY_ALIGNED_SPACE(PyFloatObject)
 FULLY_ALIGNED_SPACE(PyUnicodeObject)
 FULLY_ALIGNED_SPACE(PyTupleObject)
 FULLY_ALIGNED_SPACE(PyListObject)
+FULLY_ALIGNED_SPACE(PyDictObject)
 
 #define _HPy_HEAD_SIZE(HEAD) (offsetof(_HPy_FullyAlignedSpaceFor##HEAD, payload))
 
@@ -101,6 +102,8 @@ _HPy_GetHeaderSize(HPyType_BuiltinShape shape)
         return _HPy_HEAD_SIZE(PyTupleObject);
     case HPyType_BuiltinShape_List:
         return _HPy_HEAD_SIZE(PyListObject);
+    case HPyType_BuiltinShape_Dict:
+        return _HPy_HEAD_SIZE(PyDictObject);
     }
     return -1;
 }
@@ -1504,6 +1507,12 @@ ctx_AsStruct_List(HPyContext *ctx, HPy h)
     return _HPy_Payload(_h2py(h), HPyType_BuiltinShape_List);
 }
 
+_HPy_HIDDEN void*
+ctx_AsStruct_Dict(HPyContext *ctx, HPy h)
+{
+    return _HPy_Payload(_h2py(h), HPyType_BuiltinShape_Dict);
+}
+
 _HPy_HIDDEN void*
 ctx_AsStruct_Slow(HPyContext *ctx, HPy h)
 {

hpy/devel/include/hpy/runtime/ctx_funcs.h

@@ -52,6 +52,7 @@
     '_HPy_AsStruct_Unicode': None,
     '_HPy_AsStruct_Tuple': None,
     '_HPy_AsStruct_List': None,
+    '_HPy_AsStruct_Dict': None,
     '_HPy_AsStruct_Legacy': None,
     '_HPyType_GetBuiltinShape': None,
     '_HPy_CallRealFunctionFromTrampoline': None,

hpy/devel/include/hpy/universal/autogen_ctx.h

@@ -74,6 +74,7 @@ class autogen_debug_wrappers(AutoGenFile):
         '_HPy_AsStruct_Unicode',
         '_HPy_AsStruct_Tuple',
         '_HPy_AsStruct_List',
+        '_HPy_AsStruct_Dict',
         'HPyTracker_New',
         'HPyTracker_Add',
         'HPyTracker_ForgetAll',

hpy/devel/include/hpy/universal/autogen_trampolines.h

@@ -6,7 +6,7 @@
 import pycparser
 from pycparser import c_ast
 from pycparser.c_generator import CGenerator
-from distutils.sysconfig import get_config_var
+from sysconfig import get_config_var
 from .conf import SPECIAL_CASES, RETURN_CONSTANT
 
 PUBLIC_API_H = py.path.local(__file__).dirpath('public_api.h')

hpy/devel/src/runtime/ctx_type.c

@@ -101,6 +101,7 @@ HPy_ID(239) HPy h_BytesType;       /* built-in 'bytes' */
 HPy_ID(240) HPy h_MemoryViewType;  /* built-in 'memoryview' */
 HPy_ID(241) HPy h_CapsuleType;     /* built-in 'capsule' */
 HPy_ID(242) HPy h_SliceType;       /* built-in 'slice' */
+HPy_ID(263) HPy h_DictType;         /* built-in 'dict' */
 
 /* Reflection */
 HPy_ID(243) HPy h_Builtins;        /* dict of builtins */
@@ -539,6 +540,8 @@ HPy_ID(232)
 void* _HPy_AsStruct_Tuple(HPyContext *ctx, HPy h);
 HPy_ID(233)
 void* _HPy_AsStruct_List(HPyContext *ctx, HPy h);
+HPy_ID(264)
+void* _HPy_AsStruct_Dict(HPyContext *ctx, HPy h);
 HPy_ID(234)
 HPyType_BuiltinShape _HPyType_GetBuiltinShape(HPyContext *ctx, HPy h_type);
 

hpy/tools/autogen/conf.py

@@ -676,6 +676,7 @@ static void init_universal_ctx(HPyContext *ctx)
     ctx->h_MemoryViewType = _py2h((PyObject *)&PyMemoryView_Type);
     ctx->h_CapsuleType = _py2h((PyObject *)&PyCapsule_Type);
     ctx->h_SliceType = _py2h((PyObject *)&PySlice_Type);
+    ctx->h_DictType = _py2h((PyObject *)&PyDict_Type);
     /* Reflection */
     ctx->h_Builtins = _py2h(PyEval_GetBuiltins());
 }

hpy/tools/autogen/debug.py

@@ -262,6 +262,7 @@ def test_builtin_handles(self):
                     case 20: h = ctx->h_MemoryViewType; break;
                     case 21: h = ctx->h_SliceType; break;
                     case 22: h = ctx->h_Builtins; break;
+                    case 23: h = ctx->h_DictType; break;
                     case 2048: h = ctx->h_CapsuleType; break;
                     default:
                         HPyErr_SetString(ctx, ctx->h_ValueError, "invalid choice");
@@ -278,7 +279,7 @@ def test_builtin_handles(self):
             '<NULL>', None, False, True, ValueError, TypeError, IndexError,
             SystemError, object, type, bool, int, float, str, tuple, list,
             NotImplemented, Ellipsis, complex, bytes, memoryview, slice,
-            builtins.__dict__
+            builtins.__dict__, dict
         )
         for i, obj in enumerate(builtin_objs):
             if i == 0: