Revert translation_rule to master

Author: lucic71

cpp2rust/converter/translation_rule.cpp

@@ -897,7 +897,7 @@ RuleMap LoadTgtFromIR(const std::filesystem::path &json_path) {
     Rule rule;
     if (name[0] == 'f') {
       rule.tgt = ParseExprTgtJSON(*obj);
-      std::get<ExprTgt>(rule.tgt).name = name;
+      std::get<ExprTgt>(rule.tgt).validate(json_path.string() + ":" + name);
     } else if (name[0] == 't') {
       rule.tgt = ParseTypeTgtJSON(*obj);
     } else {
@@ -1039,8 +1039,6 @@ void ExprTgt::validate(const std::string &context) const {
   ValidateConsecutiveKeys(params, 'a', 0, context + " params");
   ValidateConsecutiveKeys(generics, 'T', 1, context + " generics");
   assert(!body.empty() && "ExprTgt body must not be empty");
-  assert(!name.empty() && "ExprTgt name must not be empty");
-  assert(!module.empty() && "ExprTgt module must not be empty");
 }
 
 std::vector<Rule> Load(const std::filesystem::path &path, Model model) {
@@ -1063,9 +1061,6 @@ std::vector<Rule> Load(const std::filesystem::path &path, Model model) {
   }
   for (auto &[name, src_rule] : src_rules) {
     rules.at(name).src = std::move(src_rule.src);
-    if (auto *expr_tgt = std::get_if<ExprTgt>(&rules.at(name).tgt)) {
-      expr_tgt->module = dir.filename().string();
-    }
   }
 
   std::vector<Rule> result;
@@ -1080,9 +1075,6 @@ std::vector<Rule> Load(const std::filesystem::path &path, Model model) {
       }
     }
     assert(!rule.src.empty() && "Rule loaded from IR but has no src");
-    if (auto *expr_tgt = std::get_if<ExprTgt>(&rule.tgt)) {
-      expr_tgt->validate(path.string() + ':' + name);
-    }
     result.push_back(std::move(rule));
   }
   return result;

cpp2rust/converter/translation_rule.h

@@ -61,8 +61,6 @@ struct TypeInfo {
 };
 
 struct ExprTgt {
-  std::string name;
-  std::string module;
   std::unordered_map<std::string, TypeInfo> params; // "a0" -> TypeInfo
   TypeInfo return_type;
   std::unordered_map<std::string, std::vector<std::string>>