Skip to content

Commit

Permalink
Adjust to jl_boundp change in Julia nightly (#1024)
Browse files Browse the repository at this point in the history
  • Loading branch information
fingolfin authored Aug 21, 2024
1 parent 2b7a168 commit aafaa2e
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions pkg/JuliaInterface/src/JuliaInterface.c
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,16 @@ static Obj FuncJuliaSymbol(Obj self, Obj name)
return NewJuliaObj((jl_value_t *)julia_symbol);
}

// internal wrapper for jl_boundp to deal with API change in Julia 1.12
static int gap_jl_boundp(jl_module_t * m, jl_sym_t * var)
{
#if JULIA_VERSION_MAJOR == 1 && JULIA_VERSION_MINOR >= 12
return jl_boundp(m, var, 1);
#else
return jl_boundp(m, var);
#endif
}

// Returns the julia object GAP object that holds a pointer to the value
// currently bound to the julia identifier <name>.
static Obj Func_JuliaGetGlobalVariable(Obj self, Obj name)
Expand All @@ -232,7 +242,7 @@ static Obj Func_JuliaGetGlobalVariable(Obj self, Obj name)

jl_sym_t * symbol = jl_symbol(CONST_CSTR_STRING(name));
END_GAP_SYNC();
if (!jl_boundp(jl_main_module, symbol)) {
if (!gap_jl_boundp(jl_main_module, symbol)) {
return Fail;
}
jl_value_t * value = jl_get_global(jl_main_module, symbol);
Expand Down Expand Up @@ -262,7 +272,7 @@ static Obj Func_JuliaGetGlobalVariableByModule(Obj self, Obj name, Obj module)
}
jl_sym_t * symbol = jl_symbol(CONST_CSTR_STRING(name));
END_GAP_SYNC();
if (!jl_boundp(m, symbol)) {
if (!gap_jl_boundp(m, symbol)) {
return Fail;
}
jl_value_t * value = jl_get_global(m, symbol);
Expand Down

0 comments on commit aafaa2e

Please sign in to comment.