@eagleoutice/flowr 2.9.13 → 2.9.14

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

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SemanticCfgGuidedVisitor = void 0;
 const control_flow_graph_1 = require("./control-flow-graph");
 const dfg_cfg_guided_visitor_1 = require("./dfg-cfg-guided-visitor");
-const dfg_get_origin_1 = require("../dataflow/origin/dfg-get-origin");
 const type_1 = require("../r-bridge/lang-4.x/ast/model/type");
 const edge_1 = require("../dataflow/graph/edge");
 const assert_1 = require("../util/assert");
-const built_in_1 = require("../dataflow/environments/built-in");
 const r_function_call_1 = require("../r-bridge/lang-4.x/ast/model/nodes/r-function-call");
 const convert_values_1 = require("../r-bridge/lang-4.x/convert-values");
+const df_helper_1 = require("../dataflow/graph/df-helper");
+const built_in_proc_name_1 = require("../dataflow/environments/built-in-proc-name");
 /**
  * This visitor extends on the {@link DataflowAwareCfgGuidedVisitor} by dispatching visitors for separate function calls as well,
  * providing more information!
@@ -117,7 +117,7 @@ class SemanticCfgGuidedVisitor extends dfg_cfg_guided_visitor_1.DataflowAwareCfg
      */
     visitFunctionCall(vertex) {
         super.visitFunctionCall(vertex);
-        if (vertex.origin === built_in_1.BuiltInProcName.Unnamed) {
+        if (vertex.origin === built_in_proc_name_1.BuiltInProcName.Unnamed) {
             this.onUnnamedCall({ call: vertex });
         }
         else {
@@ -160,17 +160,17 @@ class SemanticCfgGuidedVisitor extends dfg_cfg_guided_visitor_1.DataflowAwareCfg
      */
     onDispatchFunctionCallOrigin(call, origin) {
         switch (origin) {
-            case built_in_1.BuiltInProcName.Eval:
+            case built_in_proc_name_1.BuiltInProcName.Eval:
                 return this.onEvalFunctionCall({ call });
-            case built_in_1.BuiltInProcName.Apply:
+            case built_in_proc_name_1.BuiltInProcName.Apply:
                 return this.onApplyFunctionCall({ call });
-            case built_in_1.BuiltInProcName.ExpressionList:
+            case built_in_proc_name_1.BuiltInProcName.ExpressionList:
                 return this.onExpressionList({ call });
-            case built_in_1.BuiltInProcName.Source:
+            case built_in_proc_name_1.BuiltInProcName.Source:
                 return this.onSourceCall({ call });
-            case built_in_1.BuiltInProcName.Access:
+            case built_in_proc_name_1.BuiltInProcName.Access:
                 return this.onAccessCall({ call });
-            case built_in_1.BuiltInProcName.IfThenElse: {
+            case built_in_proc_name_1.BuiltInProcName.IfThenElse: {
                 // recover dead arguments from ast
                 const ast = this.getNormalizedAst(call.id);
                 if (!ast || ast.type !== type_1.RType.IfThenElse) {
@@ -190,24 +190,24 @@ class SemanticCfgGuidedVisitor extends dfg_cfg_guided_visitor_1.DataflowAwareCfg
                     });
                 }
             }
-            case built_in_1.BuiltInProcName.Get:
+            case built_in_proc_name_1.BuiltInProcName.Get:
                 return this.onGetCall({ call });
-            case built_in_1.BuiltInProcName.Rm:
+            case built_in_proc_name_1.BuiltInProcName.Rm:
                 return this.onRmCall({ call });
-            case built_in_1.BuiltInProcName.List:
+            case built_in_proc_name_1.BuiltInProcName.List:
                 return this.onListCall({ call });
-            case built_in_1.BuiltInProcName.Vector:
+            case built_in_proc_name_1.BuiltInProcName.Vector:
                 return this.onVectorCall({ call });
-            case built_in_1.BuiltInProcName.Assignment:
-            case built_in_1.BuiltInProcName.AssignmentLike:
-            case built_in_1.BuiltInProcName.TableAssignment: {
+            case built_in_proc_name_1.BuiltInProcName.Assignment:
+            case built_in_proc_name_1.BuiltInProcName.AssignmentLike:
+            case built_in_proc_name_1.BuiltInProcName.TableAssignment: {
                 const outgoing = this.config.dfg.outgoingEdges(call.id);
                 if (outgoing) {
                     const target = outgoing.entries().filter(([, e]) => edge_1.DfEdge.includesType(e, edge_1.EdgeType.Returns)).toArray();
                     if (target.length === 1) {
                         const targetOut = this.config.dfg.outgoingEdges(target[0][0]);
                         if (targetOut) {
-                            const source = [...targetOut.entries()].filter(([t, e]) => edge_1.DfEdge.includesType(e, edge_1.EdgeType.DefinedBy) && t !== call.id);
+                            const source = targetOut.entries().filter(([t, e]) => edge_1.DfEdge.includesType(e, edge_1.EdgeType.DefinedBy) && t !== call.id).toArray();
                             if (source.length === 1) {
                                 return this.onAssignmentCall({ call, target: target[0][0], source: source[0][0] });
                             }
@@ -216,25 +216,25 @@ class SemanticCfgGuidedVisitor extends dfg_cfg_guided_visitor_1.DataflowAwareCfg
                 }
                 return this.onAssignmentCall({ call, target: undefined, source: undefined });
             }
-            case built_in_1.BuiltInProcName.SpecialBinOp:
+            case built_in_proc_name_1.BuiltInProcName.SpecialBinOp:
                 if (call.args.length !== 2) {
                     return this.onSpecialBinaryOpCall({ call });
                 }
                 return this.onSpecialBinaryOpCall({ call, lhs: call.args[0], rhs: call.args[1] });
-            case built_in_1.BuiltInProcName.Pipe:
+            case built_in_proc_name_1.BuiltInProcName.Pipe:
                 if (call.args.length !== 2) {
                     return this.onPipeCall({ call });
                 }
                 return this.onPipeCall({ call, lhs: call.args[0], rhs: call.args[1] });
-            case built_in_1.BuiltInProcName.Quote:
+            case built_in_proc_name_1.BuiltInProcName.Quote:
                 return this.onQuoteCall({ call });
-            case built_in_1.BuiltInProcName.ForLoop:
+            case built_in_proc_name_1.BuiltInProcName.ForLoop:
                 return this.onForLoopCall({ call, variable: call.args[0], vector: call.args[1], body: call.args[2] });
-            case built_in_1.BuiltInProcName.RepeatLoop:
+            case built_in_proc_name_1.BuiltInProcName.RepeatLoop:
                 return this.onRepeatLoopCall({ call, body: call.args[0] });
-            case built_in_1.BuiltInProcName.WhileLoop:
+            case built_in_proc_name_1.BuiltInProcName.WhileLoop:
                 return this.onWhileLoopCall({ call, condition: call.args[0], body: call.args[1] });
-            case built_in_1.BuiltInProcName.Replacement: {
+            case built_in_proc_name_1.BuiltInProcName.Replacement: {
                 const outgoing = this.config.dfg.outgoingEdges(call.id);
                 if (outgoing) {
                     const target = outgoing.entries().filter(([, e]) => edge_1.DfEdge.includesType(e, edge_1.EdgeType.Returns)).toArray();
@@ -250,38 +250,38 @@ class SemanticCfgGuidedVisitor extends dfg_cfg_guided_visitor_1.DataflowAwareCfg
                 }
                 return this.onReplacementCall({ call, target: undefined, source: undefined });
             }
-            case built_in_1.BuiltInProcName.Library:
+            case built_in_proc_name_1.BuiltInProcName.Library:
                 return this.onLibraryCall({ call });
-            case built_in_1.BuiltInProcName.Try:
+            case built_in_proc_name_1.BuiltInProcName.Try:
                 return this.onTryCall({ call });
-            case built_in_1.BuiltInProcName.Stop:
+            case built_in_proc_name_1.BuiltInProcName.Stop:
                 return this.onStopCall({ call });
-            case built_in_1.BuiltInProcName.StopIfNot:
+            case built_in_proc_name_1.BuiltInProcName.StopIfNot:
                 return this.onStopIfNotCall({ call });
-            case built_in_1.BuiltInProcName.RegisterHook:
+            case built_in_proc_name_1.BuiltInProcName.RegisterHook:
                 return this.onRegisterHookCall({ call });
-            case built_in_1.BuiltInProcName.Local:
+            case built_in_proc_name_1.BuiltInProcName.Local:
                 return this.onLocalCall({ call });
-            case built_in_1.BuiltInProcName.S3Dispatch:
+            case built_in_proc_name_1.BuiltInProcName.S3Dispatch:
                 return this.onS3DispatchCall({ call });
-            case built_in_1.BuiltInProcName.S3DispatchNext:
+            case built_in_proc_name_1.BuiltInProcName.S3DispatchNext:
                 return this.onS3DispatchNextCall({ call });
-            case built_in_1.BuiltInProcName.S7NewGeneric:
+            case built_in_proc_name_1.BuiltInProcName.S7NewGeneric:
                 return this.onS7NewGenericCall({ call });
-            case built_in_1.BuiltInProcName.S7Dispatch:
+            case built_in_proc_name_1.BuiltInProcName.S7Dispatch:
                 return this.onS7DispatchCall({ call });
-            case built_in_1.BuiltInProcName.Break:
+            case built_in_proc_name_1.BuiltInProcName.Break:
                 return this.onBreakCall({ call });
-            case built_in_1.BuiltInProcName.Return:
+            case built_in_proc_name_1.BuiltInProcName.Return:
                 return this.onReturnCall({ call });
-            case built_in_1.BuiltInProcName.Unnamed:
+            case built_in_proc_name_1.BuiltInProcName.Unnamed:
                 return this.onUnnamedCall({ call });
-            case built_in_1.BuiltInProcName.Recall:
+            case built_in_proc_name_1.BuiltInProcName.Recall:
                 return this.onRecallCall({ call });
-            case built_in_1.BuiltInProcName.Default:
-            case built_in_1.BuiltInProcName.DefaultReadAllArgs:
-            case built_in_1.BuiltInProcName.Function:
-            case built_in_1.BuiltInProcName.FunctionDefinition:
+            case built_in_proc_name_1.BuiltInProcName.Default:
+            case built_in_proc_name_1.BuiltInProcName.DefaultReadAllArgs:
+            case built_in_proc_name_1.BuiltInProcName.Function:
+            case built_in_proc_name_1.BuiltInProcName.FunctionDefinition:
                 return this.onDefaultFunctionCall({ call });
             default:
                 (0, assert_1.assertUnreachable)(origin);
@@ -296,7 +296,7 @@ class SemanticCfgGuidedVisitor extends dfg_cfg_guided_visitor_1.DataflowAwareCfg
      * A helper function to request the {@link getOriginInDfg|origins} of the given node.
      */
     getOrigins(id) {
-        return (0, dfg_get_origin_1.getOriginInDfg)(this.config.dfg, id);
+        return df_helper_1.Dataflow.origin(this.config.dfg, id);
     }
     /**
      * Called for every occurrence of a `NULL` in the program.

package/control-flow/useless-loop.d.ts

@@ -1,9 +1,9 @@
-import { BuiltInProcName } from '../dataflow/environments/built-in';
 import type { DataflowGraph } from '../dataflow/graph/graph';
 import type { NormalizedAst } from '../r-bridge/lang-4.x/ast/model/processing/decorate';
 import type { NodeId } from '../r-bridge/lang-4.x/ast/model/processing/node-id';
 import type { ControlFlowInformation } from './control-flow-graph';
 import type { ReadOnlyFlowrAnalyzerContext } from '../project/context/flowr-analyzer-context';
+import { BuiltInProcName } from '../dataflow/environments/built-in-proc-name';
 export declare const loopyFunctions: Set<BuiltInProcName>;
 /**
  * Checks whether a loop only loops once

package/control-flow/useless-loop.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loopyFunctions = void 0;
 exports.onlyLoopsOnce = onlyLoopsOnce;
-const built_in_1 = require("../dataflow/environments/built-in");
 const alias_tracking_1 = require("../dataflow/eval/resolve/alias-tracking");
 const general_1 = require("../dataflow/eval/values/general");
 const r_value_1 = require("../dataflow/eval/values/r-value");
@@ -12,7 +11,8 @@ const r_function_call_1 = require("../r-bridge/lang-4.x/ast/model/nodes/r-functi
 const assert_1 = require("../util/assert");
 const control_flow_graph_1 = require("./control-flow-graph");
 const semantic_cfg_guided_visitor_1 = require("./semantic-cfg-guided-visitor");
-exports.loopyFunctions = new Set([built_in_1.BuiltInProcName.ForLoop, built_in_1.BuiltInProcName.WhileLoop, built_in_1.BuiltInProcName.RepeatLoop]);
+const built_in_proc_name_1 = require("../dataflow/environments/built-in-proc-name");
+exports.loopyFunctions = new Set([built_in_proc_name_1.BuiltInProcName.ForLoop, built_in_proc_name_1.BuiltInProcName.WhileLoop, built_in_proc_name_1.BuiltInProcName.RepeatLoop]);
 /**
  * Checks whether a loop only loops once
  * @param loop        - nodeid of the loop to analyse
@@ -30,7 +30,7 @@ function onlyLoopsOnce(loop, dataflow, controlflow, ast, ctx) {
     (0, assert_1.guard)(vertex.tag === vertex_1.VertexType.FunctionCall, 'invalid vertex type for onlyLoopsOnce');
     (0, assert_1.guard)(vertex.origin !== 'unnamed' && exports.loopyFunctions.has(vertex.origin[0]), 'onlyLoopsOnce can only be called with loops');
     // 1. In case of for loop, check if vector has only one element
-    if (vertex.origin[0] === built_in_1.BuiltInProcName.ForLoop) {
+    if (vertex.origin[0] === built_in_proc_name_1.BuiltInProcName.ForLoop) {
         if (vertex.args.length < 2) {
             return undefined;
         }

package/core/print/dataflow-printer.d.ts

@@ -2,20 +2,6 @@ import type { DataflowInformation } from '../../dataflow/info';
 import type { QuadSerializationConfiguration } from '../../util/quads';
 /** Should work with larger things as well */
 export declare function dataflowGraphToJson(df: DataflowInformation): string;
-/**
- * Convert the dataflow graph to a mermaid string.
- * @see {@link graphToMermaid}
- * @see {@link dataflowGraphToMermaidUrl}
- * @see {@link dataflowGraphToJson}
- */
-export declare function dataflowGraphToMermaid(df: DataflowInformation): string;
-/**
- * Convert the dataflow graph to a mermaid URL.
- * @see {@link graphToMermaidUrl}
- * @see {@link dataflowGraphToMermaid}
- * @see {@link dataflowGraphToJson}
- */
-export declare function dataflowGraphToMermaidUrl(df: DataflowInformation): string;
 /**
  * Transforms the dataflow graph into a quad serialization.
  * @see {@link df2quads}

package/core/print/dataflow-printer.js

@@ -1,12 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dataflowGraphToJson = dataflowGraphToJson;
-exports.dataflowGraphToMermaid = dataflowGraphToMermaid;
-exports.dataflowGraphToMermaidUrl = dataflowGraphToMermaidUrl;
 exports.dataflowGraphToQuads = dataflowGraphToQuads;
 const json_1 = require("../../util/json");
 const quads_1 = require("../../dataflow/graph/quads");
-const dfg_1 = require("../../util/mermaid/dfg");
 function mayObjectJson(d) {
     if (typeof d === 'object') {
         return objectJson(d);
@@ -52,24 +49,6 @@ function objectJson(df) {
 function dataflowGraphToJson(df) {
     return objectJson(df);
 }
-/**
- * Convert the dataflow graph to a mermaid string.
- * @see {@link graphToMermaid}
- * @see {@link dataflowGraphToMermaidUrl}
- * @see {@link dataflowGraphToJson}
- */
-function dataflowGraphToMermaid(df) {
-    return (0, dfg_1.graphToMermaid)({ graph: df.graph }).string;
-}
-/**
- * Convert the dataflow graph to a mermaid URL.
- * @see {@link graphToMermaidUrl}
- * @see {@link dataflowGraphToMermaid}
- * @see {@link dataflowGraphToJson}
- */
-function dataflowGraphToMermaidUrl(df) {
-    return (0, dfg_1.graphToMermaidUrl)(df.graph);
-}
 /**
  * Transforms the dataflow graph into a quad serialization.
  * @see {@link df2quads}

package/core/steps/all/core/20-dataflow.d.ts

@@ -1,6 +1,6 @@
 import { internalPrinter } from '../../../print/print';
 import { PipelineStepStage } from '../../pipeline-step';
-import { dataflowGraphToJson, dataflowGraphToMermaid, dataflowGraphToMermaidUrl, dataflowGraphToQuads } from '../../../print/dataflow-printer';
+import { dataflowGraphToJson, dataflowGraphToQuads } from '../../../print/dataflow-printer';
 import type { NormalizedAst } from '../../../../r-bridge/lang-4.x/ast/model/processing/decorate';
 import type { KnownParserType, Parser } from '../../../../r-bridge/parser';
 import type { FlowrAnalyzerContext } from '../../../../project/context/flowr-analyzer-context';
@@ -23,8 +23,8 @@ export declare const STATIC_DATAFLOW: {
         readonly 0: typeof internalPrinter;
         readonly 2: typeof dataflowGraphToJson;
         readonly 5: typeof dataflowGraphToQuads;
-        readonly 3: typeof dataflowGraphToMermaid;
-        readonly 4: typeof dataflowGraphToMermaidUrl;
+        readonly 3: (this: void, graph: import("../../../../dataflow/graph/graph").DataflowGraph | import("../../../../dataflow/info").DataflowInformation, includeEnvironments?: boolean, mark?: ReadonlySet<import("../../../../r-bridge/lang-4.x/ast/model/processing/node-id").NodeId>, simplified?: boolean) => string;
+        readonly 4: (this: void, graph: import("../../../../dataflow/graph/graph").DataflowGraph | import("../../../../dataflow/info").DataflowInformation, includeEnvironments?: boolean, mark?: ReadonlySet<import("../../../../r-bridge/lang-4.x/ast/model/processing/node-id").NodeId>, simplified?: boolean) => string;
     };
     readonly dependencies: readonly ["normalize"];
 };

package/core/steps/all/core/20-dataflow.js

@@ -4,6 +4,7 @@ exports.STATIC_DATAFLOW = void 0;
 const print_1 = require("../../../print/print");
 const dataflow_printer_1 = require("../../../print/dataflow-printer");
 const extractor_1 = require("../../../../dataflow/extractor");
+const df_helper_1 = require("../../../../dataflow/graph/df-helper");
 const staticDataflowCommon = {
     name: 'dataflow',
     description: 'Construct the dataflow graph',
@@ -12,8 +13,8 @@ const staticDataflowCommon = {
         [0 /* StepOutputFormat.Internal */]: print_1.internalPrinter,
         [2 /* StepOutputFormat.Json */]: dataflow_printer_1.dataflowGraphToJson,
         [5 /* StepOutputFormat.RdfQuads */]: dataflow_printer_1.dataflowGraphToQuads,
-        [3 /* StepOutputFormat.Mermaid */]: dataflow_printer_1.dataflowGraphToMermaid,
-        [4 /* StepOutputFormat.MermaidUrl */]: dataflow_printer_1.dataflowGraphToMermaidUrl
+        [3 /* StepOutputFormat.Mermaid */]: df_helper_1.Dataflow.visualize.mermaid.raw,
+        [4 /* StepOutputFormat.MermaidUrl */]: df_helper_1.Dataflow.visualize.mermaid.url
     },
     dependencies: ['normalize'],
 };

package/core/steps/all/static-slicing/00-slice.d.ts

@@ -1,9 +1,10 @@
 import { internalPrinter } from '../../../print/print';
 import { PipelineStepStage } from '../../pipeline-step';
 import type { DataflowInformation } from '../../../../dataflow/info';
-import type { SlicingCriteria } from '../../../../slicing/criterion/parse';
+import { SlicingCriteria } from '../../../../slicing/criterion/parse';
 import type { NormalizedAst } from '../../../../r-bridge/lang-4.x/ast/model/processing/decorate';
 import type { ReadOnlyFlowrAnalyzerContext } from '../../../../project/context/flowr-analyzer-context';
+import { SliceDirection } from '../../../../util/slice-direction';
 export interface SliceRequiredInput {
     /** The slicing criterion is only of interest if you actually want to slice the R code */
     readonly criterion: SlicingCriteria;
@@ -14,10 +15,6 @@ export interface SliceRequiredInput {
     /** The context of the analysis */
     readonly context?: ReadOnlyFlowrAnalyzerContext;
 }
-export declare enum SliceDirection {
-    Backward = "backward",
-    Forward = "forward"
-}
 declare function processor(results: {
     dataflow?: DataflowInformation;
     normalize?: NormalizedAst;

package/core/steps/all/static-slicing/00-slice.js

@@ -1,17 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.STATIC_SLICE = exports.SliceDirection = void 0;
+exports.STATIC_SLICE = void 0;
 const print_1 = require("../../../print/print");
+const parse_1 = require("../../../../slicing/criterion/parse");
 const static_slicer_1 = require("../../../../slicing/static/static-slicer");
-var SliceDirection;
-(function (SliceDirection) {
-    SliceDirection["Backward"] = "backward";
-    SliceDirection["Forward"] = "forward";
-})(SliceDirection || (exports.SliceDirection = SliceDirection = {}));
+const slice_direction_1 = require("../../../../util/slice-direction");
 function processor(results, input) {
-    const direction = input.direction ?? SliceDirection.Backward;
+    const direction = input.direction ?? slice_direction_1.SliceDirection.Backward;
     const threshold = input.threshold ?? input.context?.config.solver.slicer?.threshold;
-    return (0, static_slicer_1.staticSlice)(input.context, results.dataflow, results.normalize, input.criterion, direction, threshold);
+    const n = results.normalize;
+    return (0, static_slicer_1.staticSlice)(input.context, results.dataflow, n, parse_1.SlicingCriteria.convertAll(input.criterion, n.idMap), direction, threshold);
 }
 exports.STATIC_SLICE = {
     name: 'slice',