Skip to content
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

cxx-qt-gen: add parsing phase of extern "C++Qt" #631

Merged
merged 6 commits into from
Aug 1, 2023
Merged

cxx-qt-gen: add parsing phase of extern "C++Qt" #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bd37156
cxx-qt-gen: split populating mappings from extern blocks into helper
ahayzen-kdab Jul 26, 2023
89066f3
cxx-qt-gen: add parsing phase of extern "C++Qt"
ahayzen-kdab Jul 27, 2023
7578c5a
cxx-qt-gen: combine mappings in parser into one struct
ahayzen-kdab Jul 27, 2023
342fdcf
cxx-qt-gen: split parsed mappings into a separate file
ahayzen-kdab Jul 27, 2023
1acb41e
cxx-qt-gen: move populate mappings to the mappings module
ahayzen-kdab Jul 27, 2023
5ac6686
cxx-qt-gen: move some mappings tests to be in mappings file
ahayzen-kdab Jul 27, 2023
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
2 changes: 1 addition & 1 deletion crates/cxx-qt-gen/src/generator/cpp/constructor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use super::qobject::GeneratedCppQObjectBlocks;
use crate::{
generator::{cpp::GeneratedCppQObject, utils::cpp::syn_type_to_cpp_type},
parser::{constructor::Constructor, cxxqtdata::ParsedCxxMappings},
parser::{constructor::Constructor, mappings::ParsedCxxMappings},
CppFragment,
};

Expand Down
2 changes: 1 addition & 1 deletion crates/cxx-qt-gen/src/generator/cpp/inherit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::{
cpp::{fragment::CppFragment, qobject::GeneratedCppQObjectBlocks},
utils::cpp::syn_type_to_cpp_return_type,
},
parser::{cxxqtdata::ParsedCxxMappings, inherit::ParsedInheritedMethod},
parser::{inherit::ParsedInheritedMethod, mappings::ParsedCxxMappings},
};

use syn::Result;
Expand Down
2 changes: 1 addition & 1 deletion crates/cxx-qt-gen/src/generator/cpp/method.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use crate::{
},
},
parser::{
cxxqtdata::ParsedCxxMappings,
mappings::ParsedCxxMappings,
method::{ParsedMethod, ParsedQInvokableSpecifiers},
},
};
Expand Down
2 changes: 1 addition & 1 deletion crates/cxx-qt-gen/src/generator/cpp/property/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use crate::generator::{
naming::{property::QPropertyName, qobject::QObjectName},
utils::cpp::syn_type_to_cpp_type,
};
use crate::parser::{cxxqtdata::ParsedCxxMappings, property::ParsedQProperty};
use crate::parser::{mappings::ParsedCxxMappings, property::ParsedQProperty};
use syn::Result;

mod getter;
Expand Down
2 changes: 1 addition & 1 deletion crates/cxx-qt-gen/src/generator/cpp/qobject.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use crate::generator::{
},
naming::{namespace::NamespaceName, qobject::QObjectName},
};
use crate::parser::{cxxqtdata::ParsedCxxMappings, qobject::ParsedQObject};
use crate::parser::{mappings::ParsedCxxMappings, qobject::ParsedQObject};
use std::collections::BTreeSet;
use syn::Result;

Expand Down
2 changes: 1 addition & 1 deletion crates/cxx-qt-gen/src/generator/cpp/signal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::{
naming::{qobject::QObjectName, signals::QSignalName},
utils::cpp::syn_type_to_cpp_type,
},
parser::{cxxqtdata::ParsedCxxMappings, signals::ParsedSignal},
parser::{mappings::ParsedCxxMappings, signals::ParsedSignal},
};
use indoc::formatdoc;
use syn::Result;
Expand Down
2 changes: 1 addition & 1 deletion crates/cxx-qt-gen/src/generator/rust/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ impl GeneratedRustBlocks {
.map(|qobject| {
GeneratedRustQObject::from(
qobject,
&parser.cxx_qt_data.qualified_mappings,
&parser.cxx_qt_data.cxx_mappings.qualified,
&parser.passthrough_module.ident,
)
})
Expand Down
2 changes: 1 addition & 1 deletion crates/cxx-qt-gen/src/generator/utils/cpp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//
// SPDX-License-Identifier: MIT OR Apache-2.0

use crate::parser::cxxqtdata::ParsedCxxMappings;
use crate::parser::mappings::ParsedCxxMappings;
use syn::{
spanned::Spanned, Error, Expr, GenericArgument, Lit, PathArguments, PathSegment, Result,
ReturnType, Type, TypeArray, TypeBareFn, TypePtr, TypeReference, TypeSlice,
Expand Down
Loading