Skip to content

Commit ee54976

Browse files
fangerertimfel
fangerer
authored and
timfel
committed
Merge branch 'hpy-import'
2 parents a7fc676 + 20a7d5a commit ee54976

File tree

5 files changed

+111
-4
lines changed

5 files changed

+111
-4
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,9 @@ typedef struct { void* _i; } HPyThreadState;
165165
#define HPyListBuilder_IsNull(h) ((h)._lst == 0)
166166
#define HPyTupleBuilder_IsNull(h) ((h)._tup == 0)
167167

168+
#define HPyListBuilder_IsNull(h) ((h)._lst == 0)
169+
#define HPyTupleBuilder_IsNull(h) ((h)._tup == 0)
170+
168171
#define HPyField_NULL _hfconv(0)
169172
#define HPyField_IsNull(f) ((f)._i == 0)
170173

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,30 @@ struct _HPyContext_s {
307307
void (*ctx_Global_Store)(HPyContext *ctx, _HPyGlobalPtr global, HPy h);
308308
HPy (*ctx_Global_Load)(HPyContext *ctx, HPyGlobal global);
309309
void (*ctx_Dump)(HPyContext *ctx, HPy h);
310+
HPy h_ComplexType;
311+
HPy h_BytesType;
312+
HPy h_MemoryViewType;
313+
HPy h_CapsuleType;
314+
HPy h_SliceType;
315+
HPy (*ctx_MaybeGetAttr_s)(HPyContext *ctx, HPy obj, const char *name);
316+
int (*ctx_Slice_Unpack)(HPyContext *ctx, HPy slice, HPy_ssize_t *start, HPy_ssize_t *stop, HPy_ssize_t *step);
317+
HPy (*ctx_ContextVar_New)(HPyContext *ctx, const char *name, HPy default_value);
318+
int (*ctx_ContextVar_Get)(HPyContext *ctx, HPy context_var, HPy default_value, HPy *result);
319+
HPy (*ctx_ContextVar_Set)(HPyContext *ctx, HPy context_var, HPy value);
320+
HPy (*ctx_Capsule_New)(HPyContext *ctx, void *pointer, const char *name, HPyCapsule_Destructor destructor);
321+
void *(*ctx_Capsule_Get)(HPyContext *ctx, HPy capsule, _HPyCapsule_key key, const char *name);
322+
int (*ctx_Capsule_IsValid)(HPyContext *ctx, HPy capsule, const char *name);
323+
int (*ctx_Capsule_Set)(HPyContext *ctx, HPy capsule, _HPyCapsule_key key, void *value);
324+
HPy (*ctx_Unicode_FromEncodedObject)(HPyContext *ctx, HPy obj, const char *encoding, const char *errors);
325+
HPy (*ctx_Unicode_InternFromString)(HPyContext *ctx, const char *str);
326+
HPy (*ctx_Unicode_Substring)(HPyContext *ctx, HPy obj, HPy_ssize_t start, HPy_ssize_t end);
327+
HPy (*ctx_Dict_Keys)(HPyContext *ctx, HPy h);
328+
HPy (*ctx_Dict_GetItem)(HPyContext *ctx, HPy op, HPy key);
329+
int (*ctx_Sequence_Check)(HPyContext *ctx, HPy h);
330+
int (*ctx_SetType)(HPyContext *ctx, HPy obj, HPy type);
331+
int (*ctx_Type_IsSubtype)(HPyContext *ctx, HPy sub, HPy type);
332+
const char *(*ctx_Type_GetName)(HPyContext *ctx, HPy type);
333+
HPy (*ctx_SeqIter_New)(HPyContext *ctx, HPy seq);
310334
int (*ctx_Type_CheckSlot)(HPyContext *ctx, HPy type, HPyDef *value);
311335
};
312336

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

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,10 @@ HPyAPI_FUNC int HPySequence_Check(HPyContext *ctx, HPy h) {
162162
return ctx->ctx_Sequence_Check ( ctx, UNWRAP(h) );
163163
}
164164

165+
HPyAPI_FUNC int HPySequence_Check(HPyContext *ctx, HPy h) {
166+
return ctx->ctx_Sequence_Check ( ctx, h );
167+
}
168+
165169
HPyAPI_FUNC int HPyNumber_Check(HPyContext *ctx, HPy h) {
166170
return ctx->ctx_Number_Check ( ctx, UNWRAP(h) );
167171
}
@@ -384,6 +388,10 @@ HPyAPI_FUNC HPy HPy_MaybeGetAttr_s(HPyContext *ctx, HPy obj, const char *name) {
384388
return WRAP(ctx->ctx_MaybeGetAttr_s ( ctx, UNWRAP(obj), name ));
385389
}
386390

391+
HPyAPI_FUNC HPy HPy_MaybeGetAttr_s(HPyContext *ctx, HPy obj, const char *name) {
392+
return ctx->ctx_MaybeGetAttr_s ( ctx, obj, name );
393+
}
394+
387395
HPyAPI_FUNC int HPy_HasAttr(HPyContext *ctx, HPy obj, HPy name) {
388396
return ctx->ctx_HasAttr ( ctx, UNWRAP(obj), UNWRAP(name) );
389397
}
@@ -448,6 +456,18 @@ HPyAPI_FUNC const char *HPyType_GetName(HPyContext *ctx, HPy type) {
448456
return ctx->ctx_Type_GetName ( ctx, UNWRAP(type) );
449457
}
450458

459+
HPyAPI_FUNC int HPy_SetType(HPyContext *ctx, HPy obj, HPy type) {
460+
return ctx->ctx_SetType ( ctx, obj, type );
461+
}
462+
463+
HPyAPI_FUNC int HPyType_IsSubtype(HPyContext *ctx, HPy sub, HPy type) {
464+
return ctx->ctx_Type_IsSubtype ( ctx, sub, type );
465+
}
466+
467+
HPyAPI_FUNC const char *HPyType_GetName(HPyContext *ctx, HPy type) {
468+
return ctx->ctx_Type_GetName ( ctx, type );
469+
}
470+
451471
HPyAPI_FUNC int HPy_Is(HPyContext *ctx, HPy obj, HPy other) {
452472
return ctx->ctx_Is ( ctx, UNWRAP(obj), UNWRAP(other) );
453473
}
@@ -492,6 +512,10 @@ HPyAPI_FUNC HPy HPySeqIter_New(HPyContext *ctx, HPy seq) {
492512
return WRAP(ctx->ctx_SeqIter_New ( ctx, UNWRAP(seq) ));
493513
}
494514

515+
HPyAPI_FUNC HPy HPySeqIter_New(HPyContext *ctx, HPy seq) {
516+
return ctx->ctx_SeqIter_New ( ctx, seq );
517+
}
518+
495519
HPyAPI_FUNC int HPyBytes_Check(HPyContext *ctx, HPy h) {
496520
return ctx->ctx_Bytes_Check ( ctx, UNWRAP(h) );
497521
}
@@ -584,6 +608,18 @@ HPyAPI_FUNC HPy HPyUnicode_Substring(HPyContext *ctx, HPy obj, HPy_ssize_t start
584608
return WRAP(ctx->ctx_Unicode_Substring ( ctx, UNWRAP(obj), start, end ));
585609
}
586610

611+
HPyAPI_FUNC HPy HPyUnicode_FromEncodedObject(HPyContext *ctx, HPy obj, const char *encoding, const char *errors) {
612+
return ctx->ctx_Unicode_FromEncodedObject ( ctx, obj, encoding, errors );
613+
}
614+
615+
HPyAPI_FUNC HPy HPyUnicode_InternFromString(HPyContext *ctx, const char *str) {
616+
return ctx->ctx_Unicode_InternFromString ( ctx, str );
617+
}
618+
619+
HPyAPI_FUNC HPy HPyUnicode_Substring(HPyContext *ctx, HPy obj, HPy_ssize_t start, HPy_ssize_t end) {
620+
return ctx->ctx_Unicode_Substring ( ctx, obj, start, end );
621+
}
622+
587623
HPyAPI_FUNC int HPyList_Check(HPyContext *ctx, HPy h) {
588624
return ctx->ctx_List_Check ( ctx, UNWRAP(h) );
589625
}
@@ -612,6 +648,14 @@ HPyAPI_FUNC HPy HPyDict_GetItem(HPyContext *ctx, HPy op, HPy key) {
612648
return WRAP(ctx->ctx_Dict_GetItem ( ctx, UNWRAP(op), UNWRAP(key) ));
613649
}
614650

651+
HPyAPI_FUNC HPy HPyDict_Keys(HPyContext *ctx, HPy h) {
652+
return ctx->ctx_Dict_Keys ( ctx, h );
653+
}
654+
655+
HPyAPI_FUNC HPy HPyDict_GetItem(HPyContext *ctx, HPy op, HPy key) {
656+
return ctx->ctx_Dict_GetItem ( ctx, op, key );
657+
}
658+
615659
HPyAPI_FUNC int HPyTuple_Check(HPyContext *ctx, HPy h) {
616660
return ctx->ctx_Tuple_Check ( ctx, UNWRAP(h) );
617661
}
@@ -636,6 +680,22 @@ HPyAPI_FUNC HPy HPyContextVar_Set(HPyContext *ctx, HPy context_var, HPy value) {
636680
return WRAP(ctx->ctx_ContextVar_Set ( ctx, UNWRAP(context_var), UNWRAP(value) ));
637681
}
638682

683+
HPyAPI_FUNC int HPySlice_Unpack(HPyContext *ctx, HPy slice, HPy_ssize_t *start, HPy_ssize_t *stop, HPy_ssize_t *step) {
684+
return ctx->ctx_Slice_Unpack ( ctx, slice, start, stop, step );
685+
}
686+
687+
HPyAPI_FUNC HPy HPyContextVar_New(HPyContext *ctx, const char *name, HPy default_value) {
688+
return ctx->ctx_ContextVar_New ( ctx, name, default_value );
689+
}
690+
691+
HPyAPI_FUNC int HPyContextVar_Get(HPyContext *ctx, HPy context_var, HPy default_value, HPy *result) {
692+
return ctx->ctx_ContextVar_Get ( ctx, context_var, default_value, result );
693+
}
694+
695+
HPyAPI_FUNC HPy HPyContextVar_Set(HPyContext *ctx, HPy context_var, HPy value) {
696+
return ctx->ctx_ContextVar_Set ( ctx, context_var, value );
697+
}
698+
639699
HPyAPI_FUNC HPy HPyImport_ImportModule(HPyContext *ctx, const char *name) {
640700
return WRAP(ctx->ctx_Import_ImportModule ( ctx, name ));
641701
}
@@ -656,6 +716,22 @@ HPyAPI_FUNC int HPyCapsule_Set(HPyContext *ctx, HPy capsule, _HPyCapsule_key key
656716
return ctx->ctx_Capsule_Set ( ctx, UNWRAP(capsule), key, value );
657717
}
658718

719+
HPyAPI_FUNC HPy HPyCapsule_New(HPyContext *ctx, void *pointer, const char *name, HPyCapsule_Destructor destructor) {
720+
return ctx->ctx_Capsule_New ( ctx, pointer, name, destructor );
721+
}
722+
723+
HPyAPI_FUNC void *HPyCapsule_Get(HPyContext *ctx, HPy capsule, _HPyCapsule_key key, const char *name) {
724+
return ctx->ctx_Capsule_Get ( ctx, capsule, key, name );
725+
}
726+
727+
HPyAPI_FUNC int HPyCapsule_IsValid(HPyContext *ctx, HPy capsule, const char *name) {
728+
return ctx->ctx_Capsule_IsValid ( ctx, capsule, name );
729+
}
730+
731+
HPyAPI_FUNC int HPyCapsule_Set(HPyContext *ctx, HPy capsule, _HPyCapsule_key key, void *value) {
732+
return ctx->ctx_Capsule_Set ( ctx, capsule, key, value );
733+
}
734+
659735
HPyAPI_FUNC HPy HPy_FromPyObject(HPyContext *ctx, cpy_PyObject *obj) {
660736
return WRAP(ctx->ctx_FromPyObject ( ctx, obj ));
661737
}
@@ -748,3 +824,7 @@ HPyAPI_FUNC int HPyType_CheckSlot(HPyContext *ctx, HPy type, HPyDef *value) {
748824
return ctx->ctx_Type_CheckSlot ( ctx, UNWRAP(type), value );
749825
}
750826

827+
HPyAPI_FUNC int HPyType_CheckSlot(HPyContext *ctx, HPy type, HPyDef *value) {
828+
return ctx->ctx_Type_CheckSlot ( ctx, type, value );
829+
}
830+

‎graalpython/com.oracle.graal.python.cext/include/hpy/version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@
2323
*/
2424

2525
// automatically generated by setup.py:get_scm_config()
26-
#define HPY_VERSION "0.0.4"
27-
#define HPY_GIT_REVISION "41989b8"
26+
#define HPY_VERSION "0.0.5.dev71+g5ebc33c"
27+
#define HPY_GIT_REVISION "5ebc33c"

‎graalpython/lib-graalpython/modules/hpy/devel/version.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@
2222
# SOFTWARE.
2323

2424
# automatically generated by setup.py:get_scm_config()
25-
__version__ = "0.0.4"
26-
__git_revision__ = "41989b8"
25+
__version__ = "0.0.5.dev71+g5ebc33c"
26+
__git_revision__ = "5ebc33c"

0 commit comments

Comments
 (0)