From f931e19b11877fffa12b13f929d55883ea8f0751 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20B=C3=BChler?= <david.buhler@cea.fr>
Date: Thu, 2 Mar 2023 11:15:59 +0100
Subject: [PATCH] [ivette] Adds a comment in ASTview.tsx.
---
ivette/src/frama-c/kernel/ASTview.tsx | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/ivette/src/frama-c/kernel/ASTview.tsx b/ivette/src/frama-c/kernel/ASTview.tsx
index 5959d3288af..98f50b7654a 100644
--- a/ivette/src/frama-c/kernel/ASTview.tsx
+++ b/ivette/src/frama-c/kernel/ASTview.tsx
@@ -330,6 +330,8 @@ const PropertiesStatuses = Editor.createField<Properties.statusData[]>([]);
// Recovers all the properties nodes in a tree.
function getPropertiesNodes(tree: Tree): Node[] {
if (isLeaf(tree)) return [];
+ /* Must be consistent with the id chosen by the Frama-C server for property
+ markers. Ideally, this test should not depend on markers id syntax. */
if (tree.id.startsWith('#p')) return [tree];
return tree.children.map(getPropertiesNodes).flat();
}
@@ -342,8 +344,10 @@ function createPropertiesNodes() : Editor.Aspect<Property[]> {
return Editor.createAspect(deps, ({ tree, tags, statuses }) => {
const nodes = getPropertiesNodes(tree);
return mapFilter(nodes, (n) => {
- const s = statuses.find((s) => s.key === n.id); if (!s) return undefined;
- const tag = tags.get(s.status); if (!tag) return undefined;
+ const s = statuses.find((s) => s.key === n.id);
+ if (!s) return undefined;
+ const tag = tags.get(s.status);
+ if (!tag) return undefined;
return { ...n, tag };
});
});
--
GitLab