Skip to content

Add support for casts (int) in macro defined constants #320

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

Closed
wants to merge 1 commit into from
Closed
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
38 changes: 37 additions & 1 deletion libbindgen/src/ir/var.rs
Original file line number Diff line number Diff line change
Expand Up @@ -252,11 +252,13 @@ fn parse_macro(ctx: &BindgenContext,
-> Option<(Vec<u8>, cexpr::expr::EvalResult)> {
use cexpr::{expr, nom};

let cexpr_tokens = match unit.cexpr_tokens(cursor) {
let mut cexpr_tokens = match unit.cexpr_tokens(cursor) {
None => return None,
Some(tokens) => tokens,
};

let _ctype = parse_macro_cast(&mut cexpr_tokens);

let parser = expr::IdentifierParser::new(ctx.parsed_macros());
let result = parser.macro_definition(&cexpr_tokens);

Expand All @@ -266,6 +268,40 @@ fn parse_macro(ctx: &BindgenContext,
}
}

// try to detect the following pattern:
// #define constant ((int)1)
fn parse_macro_cast(tokens: &mut Vec<cexpr::token::Token>) -> Option<cexpr::token::Token> {
// Strip parentheses
loop {
// Match against the first token after the identifier (= #define)
// and the last token. If they are matching parentheses, remove them.
match (tokens.get(1), tokens.last()) {
// matching parentheses
(Some(t1), Some(t2)) if t1.raw[0] == 40 && t2.raw[0] == 41 => {}
_ => break,
}

tokens.remove(1);
tokens.pop();
}

let ctype;
// Match a cast `(type)`
match (tokens.get(1), tokens.get(2), tokens.get(3)) {
(Some(t1), Some(t2), Some(t3))
if t1.raw[0] == 40
&& t3.raw[0] == 41
&& t2.kind == cexpr::token::Kind::Keyword
=> ctype = t2.clone(),
_ => return None,
}

// remove the tokens
tokens.drain(1..4);

Some(ctype)
}

fn parse_int_literal_tokens(cursor: &clang::Cursor,
unit: &clang::TranslationUnit)
-> Option<i64> {
Expand Down