Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion pkg/JuliaInterface/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
KEXT_NAME = JuliaInterface
SRCDIR = @SRCDIR@
VPATH += $(SRCDIR)
KEXT_SOURCES = src/JuliaInterface.c src/calls.c src/convert.c src/sync.c
KEXT_SOURCES = src/JuliaInterface.c src/calls.c src/convert.c

# include shared GAP package build system
GAPPATH = @GAPPATH@
Expand Down
9 changes: 0 additions & 9 deletions pkg/JuliaInterface/src/JuliaInterface.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

#include "calls.h"
#include "convert.h"
#include "sync.h"

// With gap 4.15, the header julia_gc.h is available through gap_all.h.
// To still support GAP 4.14, we include it conditionally.
Expand Down Expand Up @@ -44,9 +43,7 @@ void handle_jl_exception(void)
jl_value_t * string_object =
jl_call1(JULIA_FUNC_take_inplace, JULIA_ERROR_IOBuffer);
string_object = jl_array_to_string((jl_array_t *)string_object);
BEGIN_GAP_SYNC();
ErrorMayQuit("%s", (Int)jl_string_data(string_object), 0);
END_GAP_SYNC();
}

jl_value_t * gap_box_gapffe(Obj value)
Expand Down Expand Up @@ -154,11 +151,9 @@ static Obj FuncIS_JULIA_FUNC(Obj self, Obj obj)
// Executes the string <string> in the current julia session.
static Obj FuncJuliaEvalString(Obj self, Obj string)
{
BEGIN_GAP_SYNC();
RequireStringRep("JuliaEvalString", string);

jl_value_t * result = jl_eval_string(CONST_CSTR_STRING(string));
END_GAP_SYNC();
if (jl_exception_occurred()) {
handle_jl_exception();
}
Expand All @@ -179,7 +174,6 @@ static int gap_jl_boundp(jl_module_t * m, jl_sym_t * var)
// currently bound to the julia identifier <moduleName>.<name>.
static Obj Func_JuliaGetGlobalVariableByModule(Obj self, Obj name, Obj module)
{
BEGIN_GAP_SYNC();
RequireStringRep("_JuliaGetGlobalVariableByModule", name);

jl_module_t * m = 0;
Expand All @@ -194,7 +188,6 @@ static Obj Func_JuliaGetGlobalVariableByModule(Obj self, Obj name, Obj module)
0, 0);
}
jl_sym_t * symbol = jl_symbol(CONST_CSTR_STRING(name));
END_GAP_SYNC();

#if JULIA_VERSION_MAJOR == 1 && JULIA_VERSION_MINOR >= 12
// WORKAROUND issue #1132
Expand Down Expand Up @@ -278,8 +271,6 @@ static Int InitKernel(StructInitInfo * module)
ErrorMayQuit("Could not locate the GAP.FFE datatype", 0, 0);
}

InitGapSync();

// init filters and functions
InitHdlrFuncsFromTable(GVarFuncs);

Expand Down
5 changes: 0 additions & 5 deletions pkg/JuliaInterface/src/calls.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

#include "calls.h"
#include "convert.h"
#include "sync.h"
#include "JuliaInterface.h"


Expand All @@ -35,7 +34,6 @@ Obj call_gap_func(Obj func, jl_value_t * args)

size_t len = jl_nfields(args);
Obj return_value = NULL;
BEGIN_GAP_SYNC();
if (IS_FUNC(func) && len <= 6) {
switch (len) {
case 0:
Expand Down Expand Up @@ -85,7 +83,6 @@ Obj call_gap_func(Obj func, jl_value_t * args)
}
return_value = CallFuncList(func, arg_list);
}
END_GAP_SYNC();
return return_value;
}

Expand Down Expand Up @@ -199,7 +196,6 @@ static Obj DoCallJuliaFuncXArg(Obj func, Obj args)
//
Obj WrapJuliaFunc(jl_value_t * function)
{
BEGIN_GAP_SYNC();
Obj name = MakeImmString(jl_symbol_name(jl_gf_name(function)));
Obj func = NewFunctionT(T_FUNCTION, sizeof(JuliaFuncBag), name, -1,
ArgStringToList("arg"), 0);
Expand All @@ -225,7 +221,6 @@ Obj WrapJuliaFunc(jl_value_t * function)
SET_BODY_FUNC(func, body);
CHANGED_BAG(body);
CHANGED_BAG(func);
END_GAP_SYNC();

return func;
}
Expand Down
1 change: 0 additions & 1 deletion pkg/JuliaInterface/src/convert.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include "convert.h"

#include "calls.h"
#include "sync.h"
#include "JuliaInterface.h"

// Turn a GAP object into a Julia object.
Expand Down
44 changes: 0 additions & 44 deletions pkg/JuliaInterface/src/sync.c

This file was deleted.

32 changes: 0 additions & 32 deletions pkg/JuliaInterface/src/sync.h

This file was deleted.

Loading