Skip to content

Better Enums [do not merge!] #162

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

Closed
wants to merge 4 commits into from
Closed

Better Enums [do not merge!] #162

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dbc81af
emit @cenum instead of typealias
SimonDanisch Apr 5, 2016
4f626c7
handle different sizes
SimonDanisch Apr 5, 2016
5f3c6f9
include enum consts into expr_buff
SimonDanisch Apr 5, 2016
457b6e0
enum fields for correct dependency order
SimonDanisch Apr 5, 2016
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
62 changes: 32 additions & 30 deletions src/wrap_c.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,25 +362,30 @@ function wrap(context::WrapContext, expr_buf::OrderedDict, cursor::EnumDecl; use
if (usename == "" && (usename = name(cursor)) == "")
usename = name_anon()
end
enumname = usename

buf = Any[]
enum_exprs = ExprUnit(buf)
expr_buf[symbol_safe(enumname)] = enum_exprs

push!(buf, "# begin enum $enumname")
enumname = symbol_safe(usename)
enumtype = repr_jl(cindex.getEnumDeclIntegerType(cursor))
_int = int_conversion[enumtype]
push!(buf, :(typealias $(symbol(enumname)) $enumtype))
name_values = Tuple{Symbol, Int}[]
# exctract values and names
for enumitem in children(cursor)
cur_name = cindex.spelling(enumitem)
if (length(cur_name) < 1) continue end
cur_sym = symbol_safe(cur_name)
push!(buf, :(const $cur_sym = $_int($(value(enumitem)))))
expr_buf[cur_sym] = enum_exprs
push!(name_values, (cur_sym, Int(value(enumitem))))
end
int_size = sizeof(_int)*8
if int_size == 32 # only add size if != 32
enum_expr = :(@cenum($enumname))
else
enum_expr = :(@cenum($enumname{$int_size}))
end
push!(buf, "# end enum $enumname")

expr_buf[enumname] = ExprUnit(enum_expr)
for (name, value) in name_values
expr_buf[name] = expr_buf[enumname]
push!(enum_expr.args, :($name = $value))
end
return
end

function wrap(context::WrapContext, expr_buf::OrderedDict, sd::StructDecl; usename = "")
Expand Down Expand Up @@ -726,34 +731,31 @@ function print_buffer(ostrm, obuf)
for e in obuf
isa(e, Poisoned) && continue
prev_state = state
if state != :enum
state = (isa(e, AbstractString) ? :string :
isa(e, Expr) ? e.head :
error("output: can't handle type $(typeof(e))"))
end
state = (isa(e, AbstractString) ? :string :
isa(e, Expr) ? e.head :
error("output: can't handle type $(typeof(e))"))

if state == :string
if startswith(e, "# begin enum")
state = :enum
println(ostrm)
elseif startswith(e, "# Skipping")
if startswith(e, "# Skipping")
state = :skipping
end
end

if state != :enum
if ((state != prev_state && prev_state != :string) ||
(state == prev_state && (state == :function ||
state == :type)))
println(ostrm)
end
if ((state != prev_state && prev_state != :string) ||
(state == prev_state && (state == :function ||
state == :type)))
println(ostrm)
end

println(ostrm, e)

if state == :enum && isa(e, AbstractString) && startswith(e, "# end enum")
state = :end_enum
if isa(e, Expr) && e.head == :macrocall && first(e.args) == symbol("@cenum")
println(ostrm, "@cenum($(e.args[2]),")
for elem in e.args[3:end]
println(ostrm, " $elem,")
end
println(ostrm, ")")
continue
end
println(ostrm, e)
end
end

Expand Down