Add support for nested namespaces for C++ (#765)

* Add support for nested namespaces for C++ * Improve logic for computing paths to relative files for C++ * Fix lint & CI errors
rust-diplomat · Jan 22, 2025 · a49588d · a49588d
1 parent d7aeba0
commit a49588d
Show file tree

Hide file tree

Showing 23 changed files with 568 additions and 23 deletions.
diff --git a/feature_tests/c/include/Nested.d.h b/feature_tests/c/include/Nested.d.h
diff --git a/feature_tests/c/include/Nested.h b/feature_tests/c/include/Nested.h
diff --git a/feature_tests/c/include/Nested2.d.h b/feature_tests/c/include/Nested2.d.h
diff --git a/feature_tests/c/include/Nested2.h b/feature_tests/c/include/Nested2.h
diff --git a/feature_tests/cpp/include/nested/ns/Nested.d.hpp b/feature_tests/cpp/include/nested/ns/Nested.d.hpp
diff --git a/feature_tests/cpp/include/nested/ns/Nested.hpp b/feature_tests/cpp/include/nested/ns/Nested.hpp
diff --git a/feature_tests/cpp/include/nested/ns2/Nested.d.hpp b/feature_tests/cpp/include/nested/ns2/Nested.d.hpp
diff --git a/feature_tests/cpp/include/nested/ns2/Nested.hpp b/feature_tests/cpp/include/nested/ns2/Nested.hpp
diff --git a/feature_tests/cpp/tests/attrs.cpp b/feature_tests/cpp/tests/attrs.cpp
@@ -2,18 +2,21 @@
 #include "../include/ns/AttrOpaque1Renamed.hpp"
 #include "../include/ns/RenamedAttrEnum.hpp"
 #include "../include/Unnamespaced.hpp"
+#include "../include/nested/ns/Nested.hpp"
+#include "../include/nested/ns2/Nested.hpp"
 #include "assert.hpp"
 
-int main(int argc, char *argv[]) {
+int main(int argc, char *argv[])
+{
     std::unique_ptr<ns::AttrOpaque1Renamed> r = ns::AttrOpaque1Renamed::totally_not_new();
     simple_assert_eq("method should call", r->method_renamed(), 77);
     simple_assert_eq("method should call", r->abirenamed(), 123);
 
     // These C names should also resolve
-    void* renamed = (void*)ns::capi::renamed_on_abi_only;
-    std::cout<<"Renamed function at "<<renamed<<std::endl;
-    renamed = (void*)ns::capi::namespace_AttrOpaque1_method;
-    std::cout<<"Renamed function at "<<renamed<<std::endl;
+    void *renamed = (void *)ns::capi::renamed_on_abi_only;
+    std::cout << "Renamed function at " << renamed << std::endl;
+    renamed = (void *)ns::capi::namespace_AttrOpaque1_method;
+    std::cout << "Renamed function at " << renamed << std::endl;
 
     ns::RenamedAttrEnum e = ns::RenamedAttrEnum::A;
 

diff --git a/feature_tests/dart/lib/src/RenamedNested.g.dart b/feature_tests/dart/lib/src/RenamedNested.g.dart
diff --git a/feature_tests/dart/lib/src/RenamedNested2.g.dart b/feature_tests/dart/lib/src/RenamedNested2.g.dart
diff --git a/feature_tests/dart/lib/src/lib.g.dart b/feature_tests/dart/lib/src/lib.g.dart
diff --git a/feature_tests/js/api/RenamedNested.d.ts b/feature_tests/js/api/RenamedNested.d.ts