edits

Author: nunoplopes

cpp2rust/converter/converter.cpp

@@ -3582,9 +3582,9 @@ std::string Converter::ConvertIRFragment(
     if (auto *t = std::get_if<TextFragment>(&frag)) {
       result += t->text;
     } else if (auto *g = std::get_if<GenericFragment>(&frag)) {
-      result += Mapper::InstantiateTemplate(GetCalleeOrExpr(expr), g->name);
+      result += Mapper::InstantiateTemplate(GetCalleeOrExpr(expr), g->n);
     } else if (auto *ph = std::get_if<PlaceholderFragment>(&frag)) {
-      auto arg_idx = std::stoi(ph->arg.substr(1)); // "a0" -> 0
+      auto arg_idx = ph->n;
       assert(arg_idx < static_cast<int>(all_args.size()));
       auto *arg = all_args[arg_idx];
       bool is_receiver = HasReceiver(expr) && arg_idx == 0;
@@ -3593,7 +3593,7 @@ std::string Converter::ConvertIRFragment(
           .param_type = Mapper::GetParamType(GetCalleeOrExpr(expr), arg_idx),
           .materialize_ctx = ctx,
           .materialize_idx =
-              is_receiver ? -1 : (arg_idx - (HasReceiver(expr) ? 1 : 0)),
+              is_receiver ? -1 : ((int)arg_idx - HasReceiver(expr)),
           .access = ph->access,
           .is_receiver = is_receiver,
           .is_cpp_ptr = arg->getType()->isPointerType(),

cpp2rust/converter/mapper.cpp

@@ -47,7 +47,7 @@ std::string GetMapKey(const std::string &str) {
     return str.substr(0, n);
   }
   // something like int[][] or T1[] -> []
-  return str.substr(n+1);
+  return str.substr(n + 1);
 }
 
 void AddTypeRule(std::string src, TranslationRule::TypeRule &&rule) {
@@ -628,8 +628,8 @@ std::string MapFunctionName(const clang::FunctionDecl *decl) {
   return GetNamedDeclAsString(decl->getCanonicalDecl());
 }
 
-std::string InstantiateTemplate(const clang::Expr *expr,
-                                const std::string &text) {
+std::string InstantiateTemplate(const clang::Expr *expr, unsigned n) {
+  auto text = 'T' + std::to_string(n);
   auto it = search(expr);
   if (it == exprs_.end()) {
     return text;

cpp2rust/converter/mapper.h

@@ -32,8 +32,7 @@ bool Contains(const clang::Expr *expr);
 std::string Map(clang::QualType qual_type);
 const TranslationRule::ExprTgt *GetExprTgt(const clang::Expr *expr);
 std::string MapFunctionName(const clang::FunctionDecl *decl);
-std::string InstantiateTemplate(const clang::Expr *expr,
-                                const std::string &text);
+std::string InstantiateTemplate(const clang::Expr *expr, unsigned n);
 bool ReturnsPointer(const clang::Expr *expr);
 std::string GetParamType(const clang::Expr *expr, unsigned index);
 bool ParamIsPointer(const clang::Expr *expr, unsigned index);

cpp2rust/converter/models/converter_refcount.cpp

@@ -2194,7 +2194,7 @@ std::string ConverterRefCount::ConvertMappedMethodCall(
     return Converter::ConvertMappedMethodCall(expr, mc, args, num_args, ctx);
   }
 
-  auto arg_idx = std::stoi(receiver_ph->arg.substr(1));
+  auto arg_idx = receiver_ph->n;
   auto *arg = BuildUnifiedArgs(expr, args, num_args)[arg_idx];
 
   if (!arg->getType()->isPointerType() && !IsReferenceType(arg)) {

cpp2rust/converter/translation_rule.cpp

@@ -733,7 +733,12 @@ TextFragment ParseTextFragmentJSON(const llvm::json::Object &obj) {
 }
 
 GenericFragment ParseGenericFragmentJSON(const llvm::json::Object &obj) {
-  return {obj.getString("generic")->str()};
+  auto s = obj.getString("generic");
+  if (s->size() < 2 || s->front() != 'T') {
+    llvm::errs() << "Invalid generic fragment: " << s << '\n';
+    assert(0);
+  }
+  return {(unsigned)std::atoi(s->data() + 1)};
 }
 
 TypeInfo ParseTypeInfoJSON(const llvm::json::Object &obj) {
@@ -767,7 +772,11 @@ ParsePlaceholderFragmentJSON(const llvm::json::Object &obj) {
   auto arg = obj.getString("arg");
   auto access = obj.getString("access");
   assert(arg && access);
-  return {arg->str(), ParseAccessJSON(*access)};
+  if (arg->size() < 2 || arg->front() != 'a') {
+    llvm::errs() << "Invalid arg fragment: " << arg << '\n';
+    assert(0);
+  }
+  return {(unsigned)atoi(arg->data() + 1), ParseAccessJSON(*access)};
 }
 
 std::vector<BodyFragment> ParseBodyFragmentsJSON(const llvm::json::Array &arr);
@@ -938,7 +947,7 @@ void TextFragment::dump() const {
 }
 
 void PlaceholderFragment::dump() const {
-  llvm::errs() << "  placeholder: " << arg << " (";
+  llvm::errs() << "  placeholder: " << n << " (";
   switch (access) {
   case Access::kRead:
     llvm::errs() << "read\n";
@@ -997,7 +1006,7 @@ void ExprTgt::dump() const {
 }
 
 void GenericFragment::dump() const {
-  llvm::errs() << "  generic: " << name << '\n';
+  llvm::errs() << "  generic: " << n << '\n';
 }
 
 void TypeInfo::dump() const {

cpp2rust/converter/translation_rule.h

@@ -24,14 +24,14 @@ struct TextFragment {
 enum class Access { kRead, kWrite, kMove };
 
 struct PlaceholderFragment {
-  std::string arg; // "a0", "a1", ...
+  unsigned n; // "a0", "a1", ...
   Access access;
 
   void dump() const;
 };
 
 struct GenericFragment {
-  std::string name; // "T1", "T2", ...
+  unsigned n; // "T1", "T2", ...
 
   void dump() const;
 };