edits

nunoplopes · nunoplopes · commit a0eef7d2e8ed · 2026-05-01T14:46:48.000+01:00
diff --git a/cpp2rust/converter/mapper.cpp b/cpp2rust/converter/mapper.cpp
@@ -42,7 +42,12 @@ clang::PrintingPolicy getPrintPolicy() {
 }
 
 std::string GetMapKey(const std::string &str) {
-  return str.substr(0, str.find_first_of("<["));
+  auto n = str.find_first_of("<[");
+  if (n == std::string::npos || str[n] == '<') {
+    return str.substr(0, n);
+  }
+  // something like int[][] or T1[] -> []
+  return str.substr(n+1);
 }
 
 void AddTypeRule(std::string src, TranslationRule::TypeRule &&rule) {

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,12 @@ clang::PrintingPolicy getPrintPolicy() {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`std::string GetMapKey(const std::string &str) {`
`45`		`- return str.substr(0, str.find_first_of("<["));`
	`45`	`+ auto n = str.find_first_of("<[");`
	`46`	`+ if (n == std::string::npos \|\| str[n] == '<') {`
	`47`	`+ return str.substr(0, n);`
	`48`	`+ }`
	`49`	`+ // something like int[][] or T1[] -> []`
	`50`	`+ return str.substr(n+1);`
`46`	`51`	`}`
`47`	`52`
`48`	`53`	`void AddTypeRule(std::string src, TranslationRule::TypeRule &&rule) {`