Skip to content

143 comment get tag attr #158

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

Merged
merged 1 commit into from
Oct 31, 2016
Merged

143 comment get tag attr #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 18 additions & 6 deletions src/clang.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,17 +817,29 @@ impl Comment {

/// 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()
pub fn get_tag_attr_name(&self, idx: c_uint) -> Option<String> {
if idx >= self.get_num_tag_attrs() {
None
} else {
unsafe {
Some(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()
pub fn get_tag_attr_value(&self, idx: c_uint) -> Option<String> {
if idx >= self.get_num_tag_attrs() {
None
} else {
unsafe {
Some(String_ {
x: clang_HTMLStartTag_getAttrValue(self.x, idx)
}.to_string())
}
}
}
}
Expand Down
17 changes: 9 additions & 8 deletions src/ir/annotations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,19 +134,20 @@ impl Annotations {
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_attr_name(0).as_ref().map(|s| s.as_str())
== Some("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() {
let value_opt = comment.get_tag_attr_value(i);
match comment.get_tag_attr_name(i).unwrap().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"),
"accessor"
=> self.accessor_kind = Some(parse_accessor(&value)),
"replaces" => self.use_instead_of = value_opt,
"private" => self.private_fields = value_opt.map(|v|
v != "false"),
"accessor" => self.accessor_kind = value_opt.map(|v|
parse_accessor(&v)),
_ => {},
}
}
Expand Down