language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-08-04 18:58:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

C++ code generator: Fix header-only build when included multiple times

Browse source 
Make sure to mark whatever variables and functions that are left in the header as inline,
even if we don't generate C++ files.
This commit is contained in:
Simon Hausmann 2024-08-19 18:13:09 +02:00 • committed by Simon Hausmann
parent fddb6e30e3
commit 4b2d572732
1 changed files with 55 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

112
internal/compiler/generator/cpp.rs
View file

@ -97,20 +97,63 @@ mod cpp_ast {
impl File {
pub fn split_off_cpp_files(&mut self, header_file_name: String, count: usize) -> Vec<File> {
let mut cpp_files = Vec::with_capacity(count);
if count == 0 {
return cpp_files;
}
if count > 0 {
let mut definitions = Vec::new();
let mut definitions = Vec::new();
let mut i = 0;
while i < self.definitions.len() {
if matches!(&self.definitions[i], Declaration::Function(fun) if fun.template_parameters.is_some())
{
i += 1;
continue;
let mut i = 0;
while i < self.definitions.len() {
if matches!(&self.definitions[i], Declaration::Function(fun) if fun.template_parameters.is_some())
{
i += 1;
continue;
}
definitions.push(self.definitions.remove(i));
}
definitions.push(self.definitions.remove(i));
let mut cpp_resources = self
.resources
.iter_mut()
.filter_map(|header_resource| match header_resource {
Declaration::Var(var) => {
var.is_extern = true;
Some(Declaration::Var(Var {
ty: var.ty.clone(),
name: var.name.clone(),
array_size: var.array_size.clone(),
init: std::mem::take(&mut var.init),
is_extern: false,
..Default::default()
}))
}
_ => None,
})
.collect::<Vec<_>>();
let cpp_includes = vec![format!("\"{header_file_name}\"")];
let def_chunk_size = definitions.len() / count;
let res_chunk_size = cpp_resources.len() / count;
cpp_files.extend((0..count - 1).map(|_| File {
is_cpp_file: true,
includes: cpp_includes.clone(),
after_includes: String::new(),
namespace: self.namespace.clone(),
declarations: Default::default(),
resources: cpp_resources.drain(0..res_chunk_size).collect(),
definitions: definitions.drain(0..def_chunk_size).collect(),
}));
cpp_files.push(File {
is_cpp_file: true,
includes: cpp_includes,
after_includes: String::new(),
namespace: self.namespace.clone(),
declarations: Default::default(),
resources: cpp_resources,
definitions,
});
cpp_files.resize_with(count, Default::default);
}
// Any definition in the header file is inline.
@ -120,51 +163,6 @@ mod cpp_ast {
_ => {}
});
let mut cpp_resources = self
.resources
.iter_mut()
.filter_map(|header_resource| match header_resource {
Declaration::Var(var) => {
var.is_extern = true;
Some(Declaration::Var(Var {
ty: var.ty.clone(),
name: var.name.clone(),
array_size: var.array_size.clone(),
init: std::mem::take(&mut var.init),
is_extern: false,
..Default::default()
}))
}
_ => None,
})
.collect::<Vec<_>>();
let cpp_includes = vec![format!("\"{header_file_name}\"")];
let def_chunk_size = definitions.len() / count;
let res_chunk_size = cpp_resources.len() / count;
cpp_files.extend((0..count - 1).map(|_| File {
is_cpp_file: true,
includes: cpp_includes.clone(),
after_includes: String::new(),
namespace: self.namespace.clone(),
declarations: Default::default(),
resources: cpp_resources.drain(0..res_chunk_size).collect(),
definitions: definitions.drain(0..def_chunk_size).collect(),
}));
cpp_files.push(File {
is_cpp_file: true,
includes: cpp_includes,
after_includes: String::new(),
namespace: self.namespace.clone(),
declarations: Default::default(),
resources: cpp_resources,
definitions,
});
cpp_files.resize_with(count, Default::default);
cpp_files
}
}