@eagleoutice/flowr 2.9.10 → 2.9.12

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.9, R grammar v14 (tree-sitter engine)
+    flowR repl using flowR v2.9.11, R grammar v14 (tree-sitter engine)
     R> :query @linter "read.csv(\"/root/x.txt\")"
     ```
     
@@ -33,7 +33,7 @@ It offers a wide variety of features, for example:
     
     
     ```text
-    Query: linter (3 ms)
+    Query: linter (2 ms)
        ╰ Deprecated Functions (deprecated-functions):
            ╰ Metadata: totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 1, processTimeMs: 0
        ╰ File Path Validity (file-path-validity):
@@ -45,7 +45,7 @@ It offers a wide variety of features, for example:
        ╰ Absolute Paths (absolute-file-paths):
            ╰ certain:
                ╰ Path `/root/x.txt` at 1.1-23
-           ╰ Metadata: totalConsidered: 1, totalUnknown: 0, searchTimeMs: 1, processTimeMs: 0
+           ╰ Metadata: totalConsidered: 1, totalUnknown: 0, searchTimeMs: 0, processTimeMs: 0
        ╰ Unused Definitions (unused-definitions):
            ╰ Metadata: totalConsidered: 0, searchTimeMs: 0, processTimeMs: 0
        ╰ Naming Convention (naming-convention):
@@ -53,12 +53,12 @@ It offers a wide variety of features, for example:
        ╰ Network Functions (network-functions):
            ╰ Metadata: totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 0, processTimeMs: 0
        ╰ Dataframe Access Validation (dataframe-access-validation):
-           ╰ Metadata: numOperations: 0, numAccesses: 0, totalAccessed: 0, searchTimeMs: 0, processTimeMs: 0
+           ╰ Metadata: numOperations: 0, numAccesses: 0, totalAccessed: 0, searchTimeMs: 0, processTimeMs: 1
        ╰ Dead Code (dead-code):
-           ╰ Metadata: consideredNodes: 5, searchTimeMs: 1, processTimeMs: 0
+           ╰ Metadata: consideredNodes: 5, searchTimeMs: 0, processTimeMs: 0
        ╰ Useless Loops (useless-loop):
            ╰ Metadata: numOfUselessLoops: 0, searchTimeMs: 0, processTimeMs: 0
-    All queries together required ≈3 ms (1ms accuracy, total 4 ms)
+    All queries together required ≈2 ms (1ms accuracy, total 2 ms)
     ```
     
     
@@ -80,19 +80,19 @@ It offers a wide variety of features, for example:
     
     _Results (prettified and summarized):_
     
-    Query: **linter** (3 ms)\
+    Query: **linter** (2 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):\
     &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: 1, processTimeMs: 0</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):\
@@ -100,16 +100,16 @@ It offers a wide variety of features, for example:
     &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: 1, processTimeMs: 0</code>\
+    &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;╰ **Useless Loops** (useless-loop):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>numOfUselessLoops: 0, searchTimeMs: 0, processTimeMs: 0</code>\
-    _All queries together required ≈3 ms (1ms accuracy, total 3 ms)_
+    _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 _3.1 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.
@@ -149,7 +149,7 @@ It offers a wide variety of features, for example:
               "totalUnknown": 0,
               "totalWritesBeforeAlways": 0,
               "totalValid": 0,
-              "searchTimeMs": 1,
+              "searchTimeMs": 0,
               "processTimeMs": 0
             }
           },
@@ -181,7 +181,7 @@ It offers a wide variety of features, for example:
             ".meta": {
               "totalConsidered": 1,
               "totalUnknown": 0,
-              "searchTimeMs": 0,
+              "searchTimeMs": 1,
               "processTimeMs": 0
             }
           },
@@ -217,7 +217,7 @@ It offers a wide variety of features, for example:
               "numOperations": 0,
               "numAccesses": 0,
               "totalAccessed": 0,
-              "searchTimeMs": 1,
+              "searchTimeMs": 0,
               "processTimeMs": 0
             }
           },
@@ -239,11 +239,11 @@ It offers a wide variety of features, for example:
           }
         },
         ".meta": {
-          "timing": 3
+          "timing": 2
         }
       },
       ".meta": {
-        "timing": 3
+        "timing": 2
       }
     }
     ```
@@ -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.9, R grammar v14 (tree-sitter engine)
+    flowR repl using flowR v2.9.11, R grammar v14 (tree-sitter engine)
     R> :query @static-slice (11@sum) file://test/testfiles/example.R
     ```
     
@@ -322,7 +322,7 @@ It offers a wide variety of features, for example:
     N <- 10
     for(i in 1:(N-1)) sum <- sum + i + w
     sum
-    All queries together required ≈3 ms (1ms accuracy, total 4 ms)
+    All queries together required ≈2 ms (1ms accuracy, total 2 ms)
     ```
     
     
@@ -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!">112.3 ms</span></i> (as of Feb 9, 2026)](https://flowr-analysis.github.io/flowr/wiki/stats/benchmark), 
+  Within just [<i><span title="This measurement is automatically fetched from the latest benchmark!">98.9 ms</span></i> (as of Feb 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&nbsp;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](https://github.com/flowr-analysis/flowr/wiki/wiki/dataflow-graph) as well as [call graphs](https://github.com/flowr-analysis/flowr/wiki/wiki/dataflow-graph#perspectives-cg).
 
@@ -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.9, R grammar v14 (tree-sitter engine)
+    flowR repl using flowR v2.9.11, R grammar v14 (tree-sitter engine)
     R> :dataflow* test/testfiles/example.R
     ```
     
@@ -485,9 +485,6 @@ It offers a wide variety of features, for example:
           (19)
           *6.13*
         (18)`"]]
-        built-in:_["`Built-In:
-    (`"]
-        style built-in:_ stroke:gray,fill:gray,stroke-width:2px,opacity:.8;
         20[["`#91;RBinaryOp#93; #58;
           (20)
           *6.11-17*
@@ -505,6 +502,9 @@ It offers a wide variety of features, for example:
           (26, :may:36+)
           *7.10-16*
         (24, 25)`"]]
+        built-in:_["`Built-In:
+    #43;`"]
+        style built-in:_ stroke:gray,fill:gray,stroke-width:2px,opacity:.8;
         27(["`#91;RSymbol#93; w
           (27, :may:36+)
           *7.20*`"])
@@ -613,96 +613,94 @@ It offers a wide variety of features, for example:
         18 -.->|"reads, calls"| built-in:-
         linkStyle 24 stroke:gray;
         19 -->|"returns, argument"| 18
-        19 -.->|"reads"| built-in:_
-        linkStyle 26 stroke:gray;
         20 -->|"reads, argument"| 13
         20 -->|"reads, argument"| 19
         20 -.->|"reads, calls"| built-in::
-        linkStyle 29 stroke:gray;
+        linkStyle 28 stroke:gray;
         24 -->|"reads"| 0
         24 -->|"reads"| 23
         24 -->|"CD-True"| 36
-        linkStyle 32 stroke:gray,color:gray;
+        linkStyle 31 stroke:gray,color:gray;
         25 -->|"reads"| 12
         25 -->|"CD-True"| 36
-        linkStyle 34 stroke:gray,color:gray;
+        linkStyle 33 stroke:gray,color:gray;
         26 -->|"reads, argument"| 24
         26 -->|"reads, argument"| 25
         26 -.->|"reads, calls"| built-in:_
-        linkStyle 37 stroke:gray;
+        linkStyle 36 stroke:gray;
         26 -->|"CD-True"| 36
-        linkStyle 38 stroke:gray,color:gray;
+        linkStyle 37 stroke:gray,color:gray;
         27 -->|"reads"| 6
         27 -->|"CD-True"| 36
-        linkStyle 40 stroke:gray,color:gray;
+        linkStyle 39 stroke:gray,color:gray;
         28 -->|"reads, argument"| 26
         28 -->|"reads, argument"| 27
         28 -.->|"reads, calls"| built-in:_
-        linkStyle 43 stroke:gray;
+        linkStyle 42 stroke:gray;
         28 -->|"CD-True"| 36
-        linkStyle 44 stroke:gray,color:gray;
+        linkStyle 43 stroke:gray,color:gray;
         23 -->|"defined-by"| 28
         23 -->|"defined-by"| 29
         23 -->|"CD-True"| 36
-        linkStyle 47 stroke:gray,color:gray;
+        linkStyle 46 stroke:gray,color:gray;
         29 -->|"reads, argument"| 28
         29 -->|"returns, argument"| 23
         29 -.->|"reads, calls"| built-in:_-
-        linkStyle 50 stroke:gray;
+        linkStyle 49 stroke:gray;
         29 -->|"CD-True"| 36
-        linkStyle 51 stroke:gray,color:gray;
+        linkStyle 50 stroke:gray,color:gray;
         31 -->|"reads"| 3
         31 -->|"reads"| 30
         31 -->|"CD-True"| 36
-        linkStyle 54 stroke:gray,color:gray;
+        linkStyle 53 stroke:gray,color:gray;
         32 -->|"reads"| 12
         32 -->|"CD-True"| 36
-        linkStyle 56 stroke:gray,color:gray;
+        linkStyle 55 stroke:gray,color:gray;
         33 -->|"reads, argument"| 31
         33 -->|"reads, argument"| 32
         33 -.->|"reads, calls"| built-in:_
-        linkStyle 59 stroke:gray;
+        linkStyle 58 stroke:gray;
         33 -->|"CD-True"| 36
-        linkStyle 60 stroke:gray,color:gray;
+        linkStyle 59 stroke:gray,color:gray;
         30 -->|"defined-by"| 33
         30 -->|"defined-by"| 34
         30 -->|"CD-True"| 36
-        linkStyle 63 stroke:gray,color:gray;
+        linkStyle 62 stroke:gray,color:gray;
         34 -->|"reads, argument"| 33
         34 -->|"returns, argument"| 30
         34 -.->|"reads, calls"| built-in:_-
-        linkStyle 66 stroke:gray;
+        linkStyle 65 stroke:gray;
         34 -->|"CD-True"| 36
-        linkStyle 67 stroke:gray,color:gray;
+        linkStyle 66 stroke:gray,color:gray;
         35 -->|"argument"| 29
         35 -->|"returns, argument"| 34
         35 -.->|"reads, calls"| built-in:_
-        linkStyle 70 stroke:gray;
+        linkStyle 69 stroke:gray;
         35 -->|"CD-True"| 36
-        linkStyle 71 stroke:gray,color:gray;
+        linkStyle 70 stroke:gray,color:gray;
         36 -->|"argument"| 12
         36 -->|"reads, argument"| 20
         36 -->|"argument, non-standard-evaluation"| 35
         36 -.->|"reads, calls"| built-in:for
-        linkStyle 75 stroke:gray;
+        linkStyle 74 stroke:gray;
         40 -->|"reads"| 0
         40 -->|"reads"| 23
         44 -->|"argument"| 38
         44 -->|"reads, argument"| 40
         44 -->|"argument"| 42
         44 -.->|"reads, calls"| built-in:cat
-        linkStyle 81 stroke:gray;
+        linkStyle 80 stroke:gray;
         48 -->|"reads"| 3
         48 -->|"reads"| 30
         52 -->|"argument"| 46
         52 -->|"reads, argument"| 48
         52 -->|"argument"| 50
         52 -.->|"reads, calls"| built-in:cat
-        linkStyle 87 stroke:gray;
+        linkStyle 86 stroke:gray;
     ```
     
     	
-    (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 _1.6 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.js

@@ -6,6 +6,7 @@ const semantic_cfg_guided_visitor_1 = require("../control-flow/semantic-cfg-guid
 const built_in_1 = require("../dataflow/environments/built-in");
 const vertex_1 = require("../dataflow/graph/vertex");
 const dfg_get_origin_1 = require("../dataflow/origin/dfg-get-origin");
+const model_1 = require("../r-bridge/lang-4.x/ast/model/model");
 const r_function_call_1 = require("../r-bridge/lang-4.x/ast/model/nodes/r-function-call");
 const type_1 = require("../r-bridge/lang-4.x/ast/model/type");
 const assert_1 = require("../util/assert");
@@ -284,7 +285,7 @@ class AbstractInterpretationVisitor extends semantic_cfg_guided_visitor_1.Semant
             return false;
         }
         const node = this.getNormalizedAst(nodeId);
-        if (node?.type === type_1.RType.ForLoop || node?.type === type_1.RType.WhileLoop || node?.type === type_1.RType.RepeatLoop) {
+        if (model_1.RLoopConstructs.is(node)) {
             return true;
         }
         const dataflowVertex = this.getDataflowGraph(nodeId);

package/abstract-interpretation/data-frame/mappers/arguments.d.ts

@@ -1,6 +1,6 @@
 import type { ResolveInfo } from '../../../dataflow/eval/resolve/alias-tracking';
 import type { DataflowGraph } from '../../../dataflow/graph/graph';
-import type { RNode } from '../../../r-bridge/lang-4.x/ast/model/model';
+import { RNode } from '../../../r-bridge/lang-4.x/ast/model/model';
 import type { RArgument } from '../../../r-bridge/lang-4.x/ast/model/nodes/r-argument';
 import { type RFunctionArgument, type RFunctionCall, EmptyArgument } from '../../../r-bridge/lang-4.x/ast/model/nodes/r-function-call';
 import type { RSymbol } from '../../../r-bridge/lang-4.x/ast/model/nodes/r-symbol';

package/abstract-interpretation/data-frame/mappers/arguments.js

@@ -15,8 +15,8 @@ exports.isValidColName = isValidColName;
 exports.parseRequestContent = parseRequestContent;
 const vertex_1 = require("../../../dataflow/graph/vertex");
 const make_argument_1 = require("../../../dataflow/internal/process/functions/call/argument/make-argument");
+const model_1 = require("../../../r-bridge/lang-4.x/ast/model/model");
 const r_function_call_1 = require("../../../r-bridge/lang-4.x/ast/model/nodes/r-function-call");
-const visitor_1 = require("../../../r-bridge/lang-4.x/ast/model/processing/visitor");
 const type_1 = require("../../../r-bridge/lang-4.x/ast/model/type");
 const convert_values_1 = require("../../../r-bridge/lang-4.x/convert-values");
 const assert_1 = require("../../../util/assert");
@@ -133,7 +133,7 @@ function getUnresolvedSymbolsInExpression(expression, dfg) {
         return [];
     }
     const unresolvedSymbols = [];
-    (0, visitor_1.visitAst)(expression, node => {
+    model_1.RNode.visitAst(expression, node => {
         if (node.type === type_1.RType.Symbol) {
             const vertex = dfg.get(node.info.id);
             if ((0, vertex_1.isUseVertex)(vertex?.[0]) && vertex[1].size === 0) {

package/abstract-interpretation/domains/set-range-domain.js

@@ -61,7 +61,7 @@ class SetRangeDomain extends abstract_domain_1.AbstractDomain {
         if (this.value === lattice_1.Bottom) {
             return lattice_1.Bottom;
         }
-        else if (this.value.range == lattice_1.Top) {
+        else if (this.value.range === lattice_1.Top) {
             return lattice_1.Top;
         }
         return this.value.min.union(this.value.range);

package/abstract-interpretation/normalized-ast-fold.d.ts

@@ -12,7 +12,7 @@ import type { RPipe } from '../r-bridge/lang-4.x/ast/model/nodes/r-pipe';
 import type { RUnaryOp } from '../r-bridge/lang-4.x/ast/model/nodes/r-unary-op';
 import type { RParameter } from '../r-bridge/lang-4.x/ast/model/nodes/r-parameter';
 import type { RArgument } from '../r-bridge/lang-4.x/ast/model/nodes/r-argument';
-import type { RAccess } from '../r-bridge/lang-4.x/ast/model/nodes/r-access';
+import { RAccess } from '../r-bridge/lang-4.x/ast/model/nodes/r-access';
 import type { RLogical } from '../r-bridge/lang-4.x/ast/model/nodes/r-logical';
 import type { RBreak } from '../r-bridge/lang-4.x/ast/model/nodes/r-break';
 import type { RComment } from '../r-bridge/lang-4.x/ast/model/nodes/r-comment';
@@ -21,7 +21,7 @@ import type { RNumber } from '../r-bridge/lang-4.x/ast/model/nodes/r-number';
 import type { RLineDirective } from '../r-bridge/lang-4.x/ast/model/nodes/r-line-directive';
 import type { RString } from '../r-bridge/lang-4.x/ast/model/nodes/r-string';
 import type { RSymbol } from '../r-bridge/lang-4.x/ast/model/nodes/r-symbol';
-import type { RProject } from '../r-bridge/lang-4.x/ast/model/nodes/r-project';
+import { RProject } from '../r-bridge/lang-4.x/ast/model/nodes/r-project';
 type FoldOfType<T extends RType, Returns = void, Info = NoInfo> = (node: Extract<RNode<Info>, {
     type: T;
 }>) => Returns;

package/abstract-interpretation/normalized-ast-fold.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultNormalizedAstFold = void 0;
 const r_function_call_1 = require("../r-bridge/lang-4.x/ast/model/nodes/r-function-call");
 const type_1 = require("../r-bridge/lang-4.x/ast/model/type");
+const r_access_1 = require("../r-bridge/lang-4.x/ast/model/nodes/r-access");
 const r_project_1 = require("../r-bridge/lang-4.x/ast/model/nodes/r-project");
 /**
  * Default implementation of a fold over the normalized AST (using the classic fold traversal).
@@ -65,12 +66,12 @@ class DefaultNormalizedAstFold {
         if (Array.isArray(nodes)) {
             const n = nodes;
             return this.concatAll(n.filter(n => n && n !== r_function_call_1.EmptyArgument)
-                .map(node => (0, r_project_1.isRProject)(node) ?
+                .map(node => r_project_1.RProject.is(node) ?
                 this.concatAll(node.files.map(f => this.foldSingle(f.root))) :
                 this.foldSingle(node)));
         }
         else if (nodes) {
-            if ((0, r_project_1.isRProject)(nodes)) {
+            if (r_project_1.RProject.is(nodes)) {
                 return this.concatAll(nodes.files.map(f => this.foldSingle(f.root)));
             }
             return this.foldSingle(nodes);
@@ -87,7 +88,7 @@ class DefaultNormalizedAstFold {
     }
     foldRAccess(access) {
         let accessed = this.foldSingle(access.accessed);
-        if (access.operator === '[' || access.operator === '[[') {
+        if (r_access_1.RAccess.isIndex(access)) {
             accessed = this.concat(accessed, this.fold(access.access));
         }
         return accessed;

package/benchmark/slicer.js

@@ -16,8 +16,6 @@ const strings_1 = require("../util/text/strings");
 const default_pipelines_1 = require("../core/steps/pipeline/default-pipelines");
 const retriever_1 = require("../r-bridge/retriever");
 const collect_all_1 = require("../slicing/criterion/collect-all");
-const type_1 = require("../r-bridge/lang-4.x/ast/model/type");
-const visitor_1 = require("../r-bridge/lang-4.x/ast/model/processing/visitor");
 const size_of_1 = require("./stats/size-of");
 const shell_1 = require("../r-bridge/shell");
 const tree_sitter_types_1 = require("../r-bridge/lang-4.x/tree-sitter/tree-sitter-types");
@@ -31,6 +29,8 @@ const lattice_1 = require("../abstract-interpretation/domains/lattice");
 const set_range_domain_1 = require("../abstract-interpretation/domains/set-range-domain");
 const fs_1 = __importDefault(require("fs"));
 const flowr_analyzer_context_1 = require("../project/context/flowr-analyzer-context");
+const r_project_1 = require("../r-bridge/lang-4.x/ast/model/nodes/r-project");
+const r_comment_1 = require("../r-bridge/lang-4.x/ast/model/nodes/r-comment");
 /**
  * The logger to be used for benchmarking as a global object.
  */
@@ -127,9 +127,9 @@ class BenchmarkSlicer {
         let nodesNoComments = 0;
         let commentChars = 0;
         let commentCharsNoWhitespace = 0;
-        (0, visitor_1.visitAst)(this.normalizedAst.ast.files.map(f => f.root), t => {
+        r_project_1.RProject.visitAst(this.normalizedAst.ast, t => {
             nodes++;
-            const comments = t.info.adToks?.filter(t => t.type === type_1.RType.Comment);
+            const comments = t.info.adToks?.filter(r_comment_1.RComment.is);
             if (comments && comments.length > 0) {
                 const content = comments.map(c => c.lexeme ?? '').join('');
                 commentChars += content.length;
@@ -271,7 +271,7 @@ class BenchmarkSlicer {
                 stats.numberOfResultingValues++;
             }
         }
-        (0, visitor_1.visitAst)(this.normalizedAst.ast.files.map(file => file.root), node => {
+        r_project_1.RProject.visitAst(this.normalizedAst.ast, node => {
             const operations = inference.getAbstractOperations(node.info.id);
             const value = inference.getAbstractValue(node.info.id);
             // Only store per-node information for nodes representing expressions or nodes with abstract values

package/benchmark/summarizer/first-phase/process.js

@@ -50,10 +50,10 @@ const summarizer_1 = require("../../../util/summarizer");
 const assert_1 = require("../../../util/assert");
 const shell_1 = require("../../../r-bridge/shell");
 const retriever_1 = require("../../../r-bridge/retriever");
-const visitor_1 = require("../../../r-bridge/lang-4.x/ast/model/processing/visitor");
-const type_1 = require("../../../r-bridge/lang-4.x/ast/model/type");
 const arrays_1 = require("../../../util/collections/arrays");
 const semantics_1 = require("../../../abstract-interpretation/data-frame/semantics");
+const r_project_1 = require("../../../r-bridge/lang-4.x/ast/model/nodes/r-project");
+const r_comment_1 = require("../../../r-bridge/lang-4.x/ast/model/nodes/r-comment");
 const tempfile = (() => {
     let _tempfile = undefined;
     return () => {
@@ -159,9 +159,9 @@ async function summarizeSlicerStats(stats, report = () => {
             let numberOfNormalizedTokensNoComments = 0;
             let commentChars = 0;
             let commentCharsNoWhitespace = 0;
-            (0, visitor_1.visitAst)(reParsed.ast.files.map(f => f.root), t => {
+            r_project_1.RProject.visitAst(reParsed.ast, t => {
                 numberOfNormalizedTokens++;
-                const comments = t.info.adToks?.filter(t => t.type === type_1.RType.Comment);
+                const comments = t.info.adToks?.filter(r_comment_1.RComment.is);
                 if (comments && comments.length > 0) {
                     const content = comments.map(c => c.lexeme ?? '').join('');
                     commentChars += content.length;

package/cli/repl/commands/repl-normalize.js

@@ -39,7 +39,7 @@ const ast_1 = require("../../../util/mermaid/ast");
 const ansi_1 = require("../../../util/text/ansi");
 const core_1 = require("../core");
 const defaultmap_1 = require("../../../util/collections/defaultmap");
-const visitor_1 = require("../../../r-bridge/lang-4.x/ast/model/processing/visitor");
+const r_project_1 = require("../../../r-bridge/lang-4.x/ast/model/nodes/r-project");
 function formatInfo(out, type, meta) {
     return out.formatter.format(`Copied ${type} to clipboard (normalize: ${meta['.meta'].timing + 'ms'}).`, { color: 7 /* Colors.White */, effect: ansi_1.ColorEffect.Foreground, style: 3 /* FontStyles.Italic */ });
 }
@@ -93,7 +93,7 @@ exports.normalizeHashCommand = {
         const counts = new defaultmap_1.DefaultMap(() => 0);
         let total = 0;
         const files = result.ast.files.length;
-        (0, visitor_1.visitAst)(result.ast.files.map(f => f.root), n => {
+        r_project_1.RProject.visitAst(result.ast, n => {
             counts.set(n.type, counts.get(n.type) + 1);
             total++;
         });

package/cli/repl/core.js

@@ -110,7 +110,7 @@ function replCompleter(line, config) {
 function replQueryCompleter(splitLine, startingNewArg, config) {
     const nonEmpty = splitLine.slice(1).map(s => s.trim()).filter(s => s.length > 0);
     const queryShorts = Object.keys(query_1.SupportedQueries).map(q => `@${q}`).concat(['help']);
-    if (nonEmpty.length == 0 || (nonEmpty.length == 1 && queryShorts.some(q => q.startsWith(nonEmpty[0]) && nonEmpty[0] !== q && !startingNewArg))) {
+    if (nonEmpty.length === 0 || (nonEmpty.length === 1 && queryShorts.some(q => q.startsWith(nonEmpty[0]) && nonEmpty[0] !== q && !startingNewArg))) {
         return { completions: queryShorts.map(q => `${q} `) };
     }
     else {
@@ -141,7 +141,7 @@ function makeDefaultReplReadline(config) {
  */
 function handleString(code) {
     return {
-        rCode: code.length == 0 ? undefined : (0, strings_1.startAndEndsWith)(code, '"') ? JSON.parse(code) : code,
+        rCode: code.length === 0 ? undefined : (0, strings_1.startAndEndsWith)(code, '"') ? JSON.parse(code) : code,
         remaining: []
     };
 }

package/config.js

@@ -213,7 +213,7 @@ function getEngineConfig(config, engine) {
         return defaultEngineConfigs[engine];
     }
     else {
-        return engines.find(e => e.type == engine);
+        return engines.find(e => e.type === engine);
     }
 }
 function loadConfigFromFile(configFile, workingDirectory) {

package/control-flow/control-flow-graph.d.ts

@@ -1,4 +1,4 @@
-import type { NodeId } from '../r-bridge/lang-4.x/ast/model/processing/node-id';
+import { NodeId } from '../r-bridge/lang-4.x/ast/model/processing/node-id';
 import type { MergeableRecord } from '../util/objects';
 import { RFalse, RTrue } from '../r-bridge/lang-4.x/convert-values';
 /**

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

@@ -343,7 +343,7 @@ exports.CfgVertex = {
      */
     fromExitId(exitId) {
         if (typeof exitId === 'string' && exitId.endsWith('-e')) {
-            return (0, node_id_1.normalizeIdToNumberIfPossible)(exitId.slice(0, -2));
+            return node_id_1.NodeId.normalize(exitId.slice(0, -2));
         }
         else {
             return exitId;
@@ -564,7 +564,6 @@ class ControlFlowGraph {
      */
     addVertex(vertex, rootVertex = true) {
         const vid = exports.CfgVertex.getId(vertex);
-        (0, assert_1.guard)(!this.vtxInfos.has(vid), `Node with id ${vid} already exists`);
         if (exports.CfgVertex.isBlock(vertex)) {
             this._mayBB = true;
             const elems = exports.CfgVertex.getBasicBlockElements(vertex);

package/control-flow/extract-cfg.js

@@ -6,6 +6,7 @@ exports.extractCfgQuick = extractCfgQuick;
 exports.getCallsInCfg = getCallsInCfg;
 exports.cfg2quads = cfg2quads;
 const quads_1 = require("../util/quads");
+const r_function_definition_1 = require("../r-bridge/lang-4.x/ast/model/nodes/r-function-definition");
 const r_function_call_1 = require("../r-bridge/lang-4.x/ast/model/nodes/r-function-call");
 const linker_1 = require("../dataflow/internal/linker");
 const vertex_1 = require("../dataflow/graph/vertex");
@@ -14,13 +15,13 @@ const cfg_simplification_1 = require("./cfg-simplification");
 const assert_1 = require("../util/assert");
 const built_in_1 = require("../dataflow/environments/built-in");
 const stateful_fold_1 = require("../r-bridge/lang-4.x/ast/model/processing/stateful-fold");
-const type_1 = require("../r-bridge/lang-4.x/ast/model/type");
+const model_1 = require("../r-bridge/lang-4.x/ast/model/model");
 const cfgFolds = {
     down: (n, down) => {
-        if (n.type === type_1.RType.FunctionDefinition) {
+        if (r_function_definition_1.RFunctionDefinition.is(n)) {
             return [down[0], true];
         }
-        else if (n.type === type_1.RType.ForLoop || n.type === type_1.RType.WhileLoop || n.type === type_1.RType.RepeatLoop) {
+        else if (model_1.RLoopConstructs.is(n)) {
             return [true, down[1]];
         }
         return down;

package/dataflow/cluster.js

@@ -30,18 +30,22 @@ function makeCluster(graph, from, notReached) {
     if (info.tag === vertex_1.VertexType.FunctionDefinition) {
         for (const { nodeId } of info.exitPoints) {
             if (notReached.delete(nodeId)) {
-                makeCluster(graph, nodeId, notReached).forEach(n => nodes.add(n));
+                for (const m of makeCluster(graph, nodeId, notReached)) {
+                    nodes.add(m);
+                }
             }
         }
     }
     // cluster adjacent edges
-    for (const [dest, e] of [...graph.outgoingEdges(from) ?? [], ...graph.ingoingEdges(from) ?? []]) {
-        // don't cluster for function content if it isn't returned
-        if (edge_1.DfEdge.doesNotIncludeType(e, edge_1.EdgeType.Returns) && info.onlyBuiltin && info.name == '{') {
-            continue;
-        }
-        if (notReached.delete(dest)) {
-            makeCluster(graph, dest, notReached).forEach(n => nodes.add(n));
+    for (const edges of [graph.outgoingEdges(from), graph.ingoingEdges(from)]) {
+        for (const [dest, e] of edges ?? []) {
+            // don't cluster for function content if it isn't returned
+            if (edge_1.DfEdge.doesNotIncludeType(e, edge_1.EdgeType.Returns) && info.onlyBuiltin && info.name === '{') {
+                continue;
+            }
+            if (notReached.delete(dest)) {
+                makeCluster(graph, dest, notReached).forEach(n => nodes.add(n));
+            }
         }
     }
     return nodes;