Add support for nested namespaces for C++ #765
Merged
+568
−23
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This CI failure seems spurious, like clang-14 isn't installed in the CI runner? |
Manishearth
reviewed
Jan 20, 2025
tool/src/cpp/formatter.rs
Outdated
| @@ -56,6 +56,7 @@ impl<'tcx> Cpp2Formatter<'tcx> { | |||
| .rename | |||
| .apply(resolved.name().as_str().into()); | |||
| if let Some(ref ns) = resolved.attrs().namespace { | |||
| let ns = ns.replace("::", std::path::MAIN_SEPARATOR_STR); | |||
There was a problem hiding this comment.
issue: Diplomat aims to generate the same code regardless of the host platform. AIUI forward slashes work on Windows in #include, we should just support that, and we can add a config if someone wishes to use backslashes here instead.
There was a problem hiding this comment.
Sounds reasonable
|
CI fixed |
|
I've updated with an improved function for computing relative paths to files which includes some minor isolated unit tests, and always uses '/' as the path separator |
Manishearth
approved these changes
Jan 22, 2025
tool/src/cpp/header.rs
Outdated
| /// Returns the path to 'other' along with the # of steps back from 'root' required | ||
| /// | ||
| /// e.g get_nearest_root("/a/b/c/d.hpp", "a/b/z/d.hpp") -> "z/d.hpp", 2 | ||
| /// or get_nearest_root("a/b.hpp", "root.hpp") -> "root.hpp", 1 |
There was a problem hiding this comment.
nit: these docs are out of date
Walter-Reactor
force-pushed
the
user/wgray/nested-namespaces
branch
from
e6ef3e4 to
6f7b963
Compare
|
Needs CI fixes |
Walter-Reactor
force-pushed
the
user/wgray/nested-namespaces
branch
from
6f7b963 to
098fee9
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds support for using nested namespaces to the C/C++ generator. Nested namespaces are specified with the
::separator syntax, ie "company::module::submodule". Filenames and include guards are updated so that multiple files with the same name in different namespaces don't conflict, which is a big part of the purpose of submodulesI'd add to the Book, but it seems the source isn't part of the repo?