Support macros from within breakpoints

Author: Your Name

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "frida-cshell",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "Frida's CShell",
   "scripts": {
     "prepare": "npm run build && npm run version && npm run package && npm run copy",

package.json

@@ -106,7 +106,7 @@ m name ${CmdLet.DELETE_CHAR} - delete a macro
     return Var.ZERO;
   }
 
-  public static run(macro: Macro): Var {
+  public static runSync(macro: Macro): Var {
     let ret = Var.ZERO;
     for (const command of macro.commands) {
       if (command.length === 0) continue;

src/cmdlets/misc/macro.ts

@@ -17,19 +17,24 @@ export class Command {
 
     const macro = this.getMacro(tokens);
     if (macro !== null) {
-      return MacroCmdLet.run(macro);
+      return MacroCmdLet.runSync(macro);
     }
 
     return this.runFunction(tokens);
   }
 
   public static runSync(tokens: Token[]): Var {
     const cmdlet = this.getCmdlet(tokens);
-    if (cmdlet === null) {
-      return this.runFunction(tokens);
-    } else {
+    if (cmdlet !== null) {
       return cmdlet.runSync(tokens.slice(1));
     }
+
+    const macro = this.getMacro(tokens);
+    if (macro !== null) {
+      return MacroCmdLet.runSync(macro);
+    }
+
+    return this.runFunction(tokens);
   }
 
   private static getCmdlet(tokens: Token[]): CmdLet | null {
@@ -45,7 +50,8 @@ export class Command {
     if (!name.startsWith(Command.MACRO_PREFIX)) return null;
     if (name.length === 1) throw new Error('macro name not supplied');
     const macro = Macros.get(name.slice(1));
-    if (macro === null) throw new Error(`failed to recognozie macro ${Output.green(name)}`);
+    if (macro === null)
+      throw new Error(`failed to recognozie macro ${Output.green(name)}`);
     return macro;
   }