Skip to content

C: map Nothing to void #6

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

Open
fredrikekre wants to merge 2 commits into
base: main
Choose a base branch
from
Open

C: map Nothing to void #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ffa25a
C: map Nothing to void
fredrikekre Mar 18, 2026
f067440
Update test file
fredrikekre Mar 18, 2026
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 src/c.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ const ctypes = Dict{String, String}(
"Float64" => "double",
"Bool" => "bool",
"RawFD" => "int",
"Nothing" => "void",

"Cstring" => "char *",
"Cwstring" => "wchar_t *",
Expand All @@ -105,7 +106,6 @@ const ctypes = Dict{String, String}(
# distinct Julia types (these are just platform-specific aliases to the types above).
"Cchar" => "char",
"Cwchar_t" => "wchar_t",
"Cvoid" => "void",
"Cint" => "int",
"Cshort" => "short",
"Clong" => "long",
Expand Down
127 changes: 84 additions & 43 deletions test/bindinginfo_libsimple.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"functions": [
{
"symbol": "tree_size",
"name": "tree_size(tree::CTree{Float64})",
"symbol": "nothing_to_void",
"name": "nothing_to_void(x::Ptr{Nothing}, y::Nothing, z::Ptr{Nothing})",
"arguments": [
{ "name": "tree", "type_id": 1 }
{ "name": "x", "type_id": 2 },
{ "name": "y", "type_id": 4 },
{ "name": "z", "type_id": 6 }
],
"returns": { "type_id": 6 }
"returns": { "type_id": 3 }
},
{
"symbol": "copyto_and_sum",
Expand All @@ -16,71 +18,74 @@
],
"returns": { "type_id": 8 }
},
{
"symbol": "tree_size",
"name": "tree_size(tree::CTree{Float64})",
"arguments": [
{ "name": "tree", "type_id": 11 }
],
"returns": { "type_id": 5 }
},
{
"symbol": "countsame",
"name": "countsame(list::Ptr{MyTwoVec}, n::Int32)",
"arguments": [
{ "name": "list", "type_id": 11 },
{ "name": "n", "type_id": 4 }
{ "name": "list", "type_id": 15 },
{ "name": "n", "type_id": 1 }
],
"returns": { "type_id": 4 }
"returns": { "type_id": 1 }
}
],
"types": [
{
"id": 1,
"kind": "struct",
"name": "CTree{Float64}",
"size": 16,
"alignment": 8,
"fields": [
{ "name": "children", "type_id": 3, "offset": 0, "isptr": false, "isfieldatomic": false }
]
"kind": "primitive",
"name": "Int32",
"signed": true,
"bits": 32,
"size": 4,
"alignment": 4
},
{
"id": 2,
"kind": "pointer",
"name": "Ptr{Nothing}",
"pointee_type_id": 3
},
{
"id": 3,
"kind": "primitive",
"name": "Float64",
"name": "Nothing",
"signed": false,
"bits": 64,
"size": 8,
"alignment": 8
"bits": 0,
"size": 0,
"alignment": 1
},
{
"id": 3,
"id": 4,
"kind": "struct",
"name": "CVector{CTree{Float64}}",
"size": 16,
"name": "Nothing",
"size": 8,
"alignment": 8,
"fields": [
{ "name": "length", "type_id": 4, "offset": 0, "isptr": false, "isfieldatomic": false },
{ "name": "data", "type_id": 5, "offset": 8, "isptr": false, "isfieldatomic": false }
{ "name": "x", "type_id": 5, "offset": 0, "isptr": false, "isfieldatomic": false }
]
},
{
"id": 4,
"kind": "primitive",
"name": "Int32",
"signed": true,
"bits": 32,
"size": 4,
"alignment": 4
},
{
"id": 5,
"kind": "pointer",
"name": "Ptr{CTree{Float64}}",
"pointee_type_id": 1
},
{
"id": 6,
"kind": "primitive",
"name": "Int64",
"signed": true,
"bits": 64,
"size": 8,
"alignment": 8
},
{
"id": 6,
"kind": "pointer",
"name": "Ptr{Nothing}",
"pointee_type_id": 4
},
{
"id": 7,
"kind": "struct",
Expand Down Expand Up @@ -108,7 +113,7 @@
"size": 16,
"alignment": 8,
"fields": [
{ "name": "length", "type_id": 4, "offset": 0, "isptr": false, "isfieldatomic": false },
{ "name": "length", "type_id": 1, "offset": 0, "isptr": false, "isfieldatomic": false },
{ "name": "data", "type_id": 10, "offset": 8, "isptr": false, "isfieldatomic": false }
]
},
Expand All @@ -120,19 +125,55 @@
},
{
"id": 11,
"kind": "struct",
"name": "CTree{Float64}",
"size": 16,
"alignment": 8,
"fields": [
{ "name": "children", "type_id": 13, "offset": 0, "isptr": false, "isfieldatomic": false }
]
},
{
"id": 12,
"kind": "primitive",
"name": "Float64",
"signed": false,
"bits": 64,
"size": 8,
"alignment": 8
},
{
"id": 13,
"kind": "struct",
"name": "CVector{CTree{Float64}}",
"size": 16,
"alignment": 8,
"fields": [
{ "name": "length", "type_id": 1, "offset": 0, "isptr": false, "isfieldatomic": false },
{ "name": "data", "type_id": 14, "offset": 8, "isptr": false, "isfieldatomic": false }
]
},
{
"id": 14,
"kind": "pointer",
"name": "Ptr{CTree{Float64}}",
"pointee_type_id": 11
},
{
"id": 15,
"kind": "pointer",
"name": "Ptr{MyTwoVec}",
"pointee_type_id": 12
"pointee_type_id": 16
},
{
"id": 12,
"id": 16,
"kind": "struct",
"name": "MyTwoVec",
"size": 8,
"alignment": 4,
"fields": [
{ "name": "x", "type_id": 4, "offset": 0, "isptr": false, "isfieldatomic": false },
{ "name": "y", "type_id": 4, "offset": 4, "isptr": false, "isfieldatomic": false }
{ "name": "x", "type_id": 1, "offset": 0, "isptr": false, "isfieldatomic": false },
{ "name": "y", "type_id": 1, "offset": 4, "isptr": false, "isfieldatomic": false }
]
}
]
Expand Down
1 change: 1 addition & 0 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ end
@test occursin("CVector_Float32 to;", content)
@test occursin("float copyto_and_sum(CVectorPair_Float32 fromto);", content)
@test occursin("int32_t countsame(MyTwoVec* list, int32_t n);", content)
@test occursin("void nothing_to_void(void* x, Nothing y, Nothing* z);", content)
end
end
end
Loading