@eagleoutice/flowr 2.9.7 → 2.9.8

package/README.md

@@ -24,7 +24,7 @@ It offers a wide variety of features, for example:
     
     ```shell
     $ docker run -it --rm eagleoutice/flowr # or npm run flowr 
-    flowR repl using flowR v2.9.6, R grammar v14 (tree-sitter engine)
+    flowR repl using flowR v2.9.7, R grammar v14 (tree-sitter engine)
     R> :query @linter "read.csv(\"/root/x.txt\")"
     ```
     
@@ -33,19 +33,19 @@ It offers a wide variety of features, for example:
     
     
     ```text
-    Query: linter (1 ms)
+    Query: linter (2 ms)
        ╰ Deprecated Functions (deprecated-functions):
            ╰ Metadata: totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 0, processTimeMs: 0
        ╰ File Path Validity (file-path-validity):
            ╰ certain:
                ╰ Path `/root/x.txt` at 1.1-23
-           ╰ Metadata: totalReads: 1, totalUnknown: 0, totalWritesBeforeAlways: 0, totalValid: 0, searchTimeMs: 0, processTimeMs: 0
+           ╰ Metadata: totalReads: 1, totalUnknown: 0, totalWritesBeforeAlways: 0, totalValid: 0, searchTimeMs: 1, processTimeMs: 0
        ╰ Seeded Randomness (seeded-randomness):
            ╰ Metadata: consumerCalls: 0, callsWithFunctionProducers: 0, callsWithAssignmentProducers: 0, callsWithNonConstantProducers: 0, callsWithOtherBranchProducers: 0, searchTimeMs: 0, processTimeMs: 0
        ╰ Absolute Paths (absolute-file-paths):
            ╰ certain:
                ╰ Path `/root/x.txt` at 1.1-23
-           ╰ Metadata: totalConsidered: 1, totalUnknown: 0, searchTimeMs: 1, processTimeMs: 0
+           ╰ Metadata: totalConsidered: 1, totalUnknown: 0, searchTimeMs: 0, processTimeMs: 0
        ╰ Unused Definitions (unused-definitions):
            ╰ Metadata: totalConsidered: 0, searchTimeMs: 0, processTimeMs: 0
        ╰ Naming Convention (naming-convention):
@@ -53,12 +53,12 @@ It offers a wide variety of features, for example:
        ╰ Network Functions (network-functions):
            ╰ Metadata: totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 0, processTimeMs: 0
        ╰ Dataframe Access Validation (dataframe-access-validation):
-           ╰ Metadata: numOperations: 0, numAccesses: 0, totalAccessed: 0, searchTimeMs: 0, processTimeMs: 0
+           ╰ Metadata: numOperations: 0, numAccesses: 0, totalAccessed: 0, searchTimeMs: 1, processTimeMs: 0
        ╰ Dead Code (dead-code):
            ╰ Metadata: consideredNodes: 5, searchTimeMs: 0, processTimeMs: 0
        ╰ Useless Loops (useless-loop):
            ╰ Metadata: numOfUselessLoops: 0, searchTimeMs: 0, processTimeMs: 0
-    All queries together required ≈1 ms (1ms accuracy, total 2 ms)
+    All queries together required ≈2 ms (1ms accuracy, total 3 ms)
     ```
     
     
@@ -80,13 +80,13 @@ It offers a wide variety of features, for example:
     
     _Results (prettified and summarized):_
     
-    Query: **linter** (2 ms)\
+    Query: **linter** (3 ms)\
        ╰ **Deprecated Functions** (deprecated-functions):\
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 1, processTimeMs: 0</code>\
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 0, processTimeMs: 0</code>\
     &nbsp;&nbsp;&nbsp;╰ **File Path Validity** (file-path-validity):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ certain:\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ Path `/root/x.txt` at 1.1-23\
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalReads: 1, totalUnknown: 0, totalWritesBeforeAlways: 0, totalValid: 0, searchTimeMs: 0, processTimeMs: 0</code>\
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalReads: 1, totalUnknown: 0, totalWritesBeforeAlways: 0, totalValid: 0, searchTimeMs: 1, processTimeMs: 0</code>\
     &nbsp;&nbsp;&nbsp;╰ **Seeded Randomness** (seeded-randomness):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>consumerCalls: 0, callsWithFunctionProducers: 0, callsWithAssignmentProducers: 0, callsWithNonConstantProducers: 0, callsWithOtherBranchProducers: 0, searchTimeMs: 0, processTimeMs: 0</code>\
     &nbsp;&nbsp;&nbsp;╰ **Absolute Paths** (absolute-file-paths):\
@@ -100,16 +100,16 @@ It offers a wide variety of features, for example:
     &nbsp;&nbsp;&nbsp;╰ **Network Functions** (network-functions):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 0, processTimeMs: 0</code>\
     &nbsp;&nbsp;&nbsp;╰ **Dataframe Access Validation** (dataframe-access-validation):\
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>numOperations: 0, numAccesses: 0, totalAccessed: 0, searchTimeMs: 0, processTimeMs: 0</code>\
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>numOperations: 0, numAccesses: 0, totalAccessed: 0, searchTimeMs: 0, processTimeMs: 1</code>\
     &nbsp;&nbsp;&nbsp;╰ **Dead Code** (dead-code):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>consideredNodes: 5, searchTimeMs: 0, processTimeMs: 0</code>\
     &nbsp;&nbsp;&nbsp;╰ **Useless Loops** (useless-loop):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>numOfUselessLoops: 0, searchTimeMs: 0, processTimeMs: 0</code>\
-    _All queries together required ≈2 ms (1ms accuracy, total 2 ms)_
+    _All queries together required ≈3 ms (1ms accuracy, total 3 ms)_
     
     <details> <summary style="color:gray">Show Detailed Results as Json</summary>
     
-    The analysis required _2.5 ms_ (including parsing and normalization and the query) within the generation environment.
+    The analysis required _3.3 ms_ (including parsing and normalization and the query) within the generation environment.
     
     In general, the JSON contains the Ids of the nodes in question as they are present in the normalized AST or the dataflow graph of flowR.
     Please consult the [Interface](https://github.com/flowr-analysis/flowr/wiki/Interface) wiki page for more information on how to get those.
@@ -126,7 +126,7 @@ It offers a wide variety of features, for example:
             ".meta": {
               "totalCalls": 0,
               "totalFunctionDefinitions": 0,
-              "searchTimeMs": 1,
+              "searchTimeMs": 0,
               "processTimeMs": 0
             }
           },
@@ -149,7 +149,7 @@ It offers a wide variety of features, for example:
               "totalUnknown": 0,
               "totalWritesBeforeAlways": 0,
               "totalValid": 0,
-              "searchTimeMs": 0,
+              "searchTimeMs": 1,
               "processTimeMs": 0
             }
           },
@@ -218,7 +218,7 @@ It offers a wide variety of features, for example:
               "numAccesses": 0,
               "totalAccessed": 0,
               "searchTimeMs": 0,
-              "processTimeMs": 0
+              "processTimeMs": 1
             }
           },
           "dead-code": {
@@ -239,11 +239,11 @@ It offers a wide variety of features, for example:
           }
         },
         ".meta": {
-          "timing": 2
+          "timing": 3
         }
       },
       ".meta": {
-        "timing": 2
+        "timing": 3
       }
     }
     ```
@@ -308,7 +308,7 @@ It offers a wide variety of features, for example:
     
     ```shell
     $ docker run -it --rm eagleoutice/flowr # or npm run flowr 
-    flowR repl using flowR v2.9.6, R grammar v14 (tree-sitter engine)
+    flowR repl using flowR v2.9.7, R grammar v14 (tree-sitter engine)
     R> :query @static-slice (11@sum) file://test/testfiles/example.R
     ```
     
@@ -356,7 +356,7 @@ It offers a wide variety of features, for example:
          
 
 * 🚀 **fast call-graph, data-, and control-flow graphs**\
-  Within just [<i><span title="This measurement is automatically fetched from the latest benchmark!">116.7 ms</span></i> (as of Feb 5, 2026)](https://flowr-analysis.github.io/flowr/wiki/stats/benchmark), 
+  Within just [<i><span title="This measurement is automatically fetched from the latest benchmark!">111.7 ms</span></i> (as of Feb 7, 2026)](https://flowr-analysis.github.io/flowr/wiki/stats/benchmark), 
   _flowR_ can analyze the data- and control-flow of the average real-world R&nbsp;script. See the [benchmarks](https://flowr-analysis.github.io/flowr/wiki/stats/benchmark) for more information,
   and consult the [wiki pages](https://github.com/flowr-analysis/flowr/wiki/wiki/dataflow-graph) for more details on the [dataflow graphs](https://github.com/flowr-analysis/flowr/wiki/wiki/dataflow-graph) as well as [call graphs](https://github.com/flowr-analysis/flowr/wiki/wiki/dataflow-graph#perspectives-cg).
 
@@ -392,7 +392,7 @@ It offers a wide variety of features, for example:
     
     ```shell
     $ docker run -it --rm eagleoutice/flowr # or npm run flowr 
-    flowR repl using flowR v2.9.6, R grammar v14 (tree-sitter engine)
+    flowR repl using flowR v2.9.7, R grammar v14 (tree-sitter engine)
     R> :dataflow* test/testfiles/example.R
     ```
     
@@ -697,7 +697,7 @@ It offers a wide variety of features, for example:
     ```
     
     	
-    (The analysis required _1.9 ms_ (including parse and normalize, using the [tree-sitter](https://github.com/flowr-analysis/flowr/wiki/Engines) engine) within the generation environment.)
+    (The analysis required _1.8 ms_ (including parse and normalize, using the [tree-sitter](https://github.com/flowr-analysis/flowr/wiki/Engines) engine) within the generation environment.)
     
     
     

package/abstract-interpretation/absint-visitor.d.ts

@@ -1,4 +1,5 @@
-import type { CfgSimpleVertex, ControlFlowInformation } from '../control-flow/control-flow-graph';
+import type { ControlFlowInformation } from '../control-flow/control-flow-graph';
+import { CfgVertex } from '../control-flow/control-flow-graph';
 import type { SemanticCfgGuidedVisitorConfiguration } from '../control-flow/semantic-cfg-guided-visitor';
 import { SemanticCfgGuidedVisitor } from '../control-flow/semantic-cfg-guided-visitor';
 import { BuiltInProcName } from '../dataflow/environments/built-in';
@@ -98,15 +99,15 @@ export declare abstract class AbstractInterpretationVisitor<Domain extends AnyAb
      * Checks whether to continue visiting the control flow graph after a widening point.
      * By default, we only continue visiting if the widening point is visited for the first time or the abstract state at the widening point changed.
      */
-    protected shouldContinueVisiting(wideningPoint: CfgSimpleVertex, oldState: StateAbstractDomain<Domain>): boolean;
+    protected shouldContinueVisiting(wideningPoint: CfgVertex, oldState: StateAbstractDomain<Domain>): boolean;
     /**
      * Checks whether a control flow graph vertex should be skipped during visitation.
      * By default, we only process vertices of leaf nodes and exit vertices (no entry nodes of complex nodes).
      */
-    protected shouldSkipVertex(vertex: CfgSimpleVertex): boolean;
+    protected shouldSkipVertex(vertex: CfgVertex): boolean;
     /**
      * Whether widening should be performed at a widening point.
      * By default, we perform widening when the number of visitation of the widening point reaches the widening threshold of the config.
      */
-    protected shouldWiden(wideningPoint: CfgSimpleVertex): boolean;
+    protected shouldWiden(wideningPoint: CfgVertex): boolean;
 }

package/abstract-interpretation/absint-visitor.js

@@ -100,7 +100,7 @@ class AbstractInterpretationVisitor extends semantic_cfg_guided_visitor_1.Semant
      */
     getEndState() {
         const exitPoints = this.config.controlFlow.exitPoints.map(id => this.getCfgVertex(id)).filter(assert_1.isNotUndefined);
-        const exitNodes = exitPoints.map(vertex => (0, control_flow_graph_1.getVertexRootId)(vertex)).filter(assert_1.isNotUndefined);
+        const exitNodes = exitPoints.map(vertex => control_flow_graph_1.CfgVertex.getRootId(vertex)).filter(assert_1.isNotUndefined);
         const states = exitNodes.map(node => this.getAbstractState(node)).filter(assert_1.isNotUndefined);
         return this.config.domain.bottom().joinAll(states);
     }
@@ -121,14 +121,14 @@ class AbstractInterpretationVisitor extends semantic_cfg_guided_visitor_1.Semant
         if (vertex === undefined) {
             return true;
         }
-        const nodeId = (0, control_flow_graph_1.getVertexRootId)(vertex);
+        const nodeId = control_flow_graph_1.CfgVertex.getRootId(vertex);
         if (this.isWideningPoint(nodeId)) {
             // only check widening points at the entry vertex
-            if (vertex.type === control_flow_graph_1.CfgVertexType.EndMarker) {
+            if (control_flow_graph_1.CfgVertex.isMarker(vertex)) {
                 return true;
             }
             const oldState = this.getAbstractState(nodeId) ?? this.config.domain.bottom();
-            const predecessorDomains = this.getPredecessorNodes(vertex.id).map(pred => this.getAbstractState(pred)).filter(assert_1.isNotUndefined);
+            const predecessorDomains = this.getPredecessorNodes(control_flow_graph_1.CfgVertex.getId(vertex)).map(pred => this.getAbstractState(pred)).filter(assert_1.isNotUndefined);
             this.currentState = this.config.domain.bottom().joinAll(predecessorDomains);
             if (this.shouldWiden(vertex)) {
                 this.currentState = oldState.widen(this.currentState);
@@ -139,7 +139,7 @@ class AbstractInterpretationVisitor extends semantic_cfg_guided_visitor_1.Semant
         else if (this.shouldSkipVertex(vertex)) {
             return true;
         }
-        const predecessorDomains = this.getPredecessorNodes(vertex.id).map(pred => this.getAbstractState(pred)).filter(assert_1.isNotUndefined);
+        const predecessorDomains = this.getPredecessorNodes(control_flow_graph_1.CfgVertex.getId(vertex)).map(pred => this.getAbstractState(pred)).filter(assert_1.isNotUndefined);
         this.currentState = this.config.domain.bottom().joinAll(predecessorDomains);
         this.onVisitNode(vertexId);
         // discard the inferred abstract state when encountering functions with unknown side effects (e.g. `eval`)
@@ -211,10 +211,10 @@ class AbstractInterpretationVisitor extends semantic_cfg_guided_visitor_1.Semant
                 return [];
             }
             else if (this.shouldSkipVertex(vertex)) {
-                return this.getPredecessorNodes(vertex.id);
+                return this.getPredecessorNodes(control_flow_graph_1.CfgVertex.getId(vertex));
             }
             else {
-                return [(0, control_flow_graph_1.getVertexRootId)(vertex)];
+                return [control_flow_graph_1.CfgVertex.getRootId(vertex)];
             }
         })
             .toArray() ?? [];
@@ -248,8 +248,9 @@ class AbstractInterpretationVisitor extends semantic_cfg_guided_visitor_1.Semant
      * By default, we only continue visiting if the widening point is visited for the first time or the abstract state at the widening point changed.
      */
     shouldContinueVisiting(wideningPoint, oldState) {
-        const visitedCount = this.visited.get(wideningPoint.id) ?? 0;
-        this.visited.set(wideningPoint.id, visitedCount + 1);
+        const wid = control_flow_graph_1.CfgVertex.getId(wideningPoint);
+        const visitedCount = this.visited.get(wid) ?? 0;
+        this.visited.set(wid, visitedCount + 1);
         return visitedCount === 0 || !oldState.equals(this.currentState);
     }
     /**
@@ -257,14 +258,14 @@ class AbstractInterpretationVisitor extends semantic_cfg_guided_visitor_1.Semant
      * By default, we only process vertices of leaf nodes and exit vertices (no entry nodes of complex nodes).
      */
     shouldSkipVertex(vertex) {
-        return vertex.type !== control_flow_graph_1.CfgVertexType.EndMarker && vertex.end !== undefined;
+        return !control_flow_graph_1.CfgVertex.isMarker(vertex) && !control_flow_graph_1.CfgVertex.isBlock(vertex) && control_flow_graph_1.CfgVertex.getEnd(vertex) !== undefined;
     }
     /**
      * Whether widening should be performed at a widening point.
      * By default, we perform widening when the number of visitation of the widening point reaches the widening threshold of the config.
      */
     shouldWiden(wideningPoint) {
-        return (this.visited.get(wideningPoint.id) ?? 0) >= this.config.ctx.config.abstractInterpretation.wideningThreshold;
+        return (this.visited.get(control_flow_graph_1.CfgVertex.getId(wideningPoint)) ?? 0) >= this.config.ctx.config.abstractInterpretation.wideningThreshold;
     }
 }
 exports.AbstractInterpretationVisitor = AbstractInterpretationVisitor;

package/control-flow/basic-cfg-guided-visitor.d.ts

@@ -1,4 +1,4 @@
-import { type CfgBasicBlockVertex, type CfgEndMarkerVertex, type CfgExpressionVertex, type CfgSimpleVertex, type CfgStatementVertex, type ControlFlowInformation } from './control-flow-graph';
+import { type CfgBasicBlockVertex, type CfgMarkerVertex, type CfgExpressionVertex, CfgVertex, type CfgStatementVertex, type ControlFlowInformation } from './control-flow-graph';
 import type { NodeId } from '../r-bridge/lang-4.x/ast/model/processing/node-id';
 export interface BasicCfgGuidedVisitorConfiguration<ControlFlow extends ControlFlowInformation = ControlFlowInformation> {
     readonly controlFlow: ControlFlow;
@@ -28,10 +28,10 @@ export declare class BasicCfgGuidedVisitor<ControlFlow extends ControlFlowInform
     /**
      * Get the control flow vertex for the given node id or fail if it does not exist.
      */
-    protected getCfgVertex(id: NodeId): CfgSimpleVertex | undefined;
+    protected getCfgVertex(id: NodeId): CfgVertex | undefined;
     protected onVisitNode(node: NodeId): void;
     protected onBasicBlockNode(node: CfgBasicBlockVertex): void;
     protected onStatementNode(_node: CfgStatementVertex): void;
     protected onExpressionNode(_node: CfgExpressionVertex): void;
-    protected onEndMarkerNode(_node: CfgEndMarkerVertex): void;
+    protected onEndMarkerNode(_node: CfgMarkerVertex): void;
 }

package/control-flow/basic-cfg-guided-visitor.js

@@ -66,7 +66,7 @@ class BasicCfgGuidedVisitor {
         if (vertex === undefined) {
             return;
         }
-        const type = vertex.type;
+        const type = control_flow_graph_1.CfgVertex.getType(vertex);
         switch (type) {
             case control_flow_graph_1.CfgVertexType.Statement:
                 this.onStatementNode(vertex);
@@ -74,7 +74,7 @@ class BasicCfgGuidedVisitor {
             case control_flow_graph_1.CfgVertexType.Expression:
                 this.onExpressionNode(vertex);
                 break;
-            case control_flow_graph_1.CfgVertexType.EndMarker:
+            case control_flow_graph_1.CfgVertexType.Marker:
                 this.onEndMarkerNode(vertex);
                 break;
             case control_flow_graph_1.CfgVertexType.Block:
@@ -85,14 +85,15 @@ class BasicCfgGuidedVisitor {
         }
     }
     onBasicBlockNode(node) {
+        const elems = control_flow_graph_1.CfgVertex.getBasicBlockElements(node);
         if (this.config.defaultVisitingOrder === 'forward') {
-            for (const elem of node.elems.toReversed()) {
-                this.visitNode(elem.id);
+            for (const elem of elems.toReversed()) {
+                this.visitNode(control_flow_graph_1.CfgVertex.getId(elem));
             }
         }
         else {
-            for (const elem of node.elems) {
-                this.visitNode(elem.id);
+            for (const elem of elems) {
+                this.visitNode(control_flow_graph_1.CfgVertex.getId(elem));
             }
         }
     }

package/control-flow/cfg-dead-code.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cfgAnalyzeDeadCode = cfgAnalyzeDeadCode;
+const control_flow_graph_1 = require("./control-flow-graph");
 const logic_1 = require("../util/logic");
 const semantic_cfg_guided_visitor_1 = require("./semantic-cfg-guided-visitor");
 const alias_tracking_1 = require("../dataflow/eval/resolve/alias-tracking");
@@ -9,6 +10,7 @@ const r_function_call_1 = require("../r-bridge/lang-4.x/ast/model/nodes/r-functi
 const general_1 = require("../dataflow/eval/values/general");
 const r_value_1 = require("../dataflow/eval/values/r-value");
 const simple_visitor_1 = require("./simple-visitor");
+const convert_values_1 = require("../r-bridge/lang-4.x/convert-values");
 class CfgConditionalDeadCodeRemoval extends semantic_cfg_guided_visitor_1.SemanticCfgGuidedVisitor {
     cachedConditions = new Map();
     cachedStatements = new Map();
@@ -43,20 +45,21 @@ class CfgConditionalDeadCodeRemoval extends semantic_cfg_guided_visitor_1.Semant
         const cfg = this.config.controlFlow.graph;
         for (const [from, targets] of cfg.edges()) {
             for (const [target, edge] of targets) {
-                if (edge.label === 1 /* CfgEdgeType.Cd */) {
-                    const og = this.getValue(edge.caused);
-                    if (og === logic_1.Ternary.Always && edge.when === 'FALSE') {
+                if (control_flow_graph_1.CfgEdge.isControlDependency(edge)) {
+                    const og = this.getValue(control_flow_graph_1.CfgEdge.unpackCause(edge));
+                    const w = control_flow_graph_1.CfgEdge.unpackWhen(edge);
+                    if (og === logic_1.Ternary.Always && w === convert_values_1.RFalse) {
                         cfg.removeEdge(from, target);
                     }
-                    else if (og === logic_1.Ternary.Never && edge.when === 'TRUE') {
+                    else if (og === logic_1.Ternary.Never && w === convert_values_1.RTrue) {
                         cfg.removeEdge(from, target);
                     }
                 }
-                else if (edge.label === 0 /* CfgEdgeType.Fd */ && this.isUnconditionalJump(target)) {
+                else if (control_flow_graph_1.CfgEdge.isFlowDependency(edge) && this.isUnconditionalJump(target)) {
                     // for each unconditional jump, we find the corresponding end/exit nodes and remove any flow edges
-                    for (const end of this.getCfgVertex(target)?.end ?? []) {
+                    for (const end of control_flow_graph_1.CfgVertex.getEnd(this.getCfgVertex(target)) ?? []) {
                         for (const [target, edge] of cfg.ingoingEdges(end) ?? []) {
-                            if (edge.label === 0 /* CfgEdgeType.Fd */) {
+                            if (control_flow_graph_1.CfgEdge.isFlowDependency(edge)) {
                                 cfg.removeEdge(target, end);
                             }
                         }
@@ -132,8 +135,8 @@ class CfgConditionalDeadCodeRemoval extends semantic_cfg_guided_visitor_1.Semant
         if (!body) {
             return;
         }
-        (0, simple_visitor_1.visitCfgInOrder)(this.config.controlFlow.graph, [body.id], n => {
-            if (body.end?.includes(n)) {
+        (0, simple_visitor_1.visitCfgInOrder)(this.config.controlFlow.graph, [control_flow_graph_1.CfgVertex.getId(body)], n => {
+            if (control_flow_graph_1.CfgVertex.getEnd(body)?.includes(n)) {
                 return true;
             }
             this.inTry.add(n);

package/control-flow/cfg-properties.d.ts

@@ -7,8 +7,8 @@ declare const CfgProperties: {
     readonly 'has-entry-and-exit': typeof hasEntryAndExit;
     readonly 'entry-reaches-all': typeof checkEntryReachesAll;
     readonly 'exit-reaches-all': typeof checkExitIsReachedByAll;
-    readonly 'no-direct-fd-cycles': (c: ControlFlowInformation<import("./control-flow-graph").CfgSimpleVertex>) => boolean;
-    readonly 'no-direct-cd-cycles': (c: ControlFlowInformation<import("./control-flow-graph").CfgSimpleVertex>) => boolean;
+    readonly 'no-direct-fd-cycles': (c: ControlFlowInformation<import("./control-flow-graph").CfgVertex>) => boolean;
+    readonly 'no-direct-cd-cycles': (c: ControlFlowInformation<import("./control-flow-graph").CfgVertex>) => boolean;
 };
 export type CfgProperty = keyof typeof CfgProperties;
 declare function checkSingleEntryAndExit(cfg: ControlFlowInformation): boolean;

package/control-flow/cfg-properties.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertCfgSatisfiesProperties = assertCfgSatisfiesProperties;
+const control_flow_graph_1 = require("./control-flow-graph");
 const set_1 = require("../util/collections/set");
 const log_1 = require("../util/log");
 const simple_visitor_1 = require("./simple-visitor");
@@ -56,7 +57,7 @@ function _checkFdIOCount(cfg, dir, type, limit) {
     for (const [from, targets] of cfg.graph.edges()) {
         for (const [to, edge] of targets) {
             const important = dir === 'in' ? to : from;
-            if (edge.label === 0 /* CfgEdgeType.Fd */) {
+            if (control_flow_graph_1.CfgEdge.isFlowDependency(edge)) {
                 counts.set(important, (counts.get(important) ?? 0) + 1);
             }
         }
@@ -76,7 +77,7 @@ function _checkFdIOCount(cfg, dir, type, limit) {
 function checkNoDirectCycles(cfg, type) {
     for (const [from, targets] of cfg.graph.edges()) {
         for (const [to, edge] of targets) {
-            if (edge.label === type && to === from) {
+            if (control_flow_graph_1.CfgEdge.isOfType(edge, type) && to === from) {
                 log_1.log.error(`Node ${from} has a direct cycle with ${to}`);
                 return false;
             }

package/control-flow/cfg-to-basic-blocks.js

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertCfgToBasicBlocks = convertCfgToBasicBlocks;
 const control_flow_graph_1 = require("./control-flow-graph");
+const assert_1 = require("../util/assert");
 /** if true, return the target */
 function singleOutgoingFd(outgoing) {
     if (!outgoing || outgoing.size !== 1) {
         return undefined;
     }
     const next = outgoing.entries().next().value;
-    if (next?.[1].label === 0 /* CfgEdgeType.Fd */) {
+    if (control_flow_graph_1.CfgEdge.isFlowDependency(next?.[1])) {
         return next[0];
     }
     else {
@@ -24,7 +25,7 @@ function convertCfgToBasicBlocks(cfInfo) {
         return cfInfo;
     }
     for (const [id, vtx] of newCfg.vertices(false)) {
-        if (vtx.type !== control_flow_graph_1.CfgVertexType.Block) {
+        if (!control_flow_graph_1.CfgVertex.isBlock(vtx)) {
             continue;
         }
         const outgoing = newCfg.outgoingEdges(id);
@@ -44,9 +45,9 @@ function convertCfgToBasicBlocks(cfInfo) {
             }
         }
     }
-    const findEntries = cfInfo.entryPoints.map(e => newCfg.getBasicBlock(e)?.id);
-    const findExits = cfInfo.exitPoints.map(e => newCfg.getBasicBlock(e)?.id);
-    if (findEntries.some(f => f === undefined) || findExits.some(f => f === undefined)) {
+    const findEntries = cfInfo.entryPoints.map(e => control_flow_graph_1.CfgVertex.getId(newCfg.getBasicBlock(e)));
+    const findExits = cfInfo.exitPoints.map(e => control_flow_graph_1.CfgVertex.getId(newCfg.getBasicBlock(e)));
+    if (findEntries.some(assert_1.isUndefined) || findExits.some(assert_1.isUndefined)) {
         /* something went wrong */
         return cfInfo;
     }
@@ -61,19 +62,15 @@ function convertCfgToBasicBlocks(cfInfo) {
 function wrapEveryVertexInBasicBlock(existing) {
     const newGraph = new control_flow_graph_1.ControlFlowGraph();
     for (const [id, vertex] of existing.vertices(false)) {
-        if (vertex.type === control_flow_graph_1.CfgVertexType.Block) {
+        if (control_flow_graph_1.CfgVertex.isBlock(vertex)) {
             return undefined;
         }
-        newGraph.addVertex({
-            type: control_flow_graph_1.CfgVertexType.Block,
-            elems: [vertex],
-            id: 'bb-' + id,
-        });
+        newGraph.addVertex(control_flow_graph_1.CfgVertex.makeBlock(control_flow_graph_1.CfgVertex.toBasicBlockId(id), [vertex]));
     }
     // promote all edges
     for (const [from, outgoing] of existing.edges().entries()) {
         for (const [to, edge] of outgoing.entries()) {
-            newGraph.addEdge('bb-' + from, 'bb-' + to, edge);
+            newGraph.addEdge(control_flow_graph_1.CfgVertex.toBasicBlockId(from), control_flow_graph_1.CfgVertex.toBasicBlockId(to), edge);
         }
     }
     return newGraph;