Remove namespace wrapping from index

Author: lucic71

cpp2rust/converter/rules/rules_loader.cpp

@@ -17,6 +17,7 @@
 
 #include <cassert>
 #include <filesystem>
+#include <format>
 #include <ranges>
 #include <string>
 #include <unordered_set>
@@ -283,6 +284,18 @@ const llvm::json::Object &CxxIndex() {
   return index;
 }
 
+std::string WrapRule(const llvm::json::Object &rule, bool is_cxx) {
+  auto dir = rule.getString("dir")->str();
+  auto text = rule.getString("text")->str();
+  if (!is_cxx) {
+    return std::format("#define {0} cpp2rust_rules_{1}_{0}\n{2}#undef {0}\n",
+                       rule.getString("name")->str(), dir, text);
+  }
+  return std::format(
+      "namespace cpp2rust_rules {{\nnamespace cpp2rust_rules_{} {{\n{}}}\n}}\n",
+      dir, text);
+}
+
 std::string BuildRulesEpilogue(const std::unordered_set<std::string> &keys,
                                bool is_cxx) {
   const auto &index = is_cxx ? CxxIndex() : CIndex();
@@ -306,7 +319,7 @@ std::string BuildRulesEpilogue(const std::unordered_set<std::string> &keys,
           })) {
         continue;
       }
-      out += *rule->getString("text");
+      out += WrapRule(*rule, is_cxx);
     }
   }
   return out;

cpp2rust/rule_preprocessing/cpp_rule_indexer.cpp

@@ -217,17 +217,6 @@ std::string TypeKey(const clang::TypedefNameDecl *rule) {
   return ClassOf(type);
 }
 
-std::string WrapRule(const std::string &dir_name, bool is_c,
-                     const std::string &name, const std::string &text) {
-  if (is_c) {
-    return std::format("#define {0} cpp2rust_rules_{1}_{0}\n{2}#undef {0}\n",
-                       name, dir_name, text);
-  }
-  return std::format(
-      "namespace cpp2rust_rules {{\nnamespace cpp2rust_rules_{} {{\n{}}}\n}}\n",
-      dir_name, text);
-}
-
 void AddRule(llvm::json::Object &rules, std::string key,
              llvm::json::Value rule) {
   auto &slot = rules[llvm::json::ObjectKey(std::move(key))];
@@ -272,7 +261,10 @@ void IndexRuleFile(clang::ASTContext &ctx, const std::string &dir_name,
     }
     auto range = clang::tooling::getExtendedRange(*decl, clang::tok::semi, ctx);
     auto text = clang::tooling::getText(range, ctx).str() + '\n';
-    llvm::json::Object rule{{"text", WrapRule(dir_name, is_c, name, text)}};
+    llvm::json::Object rule{{"dir", dir_name}, {"text", text}};
+    if (is_c) {
+      rule["name"] = name;
+    }
     if (auto required = RequiredClasses(decl, alias); !required.empty()) {
       rule["requires"] = llvm::json::Array(required);
     }