Skip to content

Commit 0112b83

Browse files
committed
Update HPy inlined files: eb07982
1 parent 9452db7 commit 0112b83

21 files changed

+399
-86
lines changed

graalpython/com.oracle.graal.python.cext/include/common/autogen_hpyfunc_declare.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
/*
33
DO NOT EDIT THIS FILE!
44
5-
This file is automatically generated by tools/autogen.py from tools/public_api.h.
5+
This file is automatically generated by hpy.tools.autogen.hpyfunc.autogen_hpyfunc_declare_h
6+
See also hpy.tools.autogen and hpy/tools/public_api.h
7+
68
Run this to regenerate:
79
make autogen
810

graalpython/com.oracle.graal.python.cext/include/common/autogen_hpyslot.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
/*
33
DO NOT EDIT THIS FILE!
44
5-
This file is automatically generated by tools/autogen.py from tools/public_api.h.
5+
This file is automatically generated by hpy.tools.autogen.hpyslot.autogen_hpyslot_h
6+
See also hpy.tools.autogen and hpy/tools/public_api.h
7+
68
Run this to regenerate:
79
make autogen
810

graalpython/com.oracle.graal.python.cext/include/common/autogen_impl.h

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
/*
33
DO NOT EDIT THIS FILE!
44
5-
This file is automatically generated by tools/autogen.py from tools/public_api.h.
5+
This file is automatically generated by hpy.tools.autogen.trampolines.autogen_impl_h
6+
See also hpy.tools.autogen and hpy/tools/public_api.h
7+
68
Run this to regenerate:
79
make autogen
810
@@ -268,6 +270,11 @@ HPyAPI_STORAGE HPy _HPy_IMPL_NAME_NOPREFIX(InPlaceOr)(HPyContext ctx, HPy h1, HP
268270
return _py2h(PyNumber_InPlaceOr(_h2py(h1), _h2py(h2)));
269271
}
270272

273+
HPyAPI_STORAGE int _HPy_IMPL_NAME(Callable_Check)(HPyContext ctx, HPy h)
274+
{
275+
return PyCallable_Check(_h2py(h));
276+
}
277+
271278
HPyAPI_STORAGE void _HPy_IMPL_NAME(Err_SetString)(HPyContext ctx, HPy h_type, const char *message)
272279
{
273280
PyErr_SetString(_h2py(h_type), message);
@@ -448,3 +455,8 @@ HPyAPI_STORAGE HPy _HPy_IMPL_NAME(Dict_New)(HPyContext ctx)
448455
return _py2h(PyDict_New());
449456
}
450457

458+
HPyAPI_STORAGE int _HPy_IMPL_NAME(Tuple_Check)(HPyContext ctx, HPy h)
459+
{
460+
return PyTuple_Check(_h2py(h));
461+
}
462+
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#ifndef HPY_COMMON_RUNTIME_CALL_H
2+
#define HPY_COMMON_RUNTIME_CALL_H
3+
4+
#include <Python.h>
5+
#include "hpy.h"
6+
7+
_HPy_HIDDEN HPy
8+
ctx_CallTupleDict(HPyContext ctx, HPy callable, HPy args, HPy kw);
9+
10+
#endif /* HPY_COMMON_RUNTIME_CALL_H */
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11

22
// automatically generated by setup.py:get_scm_config()
3-
#define HPY_VERSION "0.1.dev875+g7c832a2"
4-
#define HPY_GIT_REVISION "7c832a2"
3+
#define HPY_VERSION "0.1.dev950+g98f448a"
4+
#define HPY_GIT_REVISION "98f448a"

graalpython/com.oracle.graal.python.cext/include/cpython/autogen_hpyfunc_trampolines.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
/*
33
DO NOT EDIT THIS FILE!
44
5-
This file is automatically generated by tools/autogen.py from tools/public_api.h.
5+
This file is automatically generated by hpy.tools.autogen.hpyfunc.autogen_cpython_hpyfunc_trampoline_h
6+
See also hpy.tools.autogen and hpy/tools/public_api.h
7+
68
Run this to regenerate:
79
make autogen
810

graalpython/com.oracle.graal.python.cext/include/cpython/hpy.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ HPy_AsPyObject(HPyContext ctx, HPy h)
272272
#include "../common/hpydef.h"
273273
#include "../common/hpytype.h"
274274
#include "../common/hpymodule.h"
275+
#include "../common/runtime/ctx_call.h"
275276
#include "../common/runtime/ctx_module.h"
276277
#include "../common/runtime/ctx_type.h"
277278
#include "../common/runtime/ctx_listbuilder.h"
@@ -315,6 +316,12 @@ _HPy_Cast(HPyContext ctx, HPy h)
315316
return ctx_Cast(ctx, h);
316317
}
317318

319+
HPyAPI_FUNC(HPy)
320+
HPy_CallTupleDict(HPyContext ctx, HPy callable, HPy args, HPy kw)
321+
{
322+
return ctx_CallTupleDict(ctx, callable, args, kw);
323+
}
324+
318325
HPyAPI_FUNC(HPyListBuilder)
319326
HPyListBuilder_New(HPyContext ctx, HPy_ssize_t initial_size)
320327
{

graalpython/com.oracle.graal.python.cext/include/universal/autogen_ctx.h

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
/*
33
DO NOT EDIT THIS FILE!
44
5-
This file is automatically generated by tools/autogen.py from tools/public_api.h.
5+
This file is automatically generated by hpy.tools.autogen.ctx.autogen_ctx_h
6+
See also hpy.tools.autogen and hpy/tools/public_api.h
7+
68
Run this to regenerate:
79
make autogen
810
@@ -138,6 +140,9 @@ struct _HPyContext_s {
138140
HPy (*ctx_InPlaceAnd)(HPyContext ctx, HPy h1, HPy h2);
139141
HPy (*ctx_InPlaceXor)(HPyContext ctx, HPy h1, HPy h2);
140142
HPy (*ctx_InPlaceOr)(HPyContext ctx, HPy h1, HPy h2);
143+
int (*ctx_Callable_Check)(HPyContext ctx, HPy h);
144+
HPy (*ctx_CallTupleDict)(HPyContext ctx, HPy callable, HPy args, HPy kw);
145+
void (*ctx_FatalError)(HPyContext ctx, const char *message);
141146
void (*ctx_Err_SetString)(HPyContext ctx, HPy h_type, const char *message);
142147
void (*ctx_Err_SetObject)(HPyContext ctx, HPy h_type, HPy h_value);
143148
int (*ctx_Err_Occurred)(HPyContext ctx);
@@ -183,7 +188,7 @@ struct _HPyContext_s {
183188
int (*ctx_List_Append)(HPyContext ctx, HPy h_list, HPy h_item);
184189
int (*ctx_Dict_Check)(HPyContext ctx, HPy h);
185190
HPy (*ctx_Dict_New)(HPyContext ctx);
186-
void (*ctx_FatalError)(HPyContext ctx, const char *message);
191+
int (*ctx_Tuple_Check)(HPyContext ctx, HPy h);
187192
HPy (*ctx_Tuple_FromArray)(HPyContext ctx, HPy items[], HPy_ssize_t n);
188193
HPy (*ctx_FromPyObject)(HPyContext ctx, cpy_PyObject *obj);
189194
cpy_PyObject *(*ctx_AsPyObject)(HPyContext ctx, HPy h);

graalpython/com.oracle.graal.python.cext/include/universal/autogen_hpyfunc_trampolines.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
/*
33
DO NOT EDIT THIS FILE!
44
5-
This file is automatically generated by tools/autogen.py from tools/public_api.h.
5+
This file is automatically generated by hpy.tools.autogen.hpyfunc.autogen_hpyfunc_trampoline_h
6+
See also hpy.tools.autogen and hpy/tools/public_api.h
7+
68
Run this to regenerate:
79
make autogen
810

graalpython/com.oracle.graal.python.cext/include/universal/autogen_trampolines.h

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
/*
33
DO NOT EDIT THIS FILE!
44
5-
This file is automatically generated by tools/autogen.py from tools/public_api.h.
5+
This file is automatically generated by hpy.tools.autogen.trampolines.autogen_trampolines_h
6+
See also hpy.tools.autogen and hpy/tools/public_api.h
7+
68
Run this to regenerate:
79
make autogen
810
@@ -228,6 +230,14 @@ static inline HPy HPy_InPlaceOr(HPyContext ctx, HPy h1, HPy h2) {
228230
return ctx->ctx_InPlaceOr ( ctx, h1, h2 );
229231
}
230232

233+
static inline int HPyCallable_Check(HPyContext ctx, HPy h) {
234+
return ctx->ctx_Callable_Check ( ctx, h );
235+
}
236+
237+
static inline HPy HPy_CallTupleDict(HPyContext ctx, HPy callable, HPy args, HPy kw) {
238+
return ctx->ctx_CallTupleDict ( ctx, callable, args, kw );
239+
}
240+
231241
static inline void HPyErr_SetString(HPyContext ctx, HPy h_type, const char *message) {
232242
ctx->ctx_Err_SetString ( ctx, h_type, message );
233243
}
@@ -404,6 +414,10 @@ static inline HPy HPyDict_New(HPyContext ctx) {
404414
return ctx->ctx_Dict_New ( ctx );
405415
}
406416

417+
static inline int HPyTuple_Check(HPyContext ctx, HPy h) {
418+
return ctx->ctx_Tuple_Check ( ctx, h );
419+
}
420+
407421
static inline HPy HPyTuple_FromArray(HPyContext ctx, HPy items[], HPy_ssize_t n) {
408422
return ctx->ctx_Tuple_FromArray ( ctx, items, n );
409423
}

0 commit comments

Comments
 (0)