@eagleoutice/flowr 2.0.7 → 2.0.8

package/benchmark/stats/size-of.js

@@ -39,7 +39,7 @@ function getSizeOfDfGraph(df) {
                 ...vertex,
                 environment: {
                     ...vertex.environment,
-                    current: killBuiltInEnv(v.environment.current)
+                    current: killBuiltInEnv(v.environment?.current)
                 }
             };
         }

package/dataflow/environments/diff.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.diffEnvironmentInformation = exports.diffEnvironment = exports.diffIdentifierReferences = void 0;
 const diff_1 = require("../../util/diff");
+const environment_1 = require("./environment");
 const json_1 = require("../../util/json");
 const info_1 = require("../info");
 const built_in_1 = require("./built-in");
@@ -75,7 +76,7 @@ exports.diffEnvironment = diffEnvironment;
 function diffEnvironmentInformation(a, b, info) {
     if (a === undefined || b === undefined) {
         if (a !== b) {
-            info.report.addComment(`${info.position}Different environments: ${JSON.stringify(a, json_1.jsonReplacer)} vs. ${JSON.stringify(b, json_1.jsonReplacer)}`);
+            info.report.addComment(`${info.position}Different environments: ${JSON.stringify(a, environment_1.builtInEnvJsonReplacer)} vs. ${JSON.stringify(b, environment_1.builtInEnvJsonReplacer)}`);
         }
         return;
     }

package/dataflow/environments/environment.d.ts

@@ -41,3 +41,4 @@ export interface REnvironmentInformation {
 }
 export declare const BuiltInEnvironment: Environment;
 export declare function initializeCleanEnvironments(fullBuiltIns?: boolean): REnvironmentInformation;
+export declare function builtInEnvJsonReplacer(k: unknown, v: unknown): unknown;

package/dataflow/environments/environment.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initializeCleanEnvironments = exports.BuiltInEnvironment = exports.Environment = exports.makeAllMaybe = exports.makeReferenceMaybe = void 0;
+exports.builtInEnvJsonReplacer = exports.initializeCleanEnvironments = exports.BuiltInEnvironment = exports.Environment = exports.makeAllMaybe = exports.makeReferenceMaybe = void 0;
 const built_in_1 = require("./built-in");
 const resolve_by_name_1 = require("./resolve-by-name");
+const json_1 = require("../../util/json");
 function makeReferenceMaybe(ref, graph, environments, includeDefs, defaultCd = undefined) {
     const node = graph.get(ref.nodeId, true);
     if (includeDefs) {
@@ -64,4 +65,16 @@ function initializeCleanEnvironments(fullBuiltIns = true) {
     };
 }
 exports.initializeCleanEnvironments = initializeCleanEnvironments;
+function builtInEnvJsonReplacer(k, v) {
+    if (v === exports.BuiltInEnvironment) {
+        return '<BuiltInEnvironment>';
+    }
+    else if (v === EmptyBuiltInEnvironment) {
+        return '<EmptyBuiltInEnvironment>';
+    }
+    else {
+        return (0, json_1.jsonReplacer)(k, v);
+    }
+}
+exports.builtInEnvJsonReplacer = builtInEnvJsonReplacer;
 //# sourceMappingURL=environment.js.map

package/dataflow/graph/graph.d.ts

@@ -47,6 +47,7 @@ type EdgeData<Edge extends DataflowGraphEdge> = Omit<Edge, 'from' | 'to' | 'type
 export declare class DataflowGraph<Vertex extends DataflowGraphVertexInfo = DataflowGraphVertexInfo, Edge extends DataflowGraphEdge = DataflowGraphEdge> {
     private static DEFAULT_ENVIRONMENT;
     private _idMap;
+    readonly functionCache: Map<NodeId, Set<DataflowGraphVertexInfo>>;
     constructor(idMap: AstIdMap | undefined);
     /** Contains the vertices of the root level graph (i.e., included those vertices from the complete graph, that are nested within function definitions) */
     private rootVertices;

package/dataflow/graph/graph.js

@@ -42,6 +42,8 @@ function extractEdgeIds(from, to) {
 class DataflowGraph {
     static DEFAULT_ENVIRONMENT = undefined;
     _idMap;
+    // this should be linked separately
+    functionCache = new Map();
     constructor(idMap) {
         DataflowGraph.DEFAULT_ENVIRONMENT ??= (0, environment_1.initializeCleanEnvironments)();
         this._idMap = idMap;
@@ -155,7 +157,7 @@ class DataflowGraph {
         if (oldVertex !== undefined) {
             return this;
         }
-        const fallback = vertex.tag === "variable-definition" /* VertexType.VariableDefinition */ || vertex.tag === "use" /* VertexType.Use */ || vertex.tag === "value" /* VertexType.Value */ ? undefined : DataflowGraph.DEFAULT_ENVIRONMENT;
+        const fallback = vertex.tag === "variable-definition" /* VertexType.VariableDefinition */ || vertex.tag === "use" /* VertexType.Use */ || vertex.tag === "value" /* VertexType.Value */ || (vertex.tag === "function-call" /* VertexType.FunctionCall */ && vertex.onlyBuiltin) ? undefined : DataflowGraph.DEFAULT_ENVIRONMENT;
         // keep a clone of the original environment
         const environment = vertex.environment === undefined ? fallback : (0, clone_1.cloneEnvironmentInformation)(vertex.environment);
         this.vertexInformation.set(vertex.id, {

package/dataflow/graph/vertex.d.ts

@@ -62,7 +62,7 @@ export interface DataflowGraphVertexFunctionCall extends DataflowGraphVertexBase
     args: FunctionArgument[];
     /** a performance flag to indicate that the respective call is _only_ calling a builtin function without any df graph attached */
     onlyBuiltin: boolean;
-    readonly environment: REnvironmentInformation;
+    environment: REnvironmentInformation | undefined;
 }
 /**
  * Arguments required to construct a vertex which represents the definition of a variable in the dataflow graph.

package/dataflow/internal/linker.d.ts

@@ -17,7 +17,7 @@ export declare function linkFunctionCalls(graph: DataflowGraph, idMap: AstIdMap,
     functionCall: NodeId;
     called: readonly DataflowGraphVertexInfo[];
 }[];
-export declare function getAllLinkedFunctionDefinitions(functionDefinitionReadIds: ReadonlySet<NodeId>, dataflowGraph: DataflowGraph): Map<NodeId, DataflowGraphVertexInfo>;
+export declare function getAllLinkedFunctionDefinitions(functionDefinitionReadIds: ReadonlySet<NodeId>, dataflowGraph: DataflowGraph): Set<DataflowGraphVertexInfo>;
 /**
  * This method links a set of read variables to definitions in an environment.
  *

package/dataflow/internal/linker.js

@@ -133,7 +133,7 @@ exports.linkFunctionCalls = linkFunctionCalls;
 function getAllLinkedFunctionDefinitions(functionDefinitionReadIds, dataflowGraph) {
     const potential = [...functionDefinitionReadIds];
     const visited = new Set();
-    const result = new Map();
+    const result = new Set();
     while (potential.length > 0) {
         const currentId = potential.pop();
         // do not traverse builtins
@@ -156,7 +156,7 @@ function getAllLinkedFunctionDefinitions(functionDefinitionReadIds, dataflowGrap
         const followBits = 1 /* EdgeType.Reads */ | 2 /* EdgeType.DefinedBy */ | 32 /* EdgeType.DefinedByOnCall */;
         const followEdges = outgoingEdges.filter(([_, e]) => (0, edge_1.edgeIncludesType)(e.types, followBits));
         if (currentInfo[0].subflow !== undefined) {
-            result.set(currentId, currentInfo[0]);
+            result.add(currentInfo[0]);
         }
         // trace all joined reads
         potential.push(...followEdges.map(([target]) => target).filter(id => !visited.has(id)));

package/dataflow/internal/process/functions/call/named-call-handling.js

@@ -45,6 +45,7 @@ function processNamedCall(name, args, rootId, data) {
         const v = information.graph.getVertex(rootId);
         if (v?.tag === "function-call" /* VertexType.FunctionCall */) {
             v.onlyBuiltin = true;
+            v.environment = undefined;
         }
     }
     return information ?? (0, info_1.initializeCleanDataflowInformation)(rootId, data);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eagleoutice/flowr",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "Static Dataflow Analyzer and Program Slicer for the R Programming Language",
   "types": "dist/src/index.d.ts",
   "repository": {

package/slicing/static/slice-call.js

@@ -4,6 +4,7 @@ exports.handleReturns = exports.sliceForCall = void 0;
 const assert_1 = require("../../util/assert");
 const fingerprint_1 = require("./fingerprint");
 const linker_1 = require("../../dataflow/internal/linker");
+const environment_1 = require("../../dataflow/environments/environment");
 const scoping_1 = require("../../dataflow/environments/scoping");
 const overwrite_1 = require("../../dataflow/environments/overwrite");
 const built_in_1 = require("../../dataflow/environments/built-in");
@@ -11,12 +12,13 @@ const resolve_by_name_1 = require("../../dataflow/environments/resolve-by-name")
 const edge_1 = require("../../dataflow/graph/edge");
 function retrieveActiveEnvironment(callerInfo, baseEnvironment) {
     let callerEnvironment = callerInfo.environment;
-    if (baseEnvironment.level !== callerEnvironment.level) {
-        while (baseEnvironment.level < callerEnvironment.level) {
+    const level = callerEnvironment?.level ?? 0;
+    if (baseEnvironment.level !== level) {
+        while (baseEnvironment.level < level) {
             baseEnvironment = (0, scoping_1.pushLocalEnvironment)(baseEnvironment);
         }
-        while (baseEnvironment.level > callerEnvironment.level) {
-            callerEnvironment = (0, scoping_1.pushLocalEnvironment)(callerEnvironment);
+        while (baseEnvironment.level > level) {
+            callerEnvironment = (0, scoping_1.pushLocalEnvironment)(callerEnvironment ?? (0, environment_1.initializeCleanEnvironments)(true));
         }
     }
     return (0, overwrite_1.overwriteEnvironment)(baseEnvironment, callerEnvironment);
@@ -40,7 +42,7 @@ function sliceForCall(current, callerInfo, dataflowGraph, queue) {
         }
     }
     const functionCallTargets = (0, linker_1.getAllLinkedFunctionDefinitions)(new Set(functionCallDefs), dataflowGraph);
-    for (const [_, functionCallTarget] of functionCallTargets) {
+    for (const functionCallTarget of functionCallTargets) {
         // all those linked within the scopes of other functions are already linked when exiting a function definition
         for (const openIn of functionCallTarget.subflow.in) {
             const defs = openIn.name ? (0, resolve_by_name_1.resolveByName)(openIn.name, activeEnvironment) : undefined;
@@ -72,7 +74,11 @@ function handleReturns(queue, currentEdges, baseEnvFingerprint, baseEnvironment)
             queue.add(target, baseEnvironment, baseEnvFingerprint, false);
         }
         else if ((0, edge_1.edgeIncludesType)(edge.types, 64 /* EdgeType.Argument */)) {
-            queue.potentialArguments.add(target);
+            queue.potentialArguments.set(target, {
+                id: target,
+                baseEnvironment,
+                onlyForSideEffects: false
+            });
         }
     }
     return true;

package/slicing/static/static-slicer.js

@@ -9,7 +9,6 @@ const slice_call_1 = require("./slice-call");
 const parse_1 = require("../criterion/parse");
 const environment_1 = require("../../dataflow/environments/environment");
 const edge_1 = require("../../dataflow/graph/edge");
-const built_in_1 = require("../../dataflow/environments/built-in");
 exports.slicerLogger = log_1.log.getSubLogger({ name: 'slicer' });
 /**
  * This returns the ids to include in the slice, when slicing with the given seed id's (must be at least one).
@@ -63,16 +62,19 @@ function staticSlicing(graph, ast, criteria, threshold = 75) {
             }
         }
         for (const [target, { types }] of currentEdges) {
-            if (target === built_in_1.BuiltIn || (0, edge_1.edgeIncludesType)(types, 256 /* EdgeType.NonStandardEvaluation */)) {
+            if ((0, edge_1.edgeIncludesType)(types, 256 /* EdgeType.NonStandardEvaluation */)) {
                 continue;
             }
             const t = (0, edge_1.shouldTraverseEdge)(types);
             if (t === 3 /* TraverseEdge.Always */) {
                 queue.add(target, baseEnvironment, baseEnvFingerprint, false);
             }
-            else if (t === 2 /* TraverseEdge.DefinedByOnCall */ && queue.potentialArguments.has(target)) {
-                queue.add(target, baseEnvironment, baseEnvFingerprint, false);
-                queue.potentialArguments.delete(target);
+            else if (t === 2 /* TraverseEdge.DefinedByOnCall */) {
+                const n = queue.potentialArguments.get(target);
+                if (n) {
+                    queue.add(target, n.baseEnvironment, (0, fingerprint_1.envFingerprint)(n.baseEnvironment), n.onlyForSideEffects);
+                    queue.potentialArguments.delete(target);
+                }
             }
             else if (t === 1 /* TraverseEdge.SideEffect */) {
                 queue.add(target, baseEnvironment, baseEnvFingerprint, true);

package/slicing/static/visiting-queue.d.ts

@@ -7,7 +7,7 @@ export declare class VisitingQueue {
     private seen;
     private idThreshold;
     private queue;
-    potentialArguments: Set<NodeId>;
+    potentialArguments: Map<NodeId, NodeToSlice>;
     constructor(threshold: number);
     /**
      * Adds a node to the queue if it has not been seen before.

package/slicing/static/visiting-queue.js

@@ -10,7 +10,7 @@ class VisitingQueue {
     idThreshold = new Map();
     queue = [];
     // the set of potential arguments holds arguments which may be added if found with the `defined-by-on-call` edge
-    potentialArguments = new Set();
+    potentialArguments = new Map();
     constructor(threshold) {
         this.threshold = threshold;
     }

package/util/version.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.flowrVersion = void 0;
 const semver_1 = require("semver");
 // this is automatically replaced with the current version by release-it
-const version = '2.0.7';
+const version = '2.0.8';
 function flowrVersion() {
     return new semver_1.SemVer(version);
 }