Resolve the issue of parsing failure with "std::mutex repeats N times"

Author: HenryRiley0

src/backend/gdb_expansion.ts

@@ -1,7 +1,7 @@
 import { VariableObject } from "./backend";
 import { MINode } from "./mi_parse";
-const resultRegex = /^([a-zA-Z_\-][a-zA-Z0-9_\-:\ \<\>\(\)]*|\[\d+\])\s*=\s*/;
-const variableRegex = /^[a-zA-Z_\-][a-zA-Z0-9_\-]*/;
+const resultRegex = /^([a-zA-Z_\-][a-zA-Z0-9_\-<> :(),]*|\[\d+\])\s*=\s*/;
+const variableRegex = /^[a-zA-Z_\-\'\(][a-zA-Z0-9_\-\>\ \\\'\)\:]*/;
 const errorRegex = /^\<.+?\>/;
 const referenceStringRegex = /^(0x[0-9a-fA-F]+\s*)"/;
 const referenceRegex = /^0x[0-9a-fA-F]+/;
@@ -104,10 +104,11 @@ export function expandValue(variableCreate: (arg: VariableObject | string, optio
 		const eqPos = value.indexOf("=");
 		const newValPos1 = value.indexOf("{");
 		const newValPos2 = value.indexOf(",");
+		const newValPos3 = value.indexOf("}");
 		let newValPos = newValPos1;
 		if (newValPos2 != -1 && newValPos2 < newValPos1)
 			newValPos = newValPos2;
-		if (newValPos != -1 && eqPos > newValPos || eqPos == -1 || value.startsWith("std::")) { // is value list
+		if (newValPos != -1 && eqPos > newValPos || eqPos == -1 || eqPos > newValPos3 || value.startsWith("std::")) { // is value list
 			const values = [];
 			stack.push("[0]");
 			let val = parseValue();
@@ -209,18 +210,20 @@ export function expandValue(variableCreate: (arg: VariableObject | string, optio
 		value = value.trim();
 		value = value.replace(/^static /, "");
 		const variableMatch = resultRegex.exec(value);
-		if (!variableMatch)
+		if (!variableMatch){
 			return undefined;
+		}
 		value = value.substring(variableMatch[0].length).trim();
 		let name = variable = variableMatch[1].trim();
 
 		const tmpName = name.split(" ");
-		if(tmpName.length > 1 && !name.includes("anonymous union")){
+		if(tmpName.length > 1 && !name.includes("anonymous union") && !name.includes(',')){
 			name = tmpName[tmpName.length - 1];
 		}
 
 		if (pushToStack)
 			stack.push(variable);
+
 		const val = parseValue();
 		if (pushToStack)
 			stack.pop();

src/mibase.ts

@@ -537,7 +537,15 @@ export class MI2DebugSession extends DebugSession {
 				// TODO: this evaluates on an (effectively) unknown thread for multithreaded programs.
 				variable = await this.miDebugger.evalExpression(JSON.stringify(id), 0, 0);
 				try {
-					let expanded = expandValue(createVariable, variable.result("value"), id, variable);
+					let variableValue = variable.result("value");
+					const pattern = /'([^']*)' <repeats (\d+) times>/g;
+					variableValue = variableValue.replace(pattern, (_: any, char: string, count: string) => {
+						const repeatCount = parseInt(count, 10) + 1;
+						const repeatedArray = Array(repeatCount).fill(char);
+						return `{${repeatedArray.map(item => `'${item}'`).join(', ')}}`;
+					});
+
+					let expanded = expandValue(createVariable, variableValue, id, variable);
 					if (!expanded) {
 						this.sendErrorResponse(response, 2, `Could not expand variable`);
 					} else {