From 441373ea136ee49b67947f15dffed7cf2062f9d6 Mon Sep 17 00:00:00 2001 From: Willi Ballenthin Date: Wed, 6 Apr 2022 13:33:56 -0600 Subject: [PATCH] vverbose: render subscope name, like "basic block:" closes #963 --- capa/render/vverbose.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/capa/render/vverbose.py b/capa/render/vverbose.py index affcc6ca..f93a6045 100644 --- a/capa/render/vverbose.py +++ b/capa/render/vverbose.py @@ -39,7 +39,13 @@ def render_locations(ostream, match): def render_statement(ostream, match, statement, indent=0): ostream.write(" " * indent) if statement["type"] in ("and", "or", "optional", "not", "subscope"): - ostream.write(statement["type"]) + if statement["type"] == "subscope": + # emit `basic block:` + # rather than `subscope:` + ostream.write(statement["subscope"]) + else: + # emit `and:` + ostream.write(statement["type"]) ostream.write(":") if statement.get("description"): ostream.write(" = %s" % statement["description"])