@eagleoutice/flowr 2.8.8 → 2.8.10

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.8.7, R grammar v14 (tree-sitter engine)
+    flowR repl using flowR v2.8.9, R grammar v14 (tree-sitter engine)
     R> :query @linter "read.csv(\"/root/x.txt\")"
     ```
     
@@ -35,11 +35,11 @@ It offers a wide variety of features, for example:
     ```text
     Query: linter (2 ms)
        ╰ Deprecated Functions (deprecated-functions):
-           ╰ Metadata: totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 0, processTimeMs: 0
+           ╰ Metadata: totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 1, 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: 1
+           ╰ Metadata: totalReads: 1, totalUnknown: 0, totalWritesBeforeAlways: 0, totalValid: 0, searchTimeMs: 0, 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):
@@ -51,14 +51,14 @@ It offers a wide variety of features, for example:
        ╰ Naming Convention (naming-convention):
            ╰ Metadata: numMatches: 0, numBreak: 0, searchTimeMs: 0, processTimeMs: 0
        ╰ Network Functions (network-functions):
-           ╰ Metadata: totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 0, processTimeMs: 0
+           ╰ Metadata: totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 1, processTimeMs: 0
        ╰ Dataframe Access Validation (dataframe-access-validation):
            ╰ Metadata: numOperations: 0, numAccesses: 0, totalAccessed: 0, searchTimeMs: 0, processTimeMs: 0
        ╰ Dead Code (dead-code):
            ╰ Metadata: consideredNodes: 5, searchTimeMs: 0, processTimeMs: 0
        ╰ Useless Loops (useless-loop):
-           ╰ Metadata: numOfUselessLoops: 0, searchTimeMs: 0, processTimeMs: 1
-    All queries together required ≈2 ms (1ms accuracy, total 3 ms)
+           ╰ Metadata: numOfUselessLoops: 0, searchTimeMs: 0, processTimeMs: 0
+    All queries together required ≈2 ms (1ms accuracy, total 2 ms)
     ```
     
     
@@ -82,17 +82,17 @@ It offers a wide variety of features, for example:
     
     Query: **linter** (2 ms)\
        ╰ **Deprecated Functions** (deprecated-functions):\
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 0, processTimeMs: 0</code>\
+    &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):\
     &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: 1</code>\
+    &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;╰ **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\
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalConsidered: 1, totalUnknown: 0, searchTimeMs: 0, processTimeMs: 0</code>\
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalConsidered: 1, totalUnknown: 0, searchTimeMs: 1, processTimeMs: 0</code>\
     &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):\
@@ -102,14 +102,14 @@ It offers a wide variety of features, for example:
     &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: 1, processTimeMs: 0</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)_
     
     <details> <summary style="color:gray">Show Detailed Results as Json</summary>
     
-    The analysis required _2.4 ms_ (including parsing and normalization and the query) within the generation environment.
+    The analysis required _2.2 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": 0,
+              "searchTimeMs": 1,
               "processTimeMs": 0
             }
           },
@@ -150,7 +150,7 @@ It offers a wide variety of features, for example:
               "totalWritesBeforeAlways": 0,
               "totalValid": 0,
               "searchTimeMs": 0,
-              "processTimeMs": 1
+              "processTimeMs": 0
             }
           },
           "seeded-randomness": {
@@ -181,7 +181,7 @@ It offers a wide variety of features, for example:
             ".meta": {
               "totalConsidered": 1,
               "totalUnknown": 0,
-              "searchTimeMs": 0,
+              "searchTimeMs": 1,
               "processTimeMs": 0
             }
           },
@@ -225,7 +225,7 @@ It offers a wide variety of features, for example:
             "results": [],
             ".meta": {
               "consideredNodes": 5,
-              "searchTimeMs": 1,
+              "searchTimeMs": 0,
               "processTimeMs": 0
             }
           },
@@ -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.8.7, R grammar v14 (tree-sitter engine)
+    flowR repl using flowR v2.8.9, 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!">119.5 ms</span></i> (as of Jan 16, 2026)](https://flowr-analysis.github.io/flowr/wiki/stats/benchmark), 
+  Within just [<i><span title="This measurement is automatically fetched from the latest benchmark!">117 ms</span></i> (as of Jan 18, 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/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.8.7, R grammar v14 (tree-sitter engine)
+    flowR repl using flowR v2.8.9, 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 _2.4 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.0 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,7 +1,7 @@
 import type { CfgSimpleVertex, ControlFlowInformation } 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 { BuiltInProcessorMapper } from '../dataflow/environments/built-in';
+import { BuiltInProcName } from '../dataflow/environments/built-in';
 import type { DataflowGraph } from '../dataflow/graph/graph';
 import { type DataflowGraphVertexFunctionCall, type DataflowGraphVertexVariableDefinition } from '../dataflow/graph/vertex';
 import type { NoInfo, RNode } from '../r-bridge/lang-4.x/ast/model/model';
@@ -62,7 +62,7 @@ export declare abstract class AbstractInterpretationVisitor<Domain extends AnyAb
     getAbstractTrace(): ReadonlyMap<NodeId, StateAbstractDomain<Domain>>;
     start(): void;
     protected visitNode(vertexId: NodeId): boolean;
-    protected onDispatchFunctionCallOrigin(call: DataflowGraphVertexFunctionCall, origin: keyof typeof BuiltInProcessorMapper | string): void;
+    protected onDispatchFunctionCallOrigin(call: DataflowGraphVertexFunctionCall, origin: BuiltInProcName): void;
     protected onVariableDefinition({ vertex }: {
         vertex: DataflowGraphVertexVariableDefinition;
     }): void;

package/abstract-interpretation/absint-visitor.js

@@ -151,19 +151,21 @@ class AbstractInterpretationVisitor extends semantic_cfg_guided_visitor_1.Semant
     }
     onDispatchFunctionCallOrigin(call, origin) {
         super.onDispatchFunctionCallOrigin(call, origin);
-        if (!(origin in built_in_1.BuiltInProcessorMapper)) {
-            return this.onFunctionCall({ call });
-        }
         switch (origin) {
-            case 'builtin:expression-list':
-            case 'builtin:if-then-else':
-            case 'builtin:for-loop':
-            case 'builtin:while-loop':
-            case 'builtin:repeat-loop':
-            case 'builtin:assignment':
-            case 'builtin:assignment-like':
-            case 'builtin:replacement':
-            case 'builtin:access':
+            case built_in_1.BuiltInProcName.ExpressionList:
+            case built_in_1.BuiltInProcName.IfThenElse:
+            case built_in_1.BuiltInProcName.ForLoop:
+            case built_in_1.BuiltInProcName.WhileLoop:
+            case built_in_1.BuiltInProcName.RepeatLoop:
+            case built_in_1.BuiltInProcName.FunctionDefinition:
+            case built_in_1.BuiltInProcName.Assignment:
+            case built_in_1.BuiltInProcName.AssignmentLike:
+            case built_in_1.BuiltInProcName.TableAssignment:
+            case built_in_1.BuiltInProcName.Replacement:
+            case built_in_1.BuiltInProcName.Access:
+            case built_in_1.BuiltInProcName.Pipe:
+            case built_in_1.BuiltInProcName.Break:
+            case built_in_1.BuiltInProcName.Return:
                 return;
             default:
                 return this.onFunctionCall({ call });

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

@@ -8,9 +8,11 @@ const log_1 = require("../util/log");
 const r_function_call_1 = require("../r-bridge/lang-4.x/ast/model/nodes/r-function-call");
 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");
 class CfgConditionalDeadCodeRemoval extends semantic_cfg_guided_visitor_1.SemanticCfgGuidedVisitor {
     cachedConditions = new Map();
     cachedStatements = new Map();
+    inTry = new Set();
     getValue(id) {
         const has = this.cachedConditions.get(id);
         if (has) {
@@ -20,6 +22,9 @@ class CfgConditionalDeadCodeRemoval extends semantic_cfg_guided_visitor_1.Semant
         return this.cachedConditions.get(id) ?? logic_1.Ternary.Maybe;
     }
     isUnconditionalJump(id) {
+        if (this.inTry.has(id)) {
+            return false;
+        }
         const has = this.cachedStatements.get(id);
         if (has) {
             return has;
@@ -45,9 +50,14 @@ class CfgConditionalDeadCodeRemoval extends semantic_cfg_guided_visitor_1.Semant
                         this.config.controlFlow.graph.removeEdge(from, target);
                     }
                 }
-                else if (edge.label === 0 /* CfgEdgeType.Fd */) {
-                    if (this.isUnconditionalJump(target)) {
-                        this.config.controlFlow.graph.removeEdge(from, target);
+                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) ?? []) {
+                            if (edge.label === 0 /* CfgEdgeType.Fd */) {
+                                this.config.controlFlow.graph.removeEdge(target, end);
+                            }
+                        }
                     }
                 }
             }
@@ -91,32 +101,39 @@ class CfgConditionalDeadCodeRemoval extends semantic_cfg_guided_visitor_1.Semant
         }
         return Boolean(values.elements[0].value);
     }
-    handleFunctionCall(data) {
-        switch (data.call.origin[0]) {
-            case 'builtin:return':
-            case 'builtin:stop':
-                this.cachedStatements.set(data.call.id, true);
-                break;
-            case 'builtin:stopifnot': {
-                const arg = this.getBoolArgValue(data);
-                if (arg !== undefined) {
-                    this.cachedStatements.set(data.call.id, !arg);
-                }
-                break;
-            }
-        }
-    }
     onIfThenElseCall(data) {
         this.handleWithCondition(data);
     }
     onWhileLoopCall(data) {
         this.handleWithCondition(data);
     }
-    onDefaultFunctionCall(data) {
-        this.handleFunctionCall(data);
+    onReturnCall(data) {
+        this.cachedStatements.set(data.call.id, true);
+    }
+    onStopCall(data) {
+        this.cachedStatements.set(data.call.id, true);
     }
     onStopIfNotCall(data) {
-        this.handleFunctionCall(data);
+        const arg = this.getBoolArgValue(data);
+        if (arg !== undefined) {
+            this.cachedStatements.set(data.call.id, !arg);
+        }
+    }
+    onTryCall(data) {
+        if (data.call.args.length < 1 || data.call.args[0] === r_function_call_1.EmptyArgument) {
+            return;
+        }
+        const body = this.getCfgVertex(data.call.args[0].nodeId);
+        if (!body) {
+            return;
+        }
+        (0, simple_visitor_1.visitCfgInOrder)(this.config.controlFlow.graph, [body.id], n => {
+            if (body.end?.includes(n)) {
+                return true;
+            }
+            this.inTry.add(n);
+            return false;
+        });
     }
 }
 /** Breaks unsatisfiable control dependencies */

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

@@ -11,9 +11,10 @@ import type { RLogical } from '../r-bridge/lang-4.x/ast/model/nodes/r-logical';
 import type { DataflowGraph, FunctionArgument } from '../dataflow/graph/graph';
 import type { NoInfo, RNode } from '../r-bridge/lang-4.x/ast/model/model';
 import type { RSymbol } from '../r-bridge/lang-4.x/ast/model/nodes/r-symbol';
-import { BuiltInProcessorMapper } from '../dataflow/environments/built-in';
+import { BuiltInProcName } from '../dataflow/environments/built-in';
 import type { RExpressionList } from '../r-bridge/lang-4.x/ast/model/nodes/r-expression-list';
 import type { ReadOnlyFlowrAnalyzerContext } from '../project/context/flowr-analyzer-context';
+import { RNull } from '../r-bridge/lang-4.x/convert-values';
 export interface SemanticCfgGuidedVisitorConfiguration<OtherInfo = NoInfo, ControlFlow extends ControlFlowInformation = ControlFlowInformation, Ast extends NormalizedAst<OtherInfo> = NormalizedAst<OtherInfo>, Dfg extends DataflowGraph = DataflowGraph> extends DataflowCfgGuidedVisitorConfiguration<ControlFlow, Dfg>, SyntaxCfgGuidedVisitorConfiguration<OtherInfo, ControlFlow, Ast> {
     readonly ctx: ReadOnlyFlowrAnalyzerContext;
 }
@@ -100,7 +101,7 @@ export declare class SemanticCfgGuidedVisitor<OtherInfo = NoInfo, ControlFlow ex
      * with the logic you desire.
      * @protected
      */
-    protected onDispatchFunctionCallOrigins(call: DataflowGraphVertexFunctionCall, origins: readonly string[]): void;
+    protected onDispatchFunctionCallOrigins(call: DataflowGraphVertexFunctionCall, origins: readonly BuiltInProcName[]): void;
     /**
      * This function is responsible for dispatching the appropriate event
      * based on a given dataflow vertex. The default serves as a backend
@@ -108,7 +109,7 @@ export declare class SemanticCfgGuidedVisitor<OtherInfo = NoInfo, ControlFlow ex
      * @see {@link onDispatchFunctionCallOrigins} for the aggregation in case the function call target is ambiguous.
      * @protected
      */
-    protected onDispatchFunctionCallOrigin(call: DataflowGraphVertexFunctionCall, origin: keyof typeof BuiltInProcessorMapper | string): void;
+    protected onDispatchFunctionCallOrigin(call: DataflowGraphVertexFunctionCall, origin: BuiltInProcName): void;
     /**
      * This event is called for the root program node, i.e., the program that is being analyzed.
      * @protected
@@ -125,7 +126,7 @@ export declare class SemanticCfgGuidedVisitor<OtherInfo = NoInfo, ControlFlow ex
      */
     protected onNullConstant(_data: {
         vertex: DataflowGraphVertexValue;
-        node: RSymbol<OtherInfo & ParentInformation, 'NULL'>;
+        node: RSymbol<OtherInfo & ParentInformation, typeof RNull>;
     }): void;
     /**
      * Called for every constant string value in the program.
@@ -447,6 +448,17 @@ export declare class SemanticCfgGuidedVisitor<OtherInfo = NoInfo, ControlFlow ex
     protected onVectorCall(_data: {
         call: DataflowGraphVertexFunctionCall;
     }): void;
+    /**
+     * This event triggers for every call to the `stop` function.
+     *
+     * For example, this triggers for `stop` in `stop()`.
+     *
+     * More specifically, this relates to the corresponding {@link BuiltInProcessorMapper} handler.
+     * @protected
+     */
+    protected onStopCall(_data: {
+        call: DataflowGraphVertexFunctionCall;
+    }): void;
     /**
      * This event triggers for every call to the `stopifnot` function.
      *
@@ -500,4 +512,26 @@ export declare class SemanticCfgGuidedVisitor<OtherInfo = NoInfo, ControlFlow ex
     protected onRegisterHookCall(_data: {
         call: DataflowGraphVertexFunctionCall;
     }): void;
+    /**
+     * This event triggers for every call to `break` to exit a loop.
+     *
+     * For example, this triggers for `break` in `repeat { break }`.
+     *
+     * More specifically, this relates to the corresponding {@link BuiltInProcessorMapper} handler.
+     * @protected
+     */
+    protected onBreakCall(_data: {
+        call: DataflowGraphVertexFunctionCall;
+    }): void;
+    /**
+     * This event triggers for every call to `return` to explicitly return a value in a function.
+     *
+     * For example, this triggers for `return` in `f <- function() { return(42) }`.
+     *
+     * More specifically, this relates to the corresponding {@link BuiltInProcessorMapper} handler.
+     * @protected
+     */
+    protected onReturnCall(_data: {
+        call: DataflowGraphVertexFunctionCall;
+    }): void;
 }

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

@@ -8,6 +8,7 @@ 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");
 /**
  * This visitor extends on the {@link DataflowAwareCfgGuidedVisitor} by dispatching visitors for separate function calls as well,
  * providing more information!
@@ -53,7 +54,7 @@ class SemanticCfgGuidedVisitor extends dfg_cfg_guided_visitor_1.DataflowAwareCfg
             case type_1.RType.Number: return this.onNumberConstant({ vertex: val, node: astNode });
             case type_1.RType.Logical: return this.onLogicalConstant({ vertex: val, node: astNode });
             case type_1.RType.Symbol:
-                if (astNode.lexeme === 'NULL') {
+                if (astNode.lexeme === convert_values_1.RNull) {
                     return this.onNullConstant({
                         vertex: val,
                         node: astNode
@@ -115,7 +116,7 @@ class SemanticCfgGuidedVisitor extends dfg_cfg_guided_visitor_1.DataflowAwareCfg
      */
     visitFunctionCall(vertex) {
         super.visitFunctionCall(vertex);
-        if (vertex.origin === 'unnamed') {
+        if (vertex.origin === built_in_1.BuiltInProcName.Unnamed) {
             this.onUnnamedCall({ call: vertex });
         }
         else {
@@ -157,11 +158,7 @@ class SemanticCfgGuidedVisitor extends dfg_cfg_guided_visitor_1.DataflowAwareCfg
      * @protected
      */
     onDispatchFunctionCallOrigin(call, origin) {
-        if (!(origin in built_in_1.BuiltInProcessorMapper)) {
-            return this.onDefaultFunctionCall({ call });
-        }
-        const type = origin;
-        switch (type) {
+        switch (origin) {
             case built_in_1.BuiltInProcName.Eval:
                 return this.onEvalFunctionCall({ call });
             case built_in_1.BuiltInProcName.Apply:
@@ -201,7 +198,8 @@ class SemanticCfgGuidedVisitor extends dfg_cfg_guided_visitor_1.DataflowAwareCfg
             case built_in_1.BuiltInProcName.Vector:
                 return this.onVectorCall({ call });
             case built_in_1.BuiltInProcName.Assignment:
-            case built_in_1.BuiltInProcName.AssignmentLike: {
+            case built_in_1.BuiltInProcName.AssignmentLike:
+            case built_in_1.BuiltInProcName.TableAssignment: {
                 const outgoing = this.config.dfg.outgoingEdges(call.id);
                 if (outgoing) {
                     const target = [...outgoing.entries()].filter(([, e]) => (0, edge_1.edgeIncludesType)(e.types, edge_1.EdgeType.Returns));
@@ -253,22 +251,30 @@ class SemanticCfgGuidedVisitor extends dfg_cfg_guided_visitor_1.DataflowAwareCfg
             }
             case built_in_1.BuiltInProcName.Library:
                 return this.onLibraryCall({ call });
-            case built_in_1.BuiltInProcName.Default:
-                return this.onDefaultFunctionCall({ call });
             case built_in_1.BuiltInProcName.Try:
                 return this.onTryCall({ call });
+            case built_in_1.BuiltInProcName.Stop:
+                return this.onStopCall({ call });
             case built_in_1.BuiltInProcName.StopIfNot:
                 return this.onStopIfNotCall({ call });
             case built_in_1.BuiltInProcName.RegisterHook:
                 return this.onRegisterHookCall({ call });
             case built_in_1.BuiltInProcName.Local:
                 return this.onLocalCall({ call });
-            case built_in_1.BuiltInProcName.FunctionDefinition:
-                throw new Error('Function call vertex cannot be a function definition');
             case built_in_1.BuiltInProcName.S3Dispatch:
                 return this.onS3DispatchCall({ call });
+            case built_in_1.BuiltInProcName.Break:
+                return this.onBreakCall({ call });
+            case built_in_1.BuiltInProcName.Return:
+                return this.onReturnCall({ call });
+            case built_in_1.BuiltInProcName.Unnamed:
+                return this.onUnnamedCall({ call });
+            case built_in_1.BuiltInProcName.Default:
+            case built_in_1.BuiltInProcName.Function:
+            case built_in_1.BuiltInProcName.FunctionDefinition:
+                return this.onDefaultFunctionCall({ call });
             default:
-                (0, assert_1.assertUnreachable)(type);
+                (0, assert_1.assertUnreachable)(origin);
         }
     }
     /**
@@ -530,6 +536,15 @@ class SemanticCfgGuidedVisitor extends dfg_cfg_guided_visitor_1.DataflowAwareCfg
      * @protected
      */
     onVectorCall(_data) { }
+    /**
+     * This event triggers for every call to the `stop` function.
+     *
+     * For example, this triggers for `stop` in `stop()`.
+     *
+     * More specifically, this relates to the corresponding {@link BuiltInProcessorMapper} handler.
+     * @protected
+     */
+    onStopCall(_data) { }
     /**
      * This event triggers for every call to the `stopifnot` function.
      *
@@ -573,6 +588,24 @@ class SemanticCfgGuidedVisitor extends dfg_cfg_guided_visitor_1.DataflowAwareCfg
      * @protected
      */
     onRegisterHookCall(_data) { }
+    /**
+     * This event triggers for every call to `break` to exit a loop.
+     *
+     * For example, this triggers for `break` in `repeat { break }`.
+     *
+     * More specifically, this relates to the corresponding {@link BuiltInProcessorMapper} handler.
+     * @protected
+     */
+    onBreakCall(_data) { }
+    /**
+     * This event triggers for every call to `return` to explicitly return a value in a function.
+     *
+     * For example, this triggers for `return` in `f <- function() { return(42) }`.
+     *
+     * More specifically, this relates to the corresponding {@link BuiltInProcessorMapper} handler.
+     * @protected
+     */
+    onReturnCall(_data) { }
 }
 exports.SemanticCfgGuidedVisitor = SemanticCfgGuidedVisitor;
 //# sourceMappingURL=semantic-cfg-guided-visitor.js.map

package/control-flow/useless-loop.js

@@ -29,7 +29,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] === 'builtin:for-loop') {
+    if (vertex.origin[0] === built_in_1.BuiltInProcName.ForLoop) {
         if (vertex.args.length < 2) {
             return undefined;
         }
@@ -120,28 +120,25 @@ class CfgSingleIterationLoopDetector extends semantic_cfg_guided_visitor_1.Seman
             }
         }
     }
-    handleFunctionCall(data) {
-        for (const origin of data.call.origin) {
-            if (origin === 'builtin:stop' || origin === 'builtin:return' || origin === 'builtin:break') {
-                this.encounteredLoopBreaker = true;
-                this.app(data.call.cds);
-                return;
-            }
-            else if (origin === 'builtin:stopifnot') {
-                const arg = this.getBoolArgValue(data);
-                if (arg === false) {
-                    this.encounteredLoopBreaker = true;
-                    this.app(data.call.cds);
-                    return;
-                }
-            }
-        }
+    onBreakCall(data) {
+        this.encounteredLoopBreaker = true;
+        this.app(data.call.cds);
     }
-    onDefaultFunctionCall(data) {
-        this.handleFunctionCall(data);
+    onReturnCall(data) {
+        this.encounteredLoopBreaker = true;
+        this.app(data.call.cds);
+    }
+    onStopCall(data) {
+        this.encounteredLoopBreaker = true;
+        this.app(data.call.cds);
     }
     onStopIfNotCall(data) {
-        this.handleFunctionCall(data);
+        const arg = this.getBoolArgValue(data);
+        if (arg === false) {
+            this.encounteredLoopBreaker = true;
+            this.app(data.call.cds);
+            return;
+        }
     }
     loopsOnlyOnce() {
         this.startVisitor([]);

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

@@ -32,7 +32,7 @@ export interface BuiltInFunctionDefinition<BuiltInProcessor extends keyof typeof
 }
 /**
  * Define a built-in replacement (like `[` or `$`) and the processor to use.
- * This is a convenience for manually combined function calls with `builtin:replacement`.
+ * This is a convenience for manually combined replacement function calls.
  */
 export interface BuiltInReplacementDefinition extends BaseBuiltInDefinition {
     readonly type: 'replacement';

package/dataflow/environments/built-in.js

@@ -268,8 +268,8 @@ class BuiltIns {
      * Registers all combinations of replacements
      */
     registerReplacementFunctions({ names, suffixes, assumePrimitive, config }) {
-        const replacer = exports.BuiltInProcessorMapper['builtin:replacement'];
-        (0, assert_1.guard)(replacer !== undefined, () => 'Processor for builtin:replacement is undefined!');
+        const replacer = exports.BuiltInProcessorMapper[BuiltInProcName.Replacement];
+        (0, assert_1.guard)(replacer !== undefined, () => `Processor for ${BuiltInProcName.Replacement} is undefined!`);
         for (const assignment of names) {
             for (const suffix of suffixes) {
                 const effectiveName = `${assignment}${suffix}`;

package/dataflow/environments/default-builtin-config.d.ts

@@ -257,7 +257,7 @@ export declare const DefaultBuiltinConfig: [{
     readonly config: {
         readonly returnsNthArgument: 0;
         readonly cfg: ExitPointType.Return;
-        readonly useAsProcessor: "builtin:return";
+        readonly useAsProcessor: BuiltInProcName.Return;
     };
     readonly assumePrimitive: true;
 }, {
@@ -302,7 +302,7 @@ export declare const DefaultBuiltinConfig: [{
     readonly names: ["break"];
     readonly processor: BuiltInProcName.Default;
     readonly config: {
-        readonly useAsProcessor: "builtin:break";
+        readonly useAsProcessor: BuiltInProcName.Break;
         readonly cfg: ExitPointType.Break;
     };
     readonly assumePrimitive: false;
@@ -604,7 +604,7 @@ export declare const DefaultBuiltinConfig: [{
     readonly processor: BuiltInProcName.Vector;
     readonly config: {};
     readonly assumePrimitive: true;
-    readonly evalHandler: "builtin:c";
+    readonly evalHandler: "built-in:c";
 }, {
     readonly type: "function";
     readonly names: ["setnames", "setNames", "setkey", "setkeyv", "setindex", "setindexv", "setattr"];

package/dataflow/environments/default-builtin-config.js

@@ -232,7 +232,7 @@ exports.DefaultBuiltinConfig = [
     { type: 'function', names: ['eval'], processor: built_in_1.BuiltInProcName.Eval, config: { includeFunctionCall: true }, assumePrimitive: true },
     { type: 'function', names: ['cat'], processor: built_in_1.BuiltInProcName.Default, config: { forceArgs: 'all', hasUnknownSideEffects: { type: 'link-to-last-call', callName: /^sink$/ } }, assumePrimitive: false },
     { type: 'function', names: ['switch'], processor: built_in_1.BuiltInProcName.Default, config: { forceArgs: [true] }, assumePrimitive: false },
-    { type: 'function', names: ['return'], processor: built_in_1.BuiltInProcName.Default, config: { returnsNthArgument: 0, cfg: 1 /* ExitPointType.Return */, useAsProcessor: 'builtin:return' }, assumePrimitive: true },
+    { type: 'function', names: ['return'], processor: built_in_1.BuiltInProcName.Default, config: { returnsNthArgument: 0, cfg: 1 /* ExitPointType.Return */, useAsProcessor: built_in_1.BuiltInProcName.Return }, assumePrimitive: true },
     {
         type: 'function',
         names: ['stop', 'abort', 'cli_abort', 'throw', 'stop_bad_type', 'stop_bad_element_type', 'stop_bad_element_length'],
@@ -243,7 +243,7 @@ exports.DefaultBuiltinConfig = [
     { type: 'function', names: ['try'], processor: built_in_1.BuiltInProcName.Try, config: { block: 'expr', handlers: {} }, assumePrimitive: true },
     { type: 'function', names: ['tryCatch', 'tryCatchLog'], processor: built_in_1.BuiltInProcName.Try, config: { block: 'expr', handlers: { error: 'error', finally: 'finally' } }, assumePrimitive: true },
     { type: 'function', names: ['stopifnot'], processor: built_in_1.BuiltInProcName.StopIfNot, config: {}, assumePrimitive: false },
-    { type: 'function', names: ['break'], processor: built_in_1.BuiltInProcName.Default, config: { useAsProcessor: 'builtin:break', cfg: 2 /* ExitPointType.Break */ }, assumePrimitive: false },
+    { type: 'function', names: ['break'], processor: built_in_1.BuiltInProcName.Default, config: { useAsProcessor: built_in_1.BuiltInProcName.Break, cfg: 2 /* ExitPointType.Break */ }, assumePrimitive: false },
     { type: 'function', names: ['next'], processor: built_in_1.BuiltInProcName.Default, config: { cfg: 3 /* ExitPointType.Next */ }, assumePrimitive: false },
     { type: 'function', names: ['{'], processor: built_in_1.BuiltInProcName.ExpressionList, config: {}, assumePrimitive: true },
     { type: 'function', names: ['source'], processor: built_in_1.BuiltInProcName.Source, config: { includeFunctionCall: true, forceFollow: false }, assumePrimitive: false },
@@ -278,7 +278,7 @@ exports.DefaultBuiltinConfig = [
     { type: 'function', names: ['interference'], processor: built_in_1.BuiltInProcName.Apply, config: { unquoteFunction: true, nameOfFunctionArgument: 'propensity_integrand', libFn: true }, assumePrimitive: false },
     { type: 'function', names: ['ddply'], processor: built_in_1.BuiltInProcName.Apply, config: { unquoteFunction: true, indexOfFunction: 2, nameOfFunctionArgument: '.fun', libFn: true }, assumePrimitive: false },
     { type: 'function', names: ['list'], processor: built_in_1.BuiltInProcName.List, config: {}, assumePrimitive: true },
-    { type: 'function', names: ['c'], processor: built_in_1.BuiltInProcName.Vector, config: {}, assumePrimitive: true, evalHandler: 'builtin:c' },
+    { type: 'function', names: ['c'], processor: built_in_1.BuiltInProcName.Vector, config: {}, assumePrimitive: true, evalHandler: 'built-in:c' },
     {
         type: 'function',
         names: ['setnames', 'setNames', 'setkey', 'setkeyv', 'setindex', 'setindexv', 'setattr'],

package/dataflow/internal/process/functions/call/built-in/built-in-assignment.js

@@ -56,7 +56,7 @@ function tryReplacementPassingIndices(rootId, functionName, data, name, args, in
     if (resolved.length !== 1 || resolved[0].type !== identifier_1.ReferenceType.BuiltInFunction) {
         return (0, process_named_call_1.processAsNamedCall)(functionName, data, name, args);
     }
-    const info = built_in_1.BuiltInProcessorMapper['builtin:replacement']({
+    const info = built_in_1.BuiltInProcessorMapper[built_in_1.BuiltInProcName.Replacement]({
         type: type_1.RType.Symbol,
         info: functionName.info,
         content: name,

package/dataflow/internal/process/functions/call/built-in/built-in-replacement.js

@@ -35,7 +35,7 @@ args, rootId, data, config) {
         indices ??= constructAccessedIndices(name.content, args);
     }
     /* we assign the first argument by the last for now and maybe mark as maybe!, we can keep the symbol as we now know we have an assignment */
-    let res = built_in_1.BuiltInProcessorMapper['builtin:assignment'](name, [args[0], args.at(-1)], rootId, data, {
+    let res = built_in_1.BuiltInProcessorMapper[built_in_1.BuiltInProcName.Assignment](name, [args[0], args.at(-1)], rootId, data, {
         superAssignment: config.assignmentOperator === '<<-',
         makeMaybe: indices === undefined ? config.makeMaybe : false,
         indicesCollection: indices,

package/dataflow/internal/process/functions/call/built-in/built-in-try-catch.js

@@ -12,6 +12,10 @@ const type_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/type");
 const assert_1 = require("../../../../../../util/assert");
 const edge_1 = require("../../../../../graph/edge");
 const built_in_1 = require("../../../../../environments/built-in");
+const unnamed_call_handling_1 = require("../unnamed-call-handling");
+const identifier_1 = require("../../../../../environments/identifier");
+const resolve_by_name_1 = require("../../../../../environments/resolve-by-name");
+const log_1 = require("../../../../../../util/log");
 function getArgsOfName(argMaps, name) {
     return new Set(argMaps.entries().filter(([, v]) => v === name).map(([k]) => k));
 }
@@ -72,7 +76,11 @@ function processTryCatch(name, args, rootId, data, config) {
         }
     }
     for (const e of errorArg) {
-        info.graph.addEdge(rootId, e, edge_1.EdgeType.Calls);
+        info.graph.addEdge(rootId, e, edge_1.EdgeType.Reads | edge_1.EdgeType.Calls);
+        const linkTo = promoteCallToFunction(rootId, e, info, data);
+        if (linkTo) {
+            info.graph.addEdge(e, linkTo, edge_1.EdgeType.Calls);
+        }
     }
     for (const f of finallyArg) {
         info.graph.addEdge(rootId, f, edge_1.EdgeType.Calls);
@@ -84,6 +92,75 @@ function processTryCatch(name, args, rootId, data, config) {
     }
     return info;
 }
+function promoteCallToFunction(call, arg, info, data) {
+    let functionId = undefined;
+    let functionName = undefined;
+    let anonymous = false;
+    const argNode = data.completeAst.idMap.get(arg);
+    if (!argNode) {
+        return undefined;
+    }
+    const val = argNode.type === type_1.RType.Argument ? (0, unpack_argument_1.unpackArg)(argNode) : argNode;
+    if (!val) {
+        return undefined;
+    }
+    if (val.type === type_1.RType.Symbol) {
+        functionId = val.info.id;
+        functionName = val.content;
+    }
+    else if (val.type === type_1.RType.FunctionDefinition) {
+        anonymous = true;
+        functionId = val.info.id;
+        functionName = `${unnamed_call_handling_1.UnnamedFunctionCallPrefix}${functionId}`;
+    }
+    if (functionName === undefined || functionId === undefined) {
+        return undefined;
+    }
+    if (anonymous) {
+        info.graph.addEdge(arg, functionId, edge_1.EdgeType.Calls | edge_1.EdgeType.Reads);
+        const dfVert = info.graph.getVertex(call);
+        if (dfVert && dfVert.tag === vertex_1.VertexType.FunctionDefinition) {
+            // resolve all ingoings against the environment
+            const ingoingRefs = dfVert.subflow.in;
+            const remainingIn = [];
+            for (const ingoing of ingoingRefs) {
+                const resolved = ingoing.name ? (0, resolve_by_name_1.resolveByName)(ingoing.name, data.environment, ingoing.type) : undefined;
+                if (resolved === undefined) {
+                    remainingIn.push(ingoing);
+                    continue;
+                }
+                (0, log_1.expensiveTrace)(logger_1.dataflowLogger, () => `Found ${resolved.length} references to open ref ${ingoing.nodeId} in closure of function definition ${call}`);
+                let allBuiltIn = true;
+                for (const ref of resolved) {
+                    info.graph.addEdge(ingoing, ref, edge_1.EdgeType.Reads);
+                    info.graph.addEdge(call, ref, edge_1.EdgeType.Reads); // because the def. is the anonymous call
+                    if (!(0, identifier_1.isReferenceType)(ref.type, identifier_1.ReferenceType.BuiltInConstant | identifier_1.ReferenceType.BuiltInFunction)) {
+                        allBuiltIn = false;
+                    }
+                }
+                if (allBuiltIn) {
+                    remainingIn.push(ingoing);
+                }
+            }
+            dfVert.subflow.in = remainingIn;
+        }
+        // we did the linking
+        return undefined;
+    }
+    else {
+        info.graph.updateToFunctionCall({
+            tag: vertex_1.VertexType.FunctionCall,
+            id: functionId,
+            name: functionName,
+            args: [],
+            environment: data.environment,
+            onlyBuiltin: false,
+            cds: data.cds,
+            origin: [built_in_1.BuiltInProcName.Function]
+        });
+        return functionId;
+    }
+}
 function getExitPoints(vertex, graph) {
     if (!vertex) {
         return undefined;

package/documentation/wiki-interface.js

@@ -291,7 +291,7 @@ ${(0, doc_code_1.codeBlock)('json', JSON.stringify({
   | Type            | Description                                                                                                                                                                                                                                                                                              | Example                                                                                                    |
   | --------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
   | \`constant\`    | Additionally allows for a \`value\` this should resolve to.                                                                                                                                                                                                                                                | \`{ type: 'constant', names: ['NULL', 'NA'],  value: null }\`                                                |
-  | \`function\`    | Is a rather flexible way to define and bind built-in functions. For the time, we do not have extensive documentation to cover all the cases, so please either consult the sources with the \`default-builtin-config.ts\` or open a [new issue](${doc_issue_1.NewIssueUrl}). | \`{ type: 'function', names: ['next'], processor: 'builtin:default', config: { cfg: ExitPointType.Next } }\` |
+  | \`function\`    | Is a rather flexible way to define and bind built-in functions. For the time, we do not have extensive documentation to cover all the cases, so please either consult the sources with the \`default-builtin-config.ts\` or open a [new issue](${doc_issue_1.NewIssueUrl}). | \`{ type: 'function', names: ['next'], processor: '${built_in_1.BuiltInProcName.Default}', config: { cfg: ExitPointType.Next } }\` |
   | \`replacement\` | A comfortable way to specify replacement functions like \`$<-\` or \`names<-\`. \`suffixes\` describes the... suffixes to attach automatically. | \`{ type: 'replacement', suffixes: ['<-', '<<-'], names: ['[', '[['] }\` |
 
 

package/linter/linter-format.d.ts

@@ -102,9 +102,9 @@ export interface LintingResult {
      */
     readonly quickFix?: LintQuickFix[];
     /**
-     * The node ID involved in this linting result, if applicable.
+     * The node ID or IDs involved in this linting result, if applicable.
      */
-    readonly involvedId: NodeId | undefined;
+    readonly involvedId: NodeId | NodeId[] | undefined;
 }
 export interface ConfiguredLintingRule<Name extends LintingRuleNames = LintingRuleNames> {
     readonly name: Name;

package/linter/linter-rules.d.ts

@@ -249,11 +249,7 @@ export declare const LintingRules: {
             cfg: import("../control-flow/control-flow-graph").ControlFlowInformation;
             analyzer: import("../project/flowr-analyzer").ReadonlyFlowrAnalysisProvider;
         }) => {
-            results: {
-                certainty: import("./linter-format").LintingResultCertainty.Certain;
-                involvedId: undefined;
-                range: import("../util/range").SourceRange;
-            }[];
+            results: import("./rules/dead-code").DeadCodeResult[];
             '.meta': import("./rules/dead-code").DeadCodeMetadata;
         };
         readonly prettyPrint: {

package/linter/rules/dead-code.d.ts

@@ -1,10 +1,10 @@
-import { LintingResultCertainty, type LintingResult, LintingRuleCertainty } from '../linter-format';
+import { type LintingResult, LintingRuleCertainty } from '../linter-format';
 import { type SourceRange } from '../../util/range';
 import type { MergeableRecord } from '../../util/objects';
 import { LintingRuleTag } from '../linter-tags';
 import { type CfgSimplificationPassName } from '../../control-flow/cfg-simplification';
 export interface DeadCodeResult extends LintingResult {
-    range: SourceRange;
+    readonly range: SourceRange;
 }
 export interface DeadCodeConfig extends MergeableRecord {
     /**
@@ -24,11 +24,7 @@ export declare const DEAD_CODE: {
         cfg: import("../../control-flow/control-flow-graph").ControlFlowInformation;
         analyzer: import("../../project/flowr-analyzer").ReadonlyFlowrAnalysisProvider;
     }) => {
-        results: {
-            certainty: LintingResultCertainty.Certain;
-            involvedId: undefined;
-            range: SourceRange;
-        }[];
+        results: DeadCodeResult[];
         '.meta': DeadCodeMetadata;
     };
     readonly prettyPrint: {

package/linter/rules/dead-code.js

@@ -19,19 +19,18 @@ exports.DEAD_CODE = {
             consideredNodes: 0
         };
         return {
-            results: (0, range_1.combineRanges)(...new Set(elements.getElements()
+            results: combineResults(elements.getElements()
                 .filter(element => {
                 meta.consideredNodes++;
                 const cfgInformation = (0, search_enrichers_1.enrichmentContent)(element, search_enrichers_1.Enrichment.CfgInformation);
                 return cfgInformation.isRoot && !cfgInformation.isReachable;
             })
-                .map(element => element.node.info.fullRange ?? element.node.location)
-                .filter(assert_1.isNotUndefined)))
-                .map(range => ({
+                .map(element => ({
                 certainty: linter_format_1.LintingResultCertainty.Certain,
-                involvedId: undefined,
-                range
-            })),
+                involvedId: element.node.info.id,
+                range: (element.node.info.fullRange ?? element.node.location)
+            }))
+                .filter(element => (0, assert_1.isNotUndefined)(element.range))),
             '.meta': meta
         };
     },
@@ -48,4 +47,23 @@ exports.DEAD_CODE = {
         defaultConfig: {}
     }
 };
+function combineResults(results) {
+    for (let i = results.length - 1; i >= 0; i--) {
+        const result = results[i];
+        const other = results.find(other => result !== other && (0, range_1.rangeIsSubsetOf)(result.range, other.range));
+        if (other !== undefined) {
+            if (!Array.isArray(other.involvedId)) {
+                other.involvedId = other.involvedId !== undefined ? [other.involvedId] : [];
+            }
+            if (Array.isArray(result.involvedId)) {
+                other.involvedId.push(...result.involvedId);
+            }
+            else if (result.involvedId !== undefined) {
+                other.involvedId.push(result.involvedId);
+            }
+            results.splice(i, 1);
+        }
+    }
+    return results;
+}
 //# sourceMappingURL=dead-code.js.map

package/package.json

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

package/project/plugins/file-plugins/files/flowr-namespace-file.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlowrNamespaceFile = void 0;
 const flowr_file_1 = require("../../../context/flowr-file");
 const resolve_args_1 = require("../../../../abstract-interpretation/data-frame/resolve-args");
+const retriever_1 = require("../../../../r-bridge/retriever");
 /**
  * This decorates a text file and provides access to its content in the {@link NamespaceFormat}.
  */
@@ -60,11 +61,11 @@ function parseNamespace(file) {
         switch (type) {
             case 'exportClasses':
             case 'exportMethods':
-                result.current.exportedFunctions.push(args);
+                result.current.exportedFunctions.push((0, retriever_1.removeRQuotes)(args));
                 break;
             case 'S3method':
                 {
-                    const parts = args.split(',').map(s => s.trim());
+                    const parts = args.split(',').map(s => (0, retriever_1.removeRQuotes)(s.trim()));
                     if (parts.length !== 2) {
                         continue;
                     }
@@ -78,7 +79,7 @@ function parseNamespace(file) {
                     break;
                 }
             case 'export':
-                result.current.exportedSymbols.push(args);
+                result.current.exportedSymbols.push((0, retriever_1.removeRQuotes)(args));
                 break;
             case 'useDynLib':
                 {

package/queries/catalog/dependencies-query/dependencies-query-executor.js

@@ -39,7 +39,10 @@ async function executeDependenciesQuery({ analyzer, }, queries) {
     const results = Object.fromEntries(await Promise.all(functions.entries().map(async ([c, f]) => {
         const results = getResults(queries, { dataflow, config, normalize }, queryResults, c, f, data);
         // only default categories allow additional analyses, so we null-coalesce here!
-        await dependencies_query_format_1.DefaultDependencyCategories[c]?.additionalAnalysis?.(data, ignoreDefault, f, queryResults, results);
+        const enabled = query.enabledCategories;
+        if (enabled === undefined || (enabled?.length > 0 && enabled.includes(c))) {
+            await dependencies_query_format_1.DefaultDependencyCategories[c]?.additionalAnalysis?.(data, ignoreDefault, f, queryResults, results);
+        }
         return [c, results];
     })));
     return {
@@ -202,7 +205,7 @@ function collectValuesFromLinks(args, data, linkedIds) {
 }
 function getFunctionsToCheck(customFunctions, functionFlag, enabled, ignoreDefaultFunctions, defaultFunctions) {
     // "If unset or empty, all function types are searched for."
-    if (enabled?.length && enabled.indexOf(functionFlag) < 0) {
+    if (enabled !== undefined && (enabled?.length === 0 || enabled.indexOf(functionFlag) < 0)) {
         return [];
     }
     let functions = ignoreDefaultFunctions ? [] : [...defaultFunctions];

package/queries/catalog/dependencies-query/dependencies-query-format.js

@@ -119,7 +119,7 @@ exports.DependenciesQueryDefinition = {
         type: joi_1.default.string().valid('dependencies').required().description('The type of the query.'),
         ignoreDefaultFunctions: joi_1.default.boolean().optional().description('Should the set of functions that are detected by default be ignored/skipped? Defaults to false.'),
         ...Object.fromEntries(Object.keys(exports.DefaultDependencyCategories).map(c => [`${c}Functions`, functionInfoSchema.description(`The set of ${c} functions to search for.`)])),
-        enabledCategories: joi_1.default.array().optional().items(joi_1.default.string().valid(...Object.keys(exports.DefaultDependencyCategories))).description('A set of flags that determines what types of dependencies are searched for. If unset or empty, all dependency types are searched for.'),
+        enabledCategories: joi_1.default.array().optional().items(joi_1.default.string()).description('A set of flags that determines what types of dependencies are searched for. If unset, all dependency types are searched for.'),
         additionalCategories: joi_1.default.object().allow(joi_1.default.object({
             queryDisplayName: joi_1.default.string().description('The display name in the query result.'),
             functions: functionInfoSchema.description('The functions that this additional category should search for.'),

package/queries/catalog/linter-query/linter-query-format.js

@@ -111,7 +111,7 @@ exports.LinterQueryDefinition = {
             if ((0, linter_format_1.isLintingResultsError)(v)) {
                 return [];
             }
-            return v.results.map(v => v.involvedId);
+            return v.results.flatMap(v => Array.isArray(v.involvedId) ? v.involvedId : [v.involvedId]);
         }).filter(assert_1.isNotUndefined);
     }
 };

package/r-bridge/lang-4.x/ast/model/processing/decorate.d.ts

@@ -12,6 +12,7 @@ import type { SourceRange } from '../../../../../util/range';
 import { BiMap } from '../../../../../util/collections/bimap';
 import type { MergeableRecord } from '../../../../../util/objects';
 import { RoleInParent } from './role';
+import { RType } from '../type';
 import type { NodeId } from './node-id';
 import type { RDelimiter } from '../nodes/info/r-delimiter';
 import type { RProject } from '../nodes/r-project';
@@ -49,7 +50,7 @@ export interface ParentContextInfo extends MergeableRecord {
     /**
      * The nesting of the node in the AST
      *
-     * The root node has a nesting of 0, nested function calls, loops etc. will increase the nesting
+     * The root node has a nesting of 0, contexts listed in ${@link nestForElement} will increase the nesting
      */
     nesting: number;
     /**
@@ -80,6 +81,10 @@ export interface NormalizedAst<OtherInfo = ParentInformation, Node = RProject<Ot
     /** marks whether the AST contains potential syntax errors */
     hasError?: boolean;
 }
+/**
+ * Node types for which the nesting score will be increased
+ */
+export declare const nestForElement: ReadonlySet<RType>;
 export interface NormalizedAstDecorationConfiguration<OtherInfo> {
     /** The id generator: must generate a unique id für each passed node */
     getId?: IdGenerator<OtherInfo>;

package/r-bridge/lang-4.x/ast/model/processing/decorate.js

@@ -9,6 +9,7 @@
  * @module
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.nestForElement = void 0;
 exports.deterministicCountingIdGenerator = deterministicCountingIdGenerator;
 exports.deterministicPrefixIdGenerator = deterministicPrefixIdGenerator;
 exports.sourcedDeterministicCountingIdGenerator = sourcedDeterministicCountingIdGenerator;
@@ -64,7 +65,10 @@ const defaultParentContext = {
     role: "root" /* RoleInParent.Root */,
     index: 0
 };
-const nestForElement = new Set([
+/**
+ * Node types for which the nesting score will be increased
+ */
+exports.nestForElement = new Set([
     type_1.RType.FunctionDefinition, type_1.RType.ForLoop, type_1.RType.WhileLoop, type_1.RType.RepeatLoop, type_1.RType.IfThenElse,
 ]);
 /**
@@ -83,7 +87,7 @@ function decorateAst(project, { getId = deterministicCountingIdGenerator(0) }) {
     const unaryOp = createFoldForUnaryOp(info);
     const folds = {
         down: (n, nesting) => {
-            if (nestForElement.has(n.type)) {
+            if (exports.nestForElement.has(n.type)) {
                 return nesting + 1;
             }
             else {

package/util/mermaid/cfg.d.ts

@@ -2,9 +2,14 @@ import type { NormalizedAst } from '../../r-bridge/lang-4.x/ast/model/processing
 import { type ControlFlowInformation } from '../../control-flow/control-flow-graph';
 import type { MermaidMarkStyle, MermaidGraphPrinterInfo } from './info';
 export interface MermaidCfgGraphPrinterInfo extends MermaidGraphPrinterInfo {
+    /** The style to apply to mark an entry point marker node */
     entryPointStyle?: MermaidMarkStyle['vertex'];
+    /** The stly eto apply to mark an exit point marker node */
     exitPointStyle?: MermaidMarkStyle['vertex'];
+    /** If true, a simplified basic block will have "Basic Block (id)" prepended */
     includeBasicBlockLabel?: boolean;
+    /** If this threshold is reached (lexemes of a simplified basic block), the remaning character will be replaced by ... */
+    basicBlockCharacterLimit?: number;
 }
 export declare const MermaidEntryPointDefaultMarkStyle: MermaidMarkStyle['vertex'];
 export declare const MermaidExitPointDefaultMarkStyle: MermaidMarkStyle['vertex'];
@@ -18,7 +23,7 @@ export declare const MermaidExitPointDefaultMarkStyle: MermaidMarkStyle['vertex'
  * @param includeOnlyIds   - If provided, only include the vertices with the given IDs.
  * @param mark             - If provided, mark the given vertices and edges.
  */
-export declare function cfgToMermaid(cfg: ControlFlowInformation, normalizedAst: NormalizedAst, { prefix, simplify, markStyle, entryPointStyle, exitPointStyle, includeOnlyIds, mark, includeBasicBlockLabel }?: MermaidCfgGraphPrinterInfo): string;
+export declare function cfgToMermaid(cfg: ControlFlowInformation, normalizedAst: NormalizedAst, { prefix, simplify, markStyle, entryPointStyle, exitPointStyle, includeOnlyIds, mark, includeBasicBlockLabel, basicBlockCharacterLimit }?: MermaidCfgGraphPrinterInfo): string;
 /**
  * Use mermaid to visualize the normalized AST.
  */

package/util/mermaid/cfg.js

@@ -50,7 +50,7 @@ function shouldIncludeNode(simplify, element, include) {
  * @param includeOnlyIds   - If provided, only include the vertices with the given IDs.
  * @param mark             - If provided, mark the given vertices and edges.
  */
-function cfgToMermaid(cfg, normalizedAst, { prefix = 'flowchart BT\n', simplify = false, markStyle = info_1.MermaidDefaultMarkStyle, entryPointStyle = exports.MermaidEntryPointDefaultMarkStyle, exitPointStyle = exports.MermaidExitPointDefaultMarkStyle, includeOnlyIds, mark, includeBasicBlockLabel = true } = {}) {
+function cfgToMermaid(cfg, normalizedAst, { prefix = 'flowchart BT\n', simplify = false, markStyle = info_1.MermaidDefaultMarkStyle, entryPointStyle = exports.MermaidEntryPointDefaultMarkStyle, exitPointStyle = exports.MermaidExitPointDefaultMarkStyle, includeOnlyIds, mark, includeBasicBlockLabel = true, basicBlockCharacterLimit = 100 } = {}) {
     const hasBbandSimplify = simplify && cfg.graph.mayHaveBasicBlocks();
     let output = prefix;
     if (includeOnlyIds) {
@@ -89,7 +89,7 @@ function cfgToMermaid(cfg, normalizedAst, { prefix = 'flowchart BT\n', simplify
                     continue;
                 }
                 const ids = vertex.elems?.map(e => e.id) ?? [];
-                const reconstruct = (0, reconstruct_1.reconstructToCode)(normalizedAst, { nodes: new Set(ids) }, auto_select_defaults_1.doNotAutoSelect).code;
+                const reconstruct = limitTo((0, reconstruct_1.reconstructToCode)(normalizedAst, { nodes: new Set(ids) }, auto_select_defaults_1.doNotAutoSelect).code, basicBlockCharacterLimit);
                 const name = `"\`${includeBasicBlockLabel ? `Basic Block (${id})\n` : ''}${(0, mermaid_1.escapeMarkdown)(reconstruct)}\`"`;
                 output += `    n${id}[[${name}]]\n`;
                 diagramIncludedIds.add(vertex.id);
@@ -166,4 +166,13 @@ function cfgToMermaid(cfg, normalizedAst, { prefix = 'flowchart BT\n', simplify
 function cfgToMermaidUrl(cfg, normalizedAst, info) {
     return (0, mermaid_1.mermaidCodeToUrl)(cfgToMermaid(cfg, normalizedAst, info ?? {}));
 }
+/**
+ * Limits a string to n chars, after which the remainder will be replaced with ...
+ */
+function limitTo(str, limit) {
+    if (str.length <= limit) {
+        return str;
+    }
+    return `${str.substring(0, limit)}...`;
+}
 //# sourceMappingURL=cfg.js.map

package/util/version.js

@@ -6,7 +6,7 @@ exports.printVersionInformation = printVersionInformation;
 const semver_1 = require("semver");
 const assert_1 = require("./assert");
 // this is automatically replaced with the current version by release-it
-const version = '2.8.8';
+const version = '2.8.10';
 /**
  * Retrieves the current flowR version as a new {@link SemVer} object.
  */