Use iterators for comment attributes fix rust-lang#166

Author: jeanphilippeD

src/clang.rs

@@ -802,32 +802,17 @@ impl Comment {
         }
     }
 
-    /// Given that this comment is an HTML start tag, get the number of HTML
-    /// attributes it has.
-    pub fn get_num_tag_attrs(&self) -> c_uint {
-        unsafe {
-            clang_HTMLStartTag_getNumAttrs(self.x)
-        }
-    }
-
-    /// Given that this comment is an HTML start tag, get the `idx`th
-    /// attribute's name.
-    pub fn get_tag_attr_name(&self, idx: c_uint) -> String {
-        unsafe {
-            String_ { x: clang_HTMLStartTag_getAttrName(self.x, idx) }.to_string()
-        }
-    }
-
-    /// Given that this comment is an HTML start tag, get the `idx`th
-    /// attribute's value.
-    pub fn get_tag_attr_value(&self, idx: c_uint) -> String {
-        unsafe {
-            String_ { x: clang_HTMLStartTag_getAttrValue(self.x, idx) }.to_string()
+    /// Given that this comment is an HTML start tag, get its HTML attributes.
+    pub fn get_tag_attrs(&self) -> CommentAttributesIntoIterator {
+        CommentAttributesIntoIterator {
+            x: self.x,
+            length: unsafe { clang_HTMLStartTag_getNumAttrs(self.x) },
+            index: 0
         }
     }
 }
 
-// An iterator for a comment's children
+/// An iterator for a comment's children
 pub struct CommentChildrenIntoIterator {
     parent: CXComment,
     length: c_uint,
@@ -848,6 +833,36 @@ impl Iterator for CommentChildrenIntoIterator {
     }
 }
 
+/// A comment attribute
+pub struct CommentAttribute {
+    pub name: String,
+    pub value: String
+}
+
+/// An iterator for a comment's attributes
+pub struct CommentAttributesIntoIterator {
+    x: CXComment,
+    length: c_uint,
+    index: c_uint
+}
+
+impl Iterator for CommentAttributesIntoIterator {
+    type Item = CommentAttribute;
+    fn next(&mut self) -> Option<CommentAttribute> {
+        if self.index < self.length {
+            let idx = self.index;
+            self.index += 1;
+            Some( CommentAttribute {
+                name: String_ { x: unsafe { clang_HTMLStartTag_getAttrName(self.x, idx) } }.to_string(),
+                value: String_ { x: unsafe { clang_HTMLStartTag_getAttrValue(self.x, idx) } }.to_string()
+            })
+        }
+        else {
+            None
+        }
+    }
+}
+
 /// A source file.
 pub struct File {
     x: CXFile

src/ir/annotations.rs

@@ -133,20 +133,17 @@ impl Annotations {
         use clangll::CXComment_HTMLStartTag;
         if comment.kind() == CXComment_HTMLStartTag &&
            comment.get_tag_name() == "div" &&
-           comment.get_num_tag_attrs() > 1 &&
-           comment.get_tag_attr_name(0) == "rustbindgen" {
+           comment.get_tag_attrs().next().map_or(false, |attr| attr.name == "rustbindgen") {
             *matched = true;
-            for i in 0..comment.get_num_tag_attrs() {
-                let value = comment.get_tag_attr_value(i);
-                let name = comment.get_tag_attr_name(i);
-                match name.as_str() {
+            for attr in comment.get_tag_attrs() {
+                match attr.name.as_str() {
                     "opaque" => self.opaque = true,
                     "hide" => self.hide = true,
                     "nocopy" => self.disallow_copy = true,
-                    "replaces" => self.use_instead_of = Some(value),
-                    "private" => self.private_fields = Some(value != "false"),
+                    "replaces" => self.use_instead_of = Some(attr.value),
+                    "private" => self.private_fields = Some(attr.value != "false"),
                     "accessor"
-                        => self.accessor_kind = Some(parse_accessor(&value)),
+                        => self.accessor_kind = Some(parse_accessor(&attr.value)),
                     _ => {},
                 }
             }