Wrap enum_val_signed in an Option.

Also reorganize calling function to avoid duplicate checking of cursor
type.

Fixes rust-lang#127

Author: J. Cliff Dyer

src/clang.rs

@@ -352,8 +352,14 @@ impl Cursor {
     /// Returns `LLONG_MIN` if the cursor's referent is not an enum variant,
     /// which is also a valid enum value, so callers should check the cursor
     /// kind before calling this method (see issue #127).
-    pub fn enum_val_signed(&self) -> i64 {
-        unsafe { clang_getEnumConstantDeclValue(self.x) as i64 }
+    pub fn enum_val_signed(&self) -> Option<i64> {
+        unsafe {
+            if self.kind() == CXCursor_EnumConstantDecl {
+                Some(clang_getEnumConstantDeclValue(self.x) as i64)
+            } else {
+                None
+            }
+        }
     }
 
     /// Get the unsigned constant value for this cursor's enum variant referent.

src/ir/enum_ty.rs

@@ -71,16 +71,20 @@ impl Enum {
         };
 
         declaration.visit(|cursor| {
-            if cursor.kind() == CXCursor_EnumConstantDecl {
+            let val = if is_signed {
+                cursor.enum_val_signed().map(|val| EnumVariantValue::Signed(val))
+            } else {
+                if cursor.kind() == CXCursor_EnumConstantDecl {
+                    Some(EnumVariantValue::Unsigned(cursor.enum_val_unsigned()))
+                } else {
+                    None
+                }
+            };
+            if let Some(val) = val {
                 let name = cursor.spelling();
                 let comment = cursor.raw_comment();
-                let val = if is_signed {
-                    EnumVariantValue::Signed(cursor.enum_val_signed())
-                } else {
-                    EnumVariantValue::Unsigned(cursor.enum_val_unsigned())
-                };
                 variants.push(EnumVariant::new(name, comment, val));
-            }
+            };
             CXChildVisit_Continue
         });