Skip to content

Commit

Permalink
Merge pull request #294 from JuliaInterop/macro
Browse files Browse the repository at this point in the history
Purge macro.jl
  • Loading branch information
Gnimuc authored Apr 30, 2021
2 parents 247ef37 + 4219f93 commit 6161e3f
Show file tree
Hide file tree
Showing 6 changed files with 151 additions and 297 deletions.
3 changes: 1 addition & 2 deletions src/generator/Generators.jl
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export AbstractStructNodeType, AbstractUnionNodeType, AbstractEnumNodeType
export ExprNode, ExprDAG
export get_nodes, get_exprs

include("macro.jl")
include("top_level.jl")
include("system_deps.jl")
include("nested.jl")
Expand All @@ -69,8 +70,6 @@ export pretty_print
include("audit.jl")
export report_default_tag_types

include("macro.jl")

include("mutability.jl")

include("passes.jl")
Expand Down
2 changes: 1 addition & 1 deletion src/generator/jltypes.jl
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ tojulia(x::CLLongLong) = JuliaClonglong()
tojulia(x::CLInt128) = JuliaCint128()
tojulia(x::CLFloat) = JuliaCfloat()
tojulia(x::CLDouble) = JuliaCdouble()
tojulia(x::CLLongDouble) = JuliaClongdouble() # Float64
tojulia(x::CLLongDouble) = JuliaClongdouble() # depends on compiler
tojulia(x::CLComplex) = JuliaComplex() # ComplexF32 or ComplexF64
tojulia(x::CLHalf) = JuliaChalf() # Float16
tojulia(x::CLFloat16) = JuliaCfloat16() # Float16
Expand Down
Loading

0 comments on commit 6161e3f

Please sign in to comment.