@eagleoutice/flowr 2.9.7 → 2.9.9

package/control-flow/dfg-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';
 import { type DataflowGraphVertexArgument, type DataflowGraphVertexFunctionCall, type DataflowGraphVertexFunctionDefinition, type DataflowGraphVertexUse, type DataflowGraphVertexValue, type DataflowGraphVertexVariableDefinition } from '../dataflow/graph/vertex';
 import { type BasicCfgGuidedVisitorConfiguration, BasicCfgGuidedVisitor } from './basic-cfg-guided-visitor';
@@ -19,12 +19,12 @@ export declare class DataflowAwareCfgGuidedVisitor<ControlFlow extends ControlFl
     protected getDataflowGraph(id: NodeId): DataflowGraphVertexArgument | undefined;
     protected onStatementNode(node: CfgStatementVertex): void;
     protected onExpressionNode(node: CfgExpressionVertex): void;
-    protected onEndMarkerNode(node: CfgEndMarkerVertex): void;
-    protected visitDataflowNode(node: Exclude<CfgSimpleVertex, CfgBasicBlockVertex>): void;
+    protected onEndMarkerNode(node: CfgMarkerVertex): void;
+    protected visitDataflowNode(node: Exclude<CfgVertex, CfgBasicBlockVertex>): void;
     /**
      * called for every cfg vertex that has no corresponding dataflow vertex.
      */
-    protected visitUnknown(_vertex: Exclude<CfgSimpleVertex, CfgBasicBlockVertex>): void;
+    protected visitUnknown(_vertex: Exclude<CfgVertex, CfgBasicBlockVertex>): void;
     protected visitValue(_val: DataflowGraphVertexValue): void;
     protected visitVariableUse(_use: DataflowGraphVertexUse): void;
     protected visitVariableDefinition(_def: DataflowGraphVertexVariableDefinition): void;

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

@@ -19,13 +19,13 @@ class DataflowAwareCfgGuidedVisitor extends basic_cfg_guided_visitor_1.BasicCfgG
     }
     onStatementNode(node) {
         super.onStatementNode(node);
-        if (this.config.defaultVisitingType !== 'exit' || node.end === undefined) {
+        if (this.config.defaultVisitingType !== 'exit' || control_flow_graph_1.CfgVertex.getEnd(node) === undefined) {
             this.visitDataflowNode(node);
         }
     }
     onExpressionNode(node) {
         super.onExpressionNode(node);
-        if (this.config.defaultVisitingType !== 'exit' || node.end === undefined) {
+        if (this.config.defaultVisitingType !== 'exit' || control_flow_graph_1.CfgVertex.getEnd(node) === undefined) {
             this.visitDataflowNode(node);
         }
     }
@@ -36,7 +36,7 @@ class DataflowAwareCfgGuidedVisitor extends basic_cfg_guided_visitor_1.BasicCfgG
         }
     }
     visitDataflowNode(node) {
-        const dfgVertex = this.getDataflowGraph((0, control_flow_graph_1.getVertexRootId)(node));
+        const dfgVertex = this.getDataflowGraph(control_flow_graph_1.CfgVertex.getRootId(node));
         if (!dfgVertex) {
             this.visitUnknown(node);
             return;

package/control-flow/diff-cfg.js

@@ -31,8 +31,8 @@ function diffRootVertices(ctx) {
     });
 }
 function diffVertices(ctx) {
-    const lVert = [...ctx.left.vertices(false)].map(([id, info]) => [id, info]);
-    const rVert = [...ctx.right.vertices(false)].map(([id, info]) => [id, info]);
+    const lVert = ctx.left.vertices(false).entries().map(([id, info]) => [id, info]).toArray();
+    const rVert = ctx.right.vertices(false).entries().map(([id, info]) => [id, info]).toArray();
     if (lVert.length < rVert.length && !ctx.config.leftIsSubgraph
         || lVert.length > rVert.length && !ctx.config.rightIsSubgraph) {
         ctx.report.addComment(`Detected different number of vertices! ${ctx.leftname} has ${lVert.length}, ${ctx.rightname} has ${rVert.length}`);
@@ -45,48 +45,48 @@ function diffVertices(ctx) {
             }
             continue;
         }
-        if (lInfo.type !== rInfo.type) {
-            ctx.report.addComment(`Vertex ${id} differs in tags. ${ctx.leftname}: ${lInfo.type} vs. ${ctx.rightname}: ${rInfo.type}`, {
+        const lType = control_flow_graph_1.CfgVertex.getType(lInfo);
+        const rType = control_flow_graph_1.CfgVertex.getType(rInfo);
+        if (lType !== rType) {
+            ctx.report.addComment(`Vertex ${id} differs in tags. ${ctx.leftname}: ${control_flow_graph_1.CfgVertex.typeToString(lType)} vs. ${ctx.rightname}: ${control_flow_graph_1.CfgVertex.typeToString(rType)}`, {
                 tag: 'vertex',
                 id
             });
         }
-        if (lInfo.kind !== undefined || rInfo.kind !== undefined) {
-            if (lInfo.kind !== rInfo.kind) {
-                ctx.report.addComment(`Vertex ${id} differs in kinds. ${ctx.leftname}: ${String(lInfo.kind)} vs ${ctx.rightname}: ${String(rInfo.kind)}`, {
-                    tag: 'vertex',
-                    id
-                });
-            }
-        }
-        if (lInfo.callTargets !== undefined || rInfo.callTargets !== undefined) {
-            (0, diff_1.setDifference)(new Set(lInfo.callTargets ?? []), new Set(rInfo.callTargets ?? []), {
+        const lCt = control_flow_graph_1.CfgVertex.getCallTargets(lInfo);
+        const rCt = control_flow_graph_1.CfgVertex.getCallTargets(rInfo);
+        if (lCt !== undefined || rCt !== undefined) {
+            (0, diff_1.setDifference)(new Set(lCt ?? []), new Set(rCt ?? []), {
                 ...ctx,
                 position: `${ctx.position}Vertex ${id} differs in call targets. `
             });
         }
-        if (lInfo.elems !== undefined || rInfo.elems !== undefined) {
-            if (!(0, arrays_1.arrayEqual)((lInfo.elems ?? []), (rInfo.elems ?? []), control_flow_graph_1.equalVertex)) {
-                ctx.report.addComment(`Vertex ${id} differs in elems.\n  ${ctx.leftname}: ${JSON.stringify(lInfo.elems)}\n  vs\n  ${ctx.rightname}: ${JSON.stringify(rInfo.elems)}`, { tag: 'vertex', id });
+        const lElems = control_flow_graph_1.CfgVertex.isBlock(lInfo) ? control_flow_graph_1.CfgVertex.getBasicBlockElements(lInfo) : undefined;
+        const rElems = control_flow_graph_1.CfgVertex.isBlock(rInfo) ? control_flow_graph_1.CfgVertex.getBasicBlockElements(rInfo) : undefined;
+        if (lElems !== undefined || rElems !== undefined) {
+            if (!(0, arrays_1.arrayEqual)((lElems ?? []), (rElems ?? []), control_flow_graph_1.CfgVertex.equal)) {
+                ctx.report.addComment(`Vertex ${id} differs in elems.\n  ${ctx.leftname}: ${JSON.stringify(lElems)}\n  vs\n  ${ctx.rightname}: ${JSON.stringify(rElems)}`, { tag: 'vertex', id });
             }
         }
-        (0, diff_1.setDifference)(new Set(lInfo.mid ?? []), new Set(rInfo.mid ?? []), {
+        (0, diff_1.setDifference)(new Set(control_flow_graph_1.CfgVertex.getMid(lInfo) ?? []), new Set(control_flow_graph_1.CfgVertex.getMid(rInfo) ?? []), {
             ...ctx,
             position: `${ctx.position}Vertex ${id} differs in attached mid markers. `
         });
-        (0, diff_1.setDifference)(new Set(lInfo.end ?? []), new Set(rInfo.end ?? []), {
+        (0, diff_1.setDifference)(new Set(control_flow_graph_1.CfgVertex.getEnd(lInfo) ?? []), new Set(control_flow_graph_1.CfgVertex.getEnd(rInfo) ?? []), {
             ...ctx,
             position: `${ctx.position}Vertex ${id} differs in attached end markers. `
         });
-        if (lInfo.root !== rInfo.root) {
-            ctx.report.addComment(`Vertex ${id} differs in root. ${ctx.leftname}: ${JSON.stringify(lInfo.root)} vs ${ctx.rightname}: ${JSON.stringify(rInfo.root)}`, {
+        const lRoot = control_flow_graph_1.CfgVertex.getRootId(lInfo);
+        const rRoot = control_flow_graph_1.CfgVertex.getRootId(rInfo);
+        if (lRoot !== rRoot) {
+            ctx.report.addComment(`Vertex ${id} differs in root. ${ctx.leftname}: ${JSON.stringify(lRoot)} vs ${ctx.rightname}: ${JSON.stringify(rRoot)}`, {
                 tag: 'vertex',
                 id
             });
         }
-        (0, diff_1.setDifference)(new Set(lInfo.children), new Set(rInfo.children), {
+        (0, diff_1.setDifference)(new Set(control_flow_graph_1.CfgVertex.getChildren(lInfo)), new Set(control_flow_graph_1.CfgVertex.getChildren(rInfo)), {
             ...ctx,
-            position: `${ctx.position}Vertex ${id} differs in chilren. `
+            position: `${ctx.position}Vertex ${id} differs in children. `
         });
     }
 }
@@ -123,14 +123,20 @@ function diffOutgoingEdges(ctx) {
     }
 }
 function diffEdge(edge, otherEdge, ctx, id, target) {
-    if (edge.label !== otherEdge.label) {
-        ctx.report.addComment(`Edge ${id}->${target} differs in labels. ${ctx.leftname}: ${edge.label} vs ${ctx.rightname}: ${otherEdge.label}`, { tag: 'edge', from: id, to: target });
+    const el = control_flow_graph_1.CfgEdge.getType(edge);
+    const ol = control_flow_graph_1.CfgEdge.getType(otherEdge);
+    if (el !== ol) {
+        ctx.report.addComment(`Edge ${id}->${target} differs in labels. ${ctx.leftname}: ${el} vs ${ctx.rightname}: ${ol}`, { tag: 'edge', from: id, to: target });
     }
-    if (edge.caused !== otherEdge.caused) {
-        ctx.report.addComment(`Edge ${id}->${target} differs in caused. ${ctx.leftname}: ${JSON.stringify(edge.caused)} vs ${ctx.rightname}: ${JSON.stringify(otherEdge.caused)}`, { tag: 'edge', from: id, to: target });
+    const ec = control_flow_graph_1.CfgEdge.getCause(edge);
+    const oc = control_flow_graph_1.CfgEdge.getCause(otherEdge);
+    if (ec !== oc) {
+        ctx.report.addComment(`Edge ${id}->${target} differs in caused. ${ctx.leftname}: ${JSON.stringify(ec)} vs ${ctx.rightname}: ${JSON.stringify(oc)}`, { tag: 'edge', from: id, to: target });
     }
-    if (edge.when !== otherEdge.when) {
-        ctx.report.addComment(`Edge ${id}->${target} differs in when. ${ctx.leftname}: ${JSON.stringify(edge.when)} vs ${ctx.rightname}: ${JSON.stringify(otherEdge.when)}`, { tag: 'edge', from: id, to: target });
+    const ew = control_flow_graph_1.CfgEdge.getWhen(edge);
+    const ow = control_flow_graph_1.CfgEdge.getWhen(otherEdge);
+    if (ew !== ow) {
+        ctx.report.addComment(`Edge ${id}->${target} differs in when. ${ctx.leftname}: ${JSON.stringify(ew)} vs ${ctx.rightname}: ${JSON.stringify(ow)}`, { tag: 'edge', from: id, to: target });
     }
 }
 function diffEdges(ctx, id, lEdges, rEdges) {

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

@@ -3,7 +3,7 @@ import type { NodeId } from '../r-bridge/lang-4.x/ast/model/processing/node-id';
 import type { NormalizedAst, ParentInformation } from '../r-bridge/lang-4.x/ast/model/processing/decorate';
 import type { DataflowGraph } from '../dataflow/graph/graph';
 import type { DataflowGraphVertexFunctionCall } from '../dataflow/graph/vertex';
-import { type ControlFlowInformation } from './control-flow-graph';
+import { CfgVertex, type ControlFlowInformation } from './control-flow-graph';
 import { type CfgSimplificationPassName } from './cfg-simplification';
 import type { ReadOnlyFlowrAnalyzerContext } from '../project/context/flowr-analyzer-context';
 /**
@@ -21,12 +21,12 @@ export declare function extractCfg<Info = ParentInformation>(ast: NormalizedAst<
 /**
  * A version of {@link extractCfg} that is much quicker and does not apply any simplifications or dataflow information.
  */
-export declare function extractCfgQuick<Info = ParentInformation>(ast: NormalizedAst<Info>): ControlFlowInformation<import("./control-flow-graph").CfgSimpleVertex>;
+export declare function extractCfgQuick<Info = ParentInformation>(ast: NormalizedAst<Info>): ControlFlowInformation<CfgVertex>;
 /**
  * Extracts all function call vertices from the given control flow information and dataflow graph.
  */
 export declare function getCallsInCfg(cfg: ControlFlowInformation, graph: DataflowGraph): Map<NodeId, Required<DataflowGraphVertexFunctionCall>>;
-export declare const ResolvedCallSuffix = "-resolved-call-exit";
+export declare const ResolvedCallSuffix: "-resolved-call-e";
 /**
  * Convert a cfg to RDF quads.
  * @see {@link df2quads}