Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace IsGapObj with our own is_gapobj #141

Merged
merged 1 commit into from
Nov 7, 2018
Merged

Replace IsGapObj with our own is_gapobj #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 25 additions & 9 deletions JuliaInterface/src/JuliaInterface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ static jl_datatype_t * JULIA_GAPFFE_type;

static jl_value_t * jl_bigint_type = NULL;

jl_datatype_t * gap_datatype_mptr;

Obj TheTypeJuliaObject;
UInt T_JULIA_OBJ;

Expand Down Expand Up @@ -78,6 +80,12 @@ int is_gapffe(jl_value_t * v)
return jl_typeis(v, JULIA_GAPFFE_type);
}

//
int is_gapobj(jl_value_t * v)
{
return jl_typeis(v, gap_datatype_mptr);
}

static Obj Func_NewJuliaCFunc(Obj self, Obj julia_function_ptr, Obj arg_names)
{
if (!IS_JULIA_OBJ(julia_function_ptr)) {
Expand Down Expand Up @@ -131,13 +139,12 @@ static Obj JuliaObjectTypeFunc(Obj o)
return TheTypeJuliaObject;
}

Obj NewJuliaObj(jl_value_t * C)
Obj NewJuliaObj(jl_value_t * v)
{
if (IsGapObj(C))
return (Obj)C;
Obj o;
o = NewBag(T_JULIA_OBJ, 1 * sizeof(Obj));
SET_JULIA_OBJ(o, C);
if (is_gapobj(v))
return (Obj)v;
Obj o = NewBag(T_JULIA_OBJ, 1 * sizeof(Obj));
SET_JULIA_OBJ(o, v);
return o;
}

Expand Down Expand Up @@ -333,8 +340,8 @@ Obj _ConvertedFromJulia_internal(jl_value_t * julia_obj)
return MakeImmString(symbol_name);
}

else if (IsGapObj(julia_obj)) {
return (Obj)(julia_obj);
else if (is_gapobj(julia_obj)) {
return (Obj)julia_obj;
}

return Fail;
Expand Down Expand Up @@ -689,13 +696,14 @@ static Int InitKernel(StructInitInfo * module)
JULIA_FUNC_String_constructor = jl_get_function(jl_base_module, "String");
JULIA_FUNC_showerror = jl_get_function(jl_base_module, "showerror");

//
// import bigint type from Julia
jl_bigint_type = jl_base_module
? jl_get_global(jl_base_module, jl_symbol("BigInt"))
: NULL;
if (jl_bigint_type) {
jl_module_t * gmp_module =
(jl_module_t *)jl_get_global(jl_base_module, jl_symbol("GMP"));
GAP_ASSERT(gmp_module);
int bits_per_limb = jl_unbox_long(
jl_get_global(gmp_module, jl_symbol("BITS_PER_LIMB")));
if (INTEGER_UNIT_SIZE * 8 != bits_per_limb) {
Expand All @@ -704,6 +712,14 @@ static Int InitKernel(StructInitInfo * module)
}
}

// import mptr type from GAP
jl_module_t * gap_module =
(jl_module_t *)jl_get_global(jl_main_module, jl_symbol("ForeignGAP"));
GAP_ASSERT(gap_module);
gap_datatype_mptr =
(jl_datatype_t *)jl_get_global(gap_module, jl_symbol("MPtr"));
GAP_ASSERT(gap_datatype_mptr);

// return success
return 0;
}
Expand Down
3 changes: 3 additions & 0 deletions JuliaInterface/src/JuliaInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ Obj gap_unbox_gapffe(jl_value_t * gapffe);
//
int is_gapffe(jl_value_t * v);

//
int is_gapobj(jl_value_t * v);

// internal
extern jl_value_t * _ConvertedToJulia_internal(Obj obj);

Expand Down
4 changes: 2 additions & 2 deletions JuliaInterface/src/convert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ Obj gap_julia(jl_value_t * julia_obj)
if (jl_typeis(julia_obj, jl_int64_type)) {
return ObjInt_Int8(jl_unbox_int64(julia_obj));
}
if (IsGapObj(julia_obj)) {
return (Obj)(julia_obj);
if (is_gapobj(julia_obj)) {
return (Obj)julia_obj;
}
if (is_gapffe(julia_obj)) {
return gap_unbox_gapffe(julia_obj);
Expand Down