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.

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

Improve evalstr to show syntax warnings #1059

Merged
merged 1 commit into from
Oct 28, 2024
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
14 changes: 9 additions & 5 deletions src/GAP.jl
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const last_error = Ref{String}("")

const disable_error_handler = Ref{Bool}(false)

function error_handler()
function copy_gap_error_to_julia()
global disable_error_handler
if disable_error_handler[]
return
Expand All @@ -75,6 +75,12 @@ function error_handler()
ccall((:SET_LEN_STRING, libgap), Cvoid, (GapObj, Cuint), Globals._JULIAINTERFACE_ERROR_BUFFER::GapObj, 0)
end

function get_and_clear_last_error()
err = last_error[]
last_error[] = ""
return err
end

function ThrowObserver(depth::Cint)
global disable_error_handler
if disable_error_handler[]
Expand All @@ -88,12 +94,10 @@ function ThrowObserver(depth::Cint)
# at the top of GAP's exception handler chain, turn the GAP exception
# into a Julia exception
if depth <= 0
error("Error thrown by GAP: $(last_error[])")
error("Error thrown by GAP: $(get_and_clear_last_error())")
end
end

const error_handlerwrap = error_handler

# path to JuliaInterface.so
const real_JuliaInterface_path = Ref{String}()
JuliaInterface_path() = real_JuliaInterface_path[]
Expand All @@ -104,7 +108,7 @@ function initialize(argv::Vector{String})
end

handle_signals = isdefined(Main, :__GAP_ARGS__) # a bit of a hack...
error_handler_func = handle_signals ? C_NULL : @cfunction(error_handlerwrap, Cvoid, ())
error_handler_func = handle_signals ? C_NULL : @cfunction(copy_gap_error_to_julia, Cvoid, ())

# Tell GAP to read a file during startup (after its `lib/system.g`),
# such that `JuliaInterface` is added to the autoloaded GAP packages,
Expand Down
19 changes: 11 additions & 8 deletions src/ccalls.jl
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,18 @@ whereas `x` in the latter example lives in the Julia session.
"""
function evalstr(cmd::String)
res = evalstr_ex(cmd * ";")

# If there is an error string on the GAP side, copy it into `last_error`.
# We do this even if there is no error indicated via `res`, to be able to
# handle syntax warnings
copy_gap_error_to_julia()

msg = get_and_clear_last_error()
if any(x::GapObj->x[1] === false, res)
# error
global last_error
# HACK HACK HACK: if there is an error string on the GAP side, call
# error_handler to copy it into `last_error`
if !Wrappers.IsEmpty(Globals._JULIAINTERFACE_ERROR_BUFFER::GapObj)
error_handler()
end
error("Error thrown by GAP: $(last_error[])")
error("Error thrown by GAP: $msg")
elseif !isempty(msg)
# Syntax warnings may be printed here
print(msg)
end
res = res[end]::GapObj
if Wrappers.ISB_LIST(res, 2)
Expand Down
2 changes: 2 additions & 0 deletions test/Project.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
[deps]
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
IOCapture = "b5f81e59-6552-4d32-b1f0-c071b021bf89"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[compat]
Aqua = "0.8.2"
Documenter = "^0.27.0"
IOCapture = "0.2.5"
Pkg = "1.6"
Random = "1.6"
Test = "1.6"
15 changes: 15 additions & 0 deletions test/basics.jl
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,21 @@ end
l = GAP.evalstr("[1,~,3]")
@test l[2] === l
@test GAP.gap_to_julia(GAP.Globals.StringViewObj(l)) == "[ 1, ~, 3 ]"

# from issue #1058:
c = IOCapture.capture() do
GAP.evalstr("function() res:= 1; return res; end")
end
#
expected = """
Syntax warning: Unbound global variable in stream:1
function() res:= 1; return res; end;
^^^
Syntax warning: Unbound global variable in stream:1
function() res:= 1; return res; end;
^^^
"""
@test c.output == expected
end

@testset "randseed!" begin
Expand Down
1 change: 1 addition & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Test
using Documenter
using GAP
using IOCapture

include("Aqua.jl")

Expand Down
Loading