Ghidra is a software reverse engineering (SRE) framework
Preserve template namespaces before terminal angle operators
Rudy Celekli7fc2750799bf
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/SymbolPathParser.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/SymbolPathParser.javaindex 48dc4d910e..020f273ebf 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/SymbolPathParser.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/SymbolPathParser.java@@ -93,6 +93,10 @@ public class SymbolPathParser {int parenthesesLevel = 0;int startIndex = 0;for (int i = 0; i < name.length(); ++i) {+ if (i == startIndex && templateLevel == 0 && parenthesesLevel == 0 &&+ isTerminalAngleOperator(name.substring(i))) {+ break;+ }if ((name.charAt(i) == ':') && (i != name.length() - 1) &&(name.charAt(i + 1) == ':')) {if ((templateLevel == 0) && (parenthesesLevel == 0)) {@@ -138,6 +142,14 @@ public class SymbolPathParser {return list;}+ private static boolean isTerminalAngleOperator(String component) {+ return switch (component) {+ case "operator<", "operator>", "operator<=", "operator>=", "operator<<",+ "operator>>", "operator<<=", "operator>>=", "operator<=>" -> true;+ default -> false;+ };+ }+// TODO: in progress.// /**// * More complicated parsing that takes into account: