Skip to content
Open
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
36 changes: 31 additions & 5 deletions crates/cpp/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -532,9 +532,14 @@ impl WorldGenerator for Cpp {
let binding = Some(name);
let mut r#gen = self.interface(resolve, binding, true, Some(wasm_import_module));
r#gen.interface = Some(id);
r#gen.types(id);
let namespace =
namespace(resolve, &TypeOwner::Interface(id), false, &r#gen.r#gen.opts);
let docs = resolve.interfaces[id].docs.contents.as_deref();
r#gen
.r#gen
.h_src
.change_namespace_with_docs(&namespace, docs);
r#gen.types(id);

for (_name, func) in resolve.interfaces[id].functions.iter() {
if matches!(func.kind, FunctionKind::Freestanding) {
Expand Down Expand Up @@ -583,8 +588,13 @@ impl WorldGenerator for Cpp {
let binding = Some(name);
let mut r#gen = self.interface(resolve, binding, false, Some(wasm_import_module));
r#gen.interface = Some(id);
r#gen.types(id);
let namespace = namespace(resolve, &TypeOwner::Interface(id), true, &r#gen.r#gen.opts);
let docs = resolve.interfaces[id].docs.contents.as_deref();
r#gen
.r#gen
.h_src
.change_namespace_with_docs(&namespace, docs);
r#gen.types(id);

for (_name, func) in resolve.interfaces[id].functions.iter() {
if matches!(func.kind, FunctionKind::Freestanding) {
Expand Down Expand Up @@ -791,6 +801,10 @@ fn namespace(resolve: &Resolve, owner: &TypeOwner, guest_export: bool, opts: &Op

impl SourceWithState {
fn change_namespace(&mut self, target: &[String]) {
self.change_namespace_with_docs(target, None);
}

fn change_namespace_with_docs(&mut self, target: &[String], docs: Option<&str>) {
let mut same = 0;
// itertools::fold_while?
for (a, b) in self.namespace.iter().zip(target.iter()) {
Expand All @@ -804,9 +818,17 @@ impl SourceWithState {
uwrite!(self.src, "}}\n");
}
self.namespace.truncate(same);
for i in target.iter().skip(same) {
uwrite!(self.src, "namespace {} {{\n", i);
self.namespace.push(i.clone());
let new_namespaces: Vec<_> = target.iter().skip(same).collect();
if !new_namespaces.is_empty() {
if let Some(content) = docs {
for line in content.trim().lines() {
uwriteln!(self.src, "/// {}", line);
}
}
for i in &new_namespaces {
uwrite!(self.src, "namespace {} {{\n", i);
self.namespace.push(i.to_string());
}
}
}

Expand Down Expand Up @@ -1289,6 +1311,10 @@ impl CppInterfaceGenerator<'_> {
AbiVariant::GuestExportAsync => todo!(),
AbiVariant::GuestExportAsyncStackful => todo!(),
};
if func.docs.contents.is_some() && !self.r#gen.h_src.src.ends_with('\n') {
uwriteln!(self.r#gen.h_src.src, "");
}
Self::docs(&mut self.r#gen.h_src.src, &func.docs);
let params = self.print_signature(func, variant, !export);
let special = is_special_method(func);
if !matches!(special, SpecialMethod::Allocate) {
Expand Down
Loading