@eagleoutice/flowr 2.9.2 → 2.9.4

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.1, R grammar v14 (tree-sitter engine)
+    flowR repl using flowR v2.9.3, R grammar v14 (tree-sitter engine)
     R> :query @linter "read.csv(\"/root/x.txt\")"
     ```
     
@@ -80,7 +80,7 @@ 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;╰ **File Path Validity** (file-path-validity):\
@@ -88,7 +88,7 @@ It offers a wide variety of features, for example:
     &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;╰ **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;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>consumerCalls: 0, callsWithFunctionProducers: 0, callsWithAssignmentProducers: 0, callsWithNonConstantProducers: 0, callsWithOtherBranchProducers: 0, searchTimeMs: 0, processTimeMs: 1</code>\
     &nbsp;&nbsp;&nbsp;╰ **Absolute Paths** (absolute-file-paths):\
     &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\
@@ -96,20 +96,20 @@ It offers a wide variety of features, for example:
     &nbsp;&nbsp;&nbsp;╰ **Unused Definitions** (unused-definitions):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalConsidered: 0, searchTimeMs: 0, processTimeMs: 0</code>\
     &nbsp;&nbsp;&nbsp;╰ **Naming Convention** (naming-convention):\
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>numMatches: 0, numBreak: 0, searchTimeMs: 1, processTimeMs: 0</code>\
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>numMatches: 0, numBreak: 0, searchTimeMs: 0, processTimeMs: 0</code>\
     &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;╰ **Dead Code** (dead-code):\
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>consideredNodes: 5, searchTimeMs: 0, processTimeMs: 0</code>\
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>consideredNodes: 5, searchTimeMs: 1, 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.3 ms_ (including parsing and normalization and the query) within the generation environment.
+    The analysis required _2.6 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.
@@ -134,7 +134,7 @@ It offers a wide variety of features, for example:
             "results": [
               {
                 "involvedId": 3,
-                "range": [
+                "loc": [
                   1,
                   1,
                   1,
@@ -162,7 +162,7 @@ It offers a wide variety of features, for example:
               "callsWithNonConstantProducers": 0,
               "callsWithOtherBranchProducers": 0,
               "searchTimeMs": 0,
-              "processTimeMs": 0
+              "processTimeMs": 1
             }
           },
           "absolute-file-paths": {
@@ -170,7 +170,7 @@ It offers a wide variety of features, for example:
               {
                 "certainty": "certain",
                 "filePath": "/root/x.txt",
-                "range": [
+                "loc": [
                   1,
                   1,
                   1,
@@ -198,7 +198,7 @@ It offers a wide variety of features, for example:
             ".meta": {
               "numMatches": 0,
               "numBreak": 0,
-              "searchTimeMs": 1,
+              "searchTimeMs": 0,
               "processTimeMs": 0
             }
           },
@@ -225,7 +225,7 @@ It offers a wide variety of features, for example:
             "results": [],
             ".meta": {
               "consideredNodes": 5,
-              "searchTimeMs": 0,
+              "searchTimeMs": 1,
               "processTimeMs": 0
             }
           },
@@ -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.1, R grammar v14 (tree-sitter engine)
+    flowR repl using flowR v2.9.3, 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!">118 ms</span></i> (as of Feb 3, 2026)](https://flowr-analysis.github.io/flowr/wiki/stats/benchmark), 
+  Within just [<i><span title="This measurement is automatically fetched from the latest benchmark!">121.6 ms</span></i> (as of Feb 4, 2026)](https://flowr-analysis.github.io/flowr/wiki/stats/benchmark), 
   _flowR_ can analyze the data- and control-flow of the average real-world R 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 as well as call graphs.
 
@@ -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.1, R grammar v14 (tree-sitter engine)
+    flowR repl using flowR v2.9.3, 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 _2.3 ms_ (including parse and normalize, using the [tree-sitter](https://github.com/flowr-analysis/flowr/wiki/Engines) engine) within the generation environment.)
     
     
     

package/cli/flowr.js

@@ -105,8 +105,10 @@ function hookSignalHandlers(engines) {
 async function mainRepl() {
     const config = createConfig();
     if (options.script) {
-        const target = scripts_info_1.scripts[options.script].target;
-        (0, assert_1.guard)(target !== undefined, `Unknown script ${options.script}, pick one of ${(0, flowr_main_options_1.getScriptsText)()}.`);
+        const script = scripts_info_1.scripts[options.script];
+        (0, assert_1.guard)(script !== undefined, `Unknown script target "${options.script}", pick one of ${(0, flowr_main_options_1.getScriptsText)()}.`);
+        const target = script.target;
+        (0, assert_1.guard)(target !== undefined, `Unknown script target "${options.script}", pick one of ${(0, flowr_main_options_1.getScriptsText)()}.`);
         console.log(`Running script '${ansi_1.formatter.format(options.script, { style: 1 /* FontStyles.Bold */ })}'`);
         log_1.log.debug(`Script maps to "${target}"`);
         await (0, execute_1.waitOnScript)(`${__dirname}/${target}`, process.argv.slice(3), undefined, true);

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BasicCfgGuidedVisitor = void 0;
 const control_flow_graph_1 = require("./control-flow-graph");
 const assert_1 = require("../util/assert");
+const invert_cfg_1 = require("./invert-cfg");
 /**
  * In contrast to {@link visitCfgInOrder} and {@link visitCfgInReverseOrder}, this visitor is not a simple visitor
  * and serves as the basis for a variety of more complicated visiting orders of the control flow graph.
@@ -31,10 +32,15 @@ class BasicCfgGuidedVisitor {
     }
     startVisitor(start) {
         const graph = this.config.controlFlow.graph;
-        const getNext = this.config.defaultVisitingOrder === 'forward' ?
-            (node) => graph.ingoingEdges(node)?.keys().toArray().toReversed() :
-            (node) => graph.outgoingEdges(node)?.keys().toArray();
-        const stack = [...start];
+        let getNext;
+        if (this.config.defaultVisitingOrder === 'forward') {
+            const inverseGraph = (0, invert_cfg_1.invertCfg)(graph);
+            getNext = (node) => inverseGraph.outgoingEdges(node)?.keys().toArray().reverse();
+        }
+        else {
+            getNext = (node) => graph.outgoingEdges(node)?.keys();
+        }
+        const stack = Array.from(start);
         while (stack.length > 0) {
             const current = stack.pop();
             if (!this.visitNode(current)) {

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

@@ -9,10 +9,12 @@ 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 invert_cfg_1 = require("./invert-cfg");
 class CfgConditionalDeadCodeRemoval extends semantic_cfg_guided_visitor_1.SemanticCfgGuidedVisitor {
     cachedConditions = new Map();
     cachedStatements = new Map();
     inTry = new Set();
+    invertedCfg;
     getValue(id) {
         const has = this.cachedConditions.get(id);
         if (has) {
@@ -39,6 +41,7 @@ class CfgConditionalDeadCodeRemoval extends semantic_cfg_guided_visitor_1.Semant
         this.cachedConditions.set(id, value ? logic_1.Ternary.Always : logic_1.Ternary.Never);
     }
     startVisitor() {
+        this.invertedCfg = (0, invert_cfg_1.invertCfg)(this.config.controlFlow.graph);
         for (const [from, targets] of this.config.controlFlow.graph.edges()) {
             for (const [target, edge] of targets) {
                 if (edge.label === 1 /* CfgEdgeType.Cd */) {
@@ -53,7 +56,7 @@ class CfgConditionalDeadCodeRemoval extends semantic_cfg_guided_visitor_1.Semant
                 else if (edge.label === 0 /* CfgEdgeType.Fd */ && 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 [target, edge] of this.config.controlFlow.graph.ingoingEdges(end) ?? []) {
+                        for (const [target, edge] of this.invertedCfg.outgoingEdges(end) ?? []) {
                             if (edge.label === 0 /* CfgEdgeType.Fd */) {
                                 this.config.controlFlow.graph.removeEdge(target, end);
                             }
@@ -130,7 +133,7 @@ class CfgConditionalDeadCodeRemoval extends semantic_cfg_guided_visitor_1.Semant
             }
             this.inTry.add(n);
             return false;
-        });
+        }, this.invertedCfg);
     }
 }
 /** Breaks unsatisfiable control dependencies */
@@ -144,7 +147,7 @@ function cfgAnalyzeDeadCode(cfg, info) {
         normalizedAst: info.ast,
         dfg: info.dfg,
         ctx: info.ctx,
-        defaultVisitingOrder: 'forward',
+        defaultVisitingOrder: 'backward'
     });
     visitor.start();
     return cfg;

package/control-flow/control-flow-graph.js

@@ -132,8 +132,9 @@ class ControlFlowGraph {
     ingoingEdges(id) {
         const edges = new Map();
         for (const [source, outgoing] of this.edgeInformation.entries()) {
-            if (outgoing.has(id)) {
-                edges.set(source, outgoing.get(id));
+            const o = outgoing.get(id);
+            if (o) {
+                edges.set(source, o);
             }
         }
         return edges;

package/control-flow/simple-visitor.d.ts

@@ -16,11 +16,12 @@ export declare function visitCfgInReverseOrder(graph: ControlFlowGraph, startNod
  * @param graph      - The control flow graph.
  * @param startNodes - The nodes to start the traversal from.
  * @param visitor    - The visitor function to call for each node, if you return true the traversal from this node will be stopped.
+ * @param invertedCfg  - Optionally provide an inverted control flow graph, if not provided the function will create one by inverting the given graph, which can be expensive for large graphs.
  *
  * This function is of type {@link SimpleCfgVisitor}.
  * @see {@link visitCfgInReverseOrder} for a traversal in reversed order
  */
-export declare function visitCfgInOrder(graph: ControlFlowGraph, startNodes: readonly NodeId[], visitor: (node: NodeId) => boolean | void): Set<NodeId>;
+export declare function visitCfgInOrder(graph: ControlFlowGraph, startNodes: readonly NodeId[], visitor: (node: NodeId) => boolean | void, invertedCfg?: ControlFlowGraph): Set<NodeId>;
 /**
  * Check if a node can reach another node in the control flow graph.
  */

package/control-flow/simple-visitor.js

@@ -35,11 +35,9 @@ visitor) {
                 queue = queue.concat(get.elems.toReversed().map(e => e.id));
             }
         }
-        const incoming = graph.outgoingEdges(current);
-        if (incoming) {
-            for (const c of incoming.keys()) {
-                queue.push(c);
-            }
+        const incoming = graph.outgoingEdges(current) ?? [];
+        for (const c of incoming.keys()) {
+            queue.push(c);
         }
     }
 }
@@ -48,17 +46,18 @@ visitor) {
  * @param graph      - The control flow graph.
  * @param startNodes - The nodes to start the traversal from.
  * @param visitor    - The visitor function to call for each node, if you return true the traversal from this node will be stopped.
+ * @param invertedCfg  - Optionally provide an inverted control flow graph, if not provided the function will create one by inverting the given graph, which can be expensive for large graphs.
  *
  * This function is of type {@link SimpleCfgVisitor}.
  * @see {@link visitCfgInReverseOrder} for a traversal in reversed order
  */
 function visitCfgInOrder(graph, startNodes, 
 // eslint-disable-next-line @typescript-eslint/no-invalid-void-type -- void is used to indicate that the return value is ignored/we never stop
-visitor) {
+visitor, invertedCfg) {
     const visited = new Set();
     let queue = startNodes.slice();
     const hasBb = graph.mayHaveBasicBlocks();
-    const g = (0, invert_cfg_1.invertCfg)(graph);
+    const g = invertedCfg ?? (0, invert_cfg_1.invertCfg)(graph);
     while (queue.length > 0) {
         const current = queue.shift();
         if (visited.has(current)) {

package/core/print/slice-diff-ansi.js

@@ -9,11 +9,11 @@ function grayOut() {
 }
 function mergeJointRangesInSorted(loc) {
     return loc.reduce((acc, curr) => {
-        if ((0, range_1.rangesOverlap)(acc[acc.length - 1].location, curr.location)) {
+        if (range_1.SourceRange.overlap(acc[acc.length - 1].location, curr.location)) {
             return [
                 ...acc.slice(0, -1), {
                     selected: curr.selected || acc[acc.length - 1].selected,
-                    location: (0, range_1.mergeRanges)([acc[acc.length - 1].location, curr.location])
+                    location: range_1.SourceRange.merge([acc[acc.length - 1].location, curr.location])
                 }
             ];
         }
@@ -37,7 +37,7 @@ function sliceDiffAnsi(slice, normalized, criteriaIds, originalCode) {
         return `${grayOut()}${originalCode}${ansi_1.ansiFormatter.reset()}`;
     }
     // we sort all locations from back to front so that replacements do not screw up the indices
-    importantLocations.sort((a, b) => -(0, range_1.rangeCompare)(a.location, b.location));
+    importantLocations.sort((a, b) => -range_1.SourceRange.compare(a.location, b.location));
     // we need to merge all ranges that overlap, otherwise even reversed traversal can still crew us up
     importantLocations = mergeJointRangesInSorted(importantLocations);
     const lines = originalCode.split('\n');

package/dataflow/environments/built-in.d.ts

@@ -83,7 +83,16 @@ export interface DefaultBuiltInProcessorConfiguration extends ForceArguments {
      */
     readonly useAsProcessor?: BuiltInProcName;
 }
-export type BuiltInEvalHandler = (resolve: VariableResolve, a: RNodeWithParent, ctx: ReadOnlyFlowrAnalyzerContext, env?: REnvironmentInformation, graph?: DataflowGraph, map?: AstIdMap) => Value;
+export interface BuiltInEvalHandlerArgs {
+    resolve: VariableResolve;
+    node: RNodeWithParent;
+    ctx: ReadOnlyFlowrAnalyzerContext;
+    environment?: REnvironmentInformation;
+    graph?: DataflowGraph;
+    idMap?: AstIdMap;
+    blocked?: Set<NodeId>;
+}
+export type BuiltInEvalHandler = (args: BuiltInEvalHandlerArgs) => Value;
 declare function defaultBuiltInProcessor<OtherInfo>(name: RSymbol<OtherInfo & ParentInformation>, args: readonly RFunctionArgument<OtherInfo & ParentInformation>[], rootId: NodeId, data: DataflowProcessorInformation<OtherInfo & ParentInformation>, { returnsNthArgument, useAsProcessor, forceArgs, readAllArguments, cfg, hasUnknownSideEffects, treatAsFnCall }: DefaultBuiltInProcessorConfiguration): DataflowInformation;
 /**
  * This contains all names of built-in function handlers and origins

package/dataflow/environments/environment.js

@@ -110,7 +110,7 @@ class Environment {
         }
         // navigate to parent until either before built-in or matching namespace
         const newEnvironment = this.clone(false);
-        const current = newEnvironment;
+        let current = newEnvironment;
         do {
             if (current.n === ns) {
                 current.define(definition);
@@ -119,6 +119,7 @@ class Environment {
             else if (current.parent && !current.parent.builtInEnv) {
                 // clone parent
                 current.parent = current.parent.clone(false);
+                current = current.parent;
             }
             else {
                 break;
@@ -163,7 +164,7 @@ class Environment {
      * This always recurses parents.
      */
     overwrite(other, applyCds) {
-        if (!other || this.builtInEnv) {
+        if (this.builtInEnv || this === other || !other) {
             return this;
         }
         const map = new Map(this.memory);
@@ -171,25 +172,29 @@ class Environment {
             const hasMaybe = applyCds === undefined ? values.length === 0 || values.some(v => v.cds !== undefined) : true;
             if (hasMaybe) {
                 const old = map.get(key);
+                if (!old && applyCds === undefined) {
+                    map.set(key, values);
+                    continue;
+                }
                 // we need to make a copy to avoid side effects for old reference in other environments
-                const updatedOld = old?.slice() ?? [];
+                const updated = old?.slice() ?? [];
                 for (const v of values) {
                     const { nodeId, definedAt } = v;
-                    const index = updatedOld.find(o => o.nodeId === nodeId && o.definedAt === definedAt);
+                    const index = updated.find(o => o.nodeId === nodeId && o.definedAt === definedAt);
                     if (index) {
                         continue;
                     }
                     if (applyCds === undefined) {
-                        updatedOld.push(v);
+                        updated.push(v);
                     }
                     else {
-                        updatedOld.push({
+                        updated.push({
                             ...v,
                             cds: v.cds ? applyCds.concat(v.cds) : applyCds.slice()
                         });
                     }
                 }
-                map.set(key, updatedOld);
+                map.set(key, updated);
             }
             else {
                 map.set(key, values);

package/dataflow/eval/resolve/alias-tracking.d.ts

@@ -2,7 +2,7 @@ import { VariableResolve } from '../../../config';
 import type { AstIdMap, RNodeWithParent } 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 REnvironmentInformation } from '../../environments/environment';
-import { type Identifier } from '../../environments/identifier';
+import { Identifier } from '../../environments/identifier';
 import type { DataflowGraph } from '../../graph/graph';
 import { type Lift, type Value, type ValueSet } from '../values/r-value';
 import type { ReadOnlyFlowrAnalyzerContext } from '../../../project/context/flowr-analyzer-context';
@@ -20,6 +20,8 @@ export interface ResolveInfo {
     resolve?: VariableResolve;
     /** Context used for resolving */
     ctx: ReadOnlyFlowrAnalyzerContext;
+    /** If set, the ids that should not be considered during resolution (=> top) */
+    blocked?: Set<NodeId>;
 }
 /**
  * Gets the definitions / aliases of a node
@@ -54,22 +56,20 @@ export declare function getAliases(sourceIds: readonly NodeId[], dataflow: Dataf
  * @param full               - Whether to track aliases on resolve
  * @param resolve            - Variable resolve mode
  * @param ctx                - Context used for clean environment
+ * @param blocked            - If set, the ids that should not be considered during resolution (=&gt;top)
  */
-export declare function resolveIdToValue(id: NodeId | RNodeWithParent | undefined, { environment, graph, idMap, full, resolve, ctx }: ResolveInfo): ResolveResult;
+export declare function resolveIdToValue(id: NodeId | RNodeWithParent | undefined, { environment, graph, idMap, full, resolve, ctx, blocked }: ResolveInfo): ResolveResult;
 /**
  * Please use {@link resolveIdToValue}
  *
  * Uses the aliases that were tracked in the environments (by the
  * {@link getAliases} function) to resolve a node to a value.
- * @param resolve    - Variable resolve mode
  * @param identifier - Identifier to resolve
- * @param use        - Environment to use
- * @param ctx        - analysis context
- * @param graph      - dataflow graph
- * @param idMap      - id map of Dataflow graph
+ * @param environment - Environment to use
+ * @param r          - Resolve information (env, ctx, ...)
  * @returns Value of Identifier or Top
  */
-export declare function trackAliasInEnvironments(resolve: VariableResolve, identifier: Identifier | undefined, use: REnvironmentInformation, ctx: ReadOnlyFlowrAnalyzerContext, graph?: DataflowGraph, idMap?: AstIdMap): ResolveResult;
+export declare function trackAliasInEnvironments(identifier: Identifier | undefined, environment: REnvironmentInformation, { blocked, idMap, resolve, ctx, graph }: Omit<ResolveInfo, 'environment'>): ResolveResult;
 /**
  * Please use {@link resolveIdToValue}
  *

package/dataflow/eval/resolve/alias-tracking.js

@@ -117,39 +117,44 @@ function getAliases(sourceIds, dataflow, environment) {
  * @param full               - Whether to track aliases on resolve
  * @param resolve            - Variable resolve mode
  * @param ctx                - Context used for clean environment
+ * @param blocked            - If set, the ids that should not be considered during resolution (=>top)
  */
-function resolveIdToValue(id, { environment, graph, idMap, full = true, resolve, ctx }) {
+function resolveIdToValue(id, { environment, graph, idMap, full = true, resolve, ctx, blocked }) {
     const variableResolve = resolve ?? ctx.config.solver.variables;
+    blocked ??= new Set();
     if (id === undefined) {
         return r_value_1.Top;
     }
     idMap ??= graph?.idMap;
     const node = typeof id === 'object' ? id : idMap?.get(id);
-    if (node === undefined) {
+    if (node === undefined || blocked.has(node.info.id)) {
         return r_value_1.Top;
     }
+    blocked.add(node.info.id);
     switch (node.type) {
         case type_1.RType.Argument:
             if (node.value) {
-                return resolveIdToValue(node.value.info.id, { environment, graph, idMap, full, resolve: variableResolve, ctx });
+                return resolveIdToValue(node.value.info.id, { environment, graph, idMap, full, resolve: variableResolve, ctx, blocked });
             }
         // eslint-disable-next-line no-fallthrough
         case type_1.RType.Symbol:
-            if (environment) {
-                return full ? trackAliasInEnvironments(variableResolve, node.lexeme, environment, ctx, graph, idMap) : r_value_1.Top;
-            }
-            else if (graph && resolve === config_1.VariableResolve.Alias) {
-                return full ? trackAliasesInGraph(node.info.id, graph, ctx, idMap) : r_value_1.Top;
-            }
-            else {
-                return r_value_1.Top;
+            if (full) {
+                if (environment) {
+                    return trackAliasInEnvironments(identifier_1.Identifier.toString(node.content), environment, { idMap, resolve: variableResolve, ctx, graph, blocked });
+                }
+                else if (graph && resolve === config_1.VariableResolve.Alias) {
+                    return trackAliasesInGraph(node.info.id, graph, ctx, idMap);
+                }
             }
+            return r_value_1.Top;
         case type_1.RType.FunctionDefinition:
             return (0, set_constants_1.setFrom)({ type: 'function-definition' });
         case type_1.RType.FunctionCall:
         case type_1.RType.BinaryOp:
         case type_1.RType.UnaryOp:
-            return (0, set_constants_1.setFrom)((0, resolve_1.resolveNode)(variableResolve, node, ctx, environment, graph, idMap));
+            return (0, set_constants_1.setFrom)((0, resolve_1.resolveNode)({
+                resolve: variableResolve, node, ctx, environment, graph, idMap, blocked
+            }));
         case type_1.RType.String:
         case type_1.RType.Number:
         case type_1.RType.Logical:
@@ -163,19 +168,16 @@ function resolveIdToValue(id, { environment, graph, idMap, full = true, resolve,
  *
  * Uses the aliases that were tracked in the environments (by the
  * {@link getAliases} function) to resolve a node to a value.
- * @param resolve    - Variable resolve mode
  * @param identifier - Identifier to resolve
- * @param use        - Environment to use
- * @param ctx        - analysis context
- * @param graph      - dataflow graph
- * @param idMap      - id map of Dataflow graph
+ * @param environment - Environment to use
+ * @param r          - Resolve information (env, ctx, ...)
  * @returns Value of Identifier or Top
  */
-function trackAliasInEnvironments(resolve, identifier, use, ctx, graph, idMap) {
+function trackAliasInEnvironments(identifier, environment, { blocked, idMap, resolve = config_1.VariableResolve.Alias, ctx, graph }) {
     if (identifier === undefined) {
         return r_value_1.Top;
     }
-    const defs = (0, resolve_by_name_1.resolveByNameAnyType)(identifier, use);
+    const defs = (0, resolve_by_name_1.resolveByNameAnyType)(identifier, environment);
     if (defs === undefined) {
         return r_value_1.Top;
     }
@@ -195,7 +197,7 @@ function trackAliasInEnvironments(resolve, identifier, use, ctx, graph, idMap) {
             for (const alias of def.value) {
                 const definitionOfAlias = idMap?.get(alias);
                 if (definitionOfAlias !== undefined) {
-                    const value = (0, resolve_1.resolveNode)(resolve, definitionOfAlias, ctx, use, graph, idMap);
+                    const value = (0, resolve_1.resolveNode)({ resolve, node: definitionOfAlias, ctx, environment, graph, idMap, blocked });
                     if ((0, r_value_1.isTop)(value)) {
                         return r_value_1.Top;
                     }
@@ -252,7 +254,7 @@ function isNestedInLoop(node, ast) {
     if (parentNode === undefined) {
         return false;
     }
-    if (parentNode.type === type_1.RType.WhileLoop || parentNode.type === type_1.RType.RepeatLoop) {
+    if (parentNode.type === type_1.RType.WhileLoop || parentNode.type === type_1.RType.RepeatLoop || parentNode.type === type_1.RType.ForLoop) {
         return true;
     }
     return isNestedInLoop(parentNode, ast);
@@ -273,7 +275,7 @@ function trackAliasesInGraph(id, graph, ctx, idMap) {
     }
     idMap ??= graph.idMap;
     (0, assert_1.guard)(idMap !== undefined, 'The ID map is required to get the lineage of a node');
-    const queue = new visiting_queue_1.VisitingQueue(25);
+    const queue = new visiting_queue_1.VisitingQueue(10);
     const clean = ctx.env.makeCleanEnv();
     const cleanFingerprint = ctx.env.getCleanEnvFingerprint();
     queue.add(id, clean, cleanFingerprint, false);
@@ -281,11 +283,10 @@ function trackAliasesInGraph(id, graph, ctx, idMap) {
     const resultIds = [];
     while (queue.nonEmpty()) {
         const { id, baseEnvironment } = queue.next();
-        const res = graph.get(id);
-        if (!res) {
+        const vertex = graph.getVertex(id);
+        if (!vertex) {
             continue;
         }
-        const [vertex, outgoingEdges] = res;
         const cds = vertex.cds;
         for (const cd of cds ?? []) {
             const target = graph.idMap?.get(cd.id);
@@ -303,25 +304,23 @@ function trackAliasesInGraph(id, graph, ctx, idMap) {
         if (forceTop) {
             break;
         }
-        if (vertex.tag === vertex_1.VertexType.Value) {
-            resultIds.push(id);
-            continue;
-        }
-        else if (vertex.tag === vertex_1.VertexType.FunctionDefinition) {
+        const t = vertex.tag;
+        if (t === vertex_1.VertexType.Value || t === vertex_1.VertexType.FunctionDefinition) {
             resultIds.push(id);
             continue;
         }
-        const isFn = vertex.tag === vertex_1.VertexType.FunctionCall;
+        const isFn = t === vertex_1.VertexType.FunctionCall;
+        const outgoingEdges = graph.outgoingEdges(id) ?? [];
         // travel all read and defined-by edges
-        for (const [targetId, edge] of outgoingEdges) {
+        for (const [targetId, { types }] of outgoingEdges) {
             if (isFn) {
-                if (edge.types === edge_1.EdgeType.Returns || edge.types === edge_1.EdgeType.DefinedByOnCall || edge.types === edge_1.EdgeType.DefinedBy) {
+                if (types === edge_1.EdgeType.Returns || types === edge_1.EdgeType.DefinedByOnCall || types === edge_1.EdgeType.DefinedBy) {
                     queue.add(targetId, baseEnvironment, cleanFingerprint, false);
                 }
                 continue;
             }
             // currently, they have to be exact!
-            if (edge.types === edge_1.EdgeType.Reads || edge.types === edge_1.EdgeType.DefinedBy || edge.types === edge_1.EdgeType.DefinedByOnCall) {
+            if (types === edge_1.EdgeType.Reads || types === edge_1.EdgeType.DefinedBy || types === edge_1.EdgeType.DefinedByOnCall) {
                 queue.add(targetId, baseEnvironment, cleanFingerprint, false);
             }
         }