summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Fitzgerald <fitzgen@gmail.com>2017-08-15 11:27:00 -0700
committerNick Fitzgerald <fitzgen@gmail.com>2017-08-16 15:35:33 -0700
commitb6c7592be3231bc69c1dcde0ffe6fff8720c7ad7 (patch)
tree13a202ea8d046047164f29625a7f9282ac47a159 /src
parent74834c70f50648972e4bb0d48837f180428c1447 (diff)
Check if `clang_Type_getNumTemplateArguments` is loaded before use
Older clang don't have it, and while we can't pass our whole test suite with those older clangs, we can still generate simple C bindings, so it makes sense not to panic for C++ only things.
Diffstat (limited to 'src')
-rw-r--r--src/clang.rs16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/clang.rs b/src/clang.rs
index 6e1f426c..beacb5de 100644
--- a/src/clang.rs
+++ b/src/clang.rs
@@ -833,6 +833,13 @@ impl Type {
/// Get the number of template arguments this type has, or `None` if it is
/// not some kind of template.
pub fn num_template_args(&self) -> Option<u32> {
+ // If an old libclang is loaded, we have no hope of answering this
+ // question correctly. However, that's no reason to panic when
+ // generating bindings for simple C headers with an old libclang.
+ if !clang_Type_getNumTemplateArguments::is_loaded() {
+ return None
+ }
+
let n = unsafe { clang_Type_getNumTemplateArguments(self.x) };
if n >= 0 {
Some(n as u32)
@@ -1594,14 +1601,19 @@ pub fn ast_dump(c: &Cursor, depth: isize) -> CXChildVisitResult {
print_indent(depth,
format!(" {}spelling = \"{}\"", prefix, ty.spelling()));
- let num_template_args =
- unsafe { clang_Type_getNumTemplateArguments(ty.x) };
+
+ let num_template_args = if clang_Type_getNumTemplateArguments::is_loaded() {
+ unsafe { clang_Type_getNumTemplateArguments(ty.x) }
+ } else {
+ -1
+ };
if num_template_args >= 0 {
print_indent(depth,
format!(" {}number-of-template-args = {}",
prefix,
num_template_args));
}
+
if let Some(num) = ty.num_elements() {
print_indent(depth,
format!(" {}number-of-elements = {}", prefix, num));