From e4cf78c8c6c7e1a7e22f2bcc43571d97090eb212 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Correnson?= <loic.correnson@cea.fr>
Date: Wed, 9 Oct 2024 14:48:13 +0200
Subject: [PATCH] [region/ivette] fix record color
---
ivette/src/dome/renderer/graph/diagram.tsx | 2 +-
ivette/src/frama-c/plugins/region/memory.tsx | 13 +++++++------
src/plugins/region/tests/region/{comp.c => comp.i} | 0
3 files changed, 8 insertions(+), 7 deletions(-)
rename src/plugins/region/tests/region/{comp.c => comp.i} (100%)
diff --git a/ivette/src/dome/renderer/graph/diagram.tsx b/ivette/src/dome/renderer/graph/diagram.tsx
index d594f647ca2..5764a97e731 100644
--- a/ivette/src/dome/renderer/graph/diagram.tsx
+++ b/ivette/src/dome/renderer/graph/diagram.tsx
@@ -349,7 +349,7 @@ class Builder {
// --- Edge
edge(e: Edge): void {
const { line = 'solid', head = 'arrow', tail = 'none' } = e;
- const tooltip = e.title ?? e.label ?? `${e.source} -> ${e.target}`;
+ const tooltip = e.title ?? e.label;
if (e.aligned === true)
this
.print('{ rank=same; ')
diff --git a/ivette/src/frama-c/plugins/region/memory.tsx b/ivette/src/frama-c/plugins/region/memory.tsx
index 42e4ac7f8de..e04a8e56bf3 100644
--- a/ivette/src/frama-c/plugins/region/memory.tsx
+++ b/ivette/src/frama-c/plugins/region/memory.tsx
@@ -54,7 +54,7 @@ function makeRecord(
cells.push({ label, port });
});
if (offset !== sizeof)
- cells.push(`#${sizeof-offset}b`);
+ cells.push(`#${sizeof - offset}b`);
return cells;
}
@@ -70,11 +70,12 @@ function makeDiagram(regions: readonly Region.region[]): Diagram {
const id = `n${r.node}`;
// --- Color
const color =
- !r.typed ? 'red' :
- r.pointed !== undefined
- ? (r.writes ? 'orange' : 'yellow')
- : (r.writes && r.reads) ? 'green' :
- r.writes ? 'pink' : r.reads ? 'grey' : 'white';
+ (!r.writes && !r.reads) ? undefined :
+ !r.typed ? 'red' :
+ r.pointed !== undefined
+ ? (r.writes ? 'orange' : 'yellow')
+ : (r.writes && r.reads) ? 'green' :
+ r.writes ? 'pink' : 'grey';
// --- Shape
const font = r.ranges.length > 0 ? 'mono' : 'sans';
const cells = makeRecord(edges, id, r.sizeof, r.ranges);
diff --git a/src/plugins/region/tests/region/comp.c b/src/plugins/region/tests/region/comp.i
similarity index 100%
rename from src/plugins/region/tests/region/comp.c
rename to src/plugins/region/tests/region/comp.i
--
GitLab