@eagleoutice/flowr 2.9.9 → 2.9.11

package/r-bridge/lang-4.x/tree-sitter/tree-sitter-normalize.js

@@ -260,7 +260,8 @@ function convertTreeNode(node) {
                     ...defaultInfo
                 };
             case tree_sitter_types_1.TreeSitterType.IfStatement: {
-                const [ifNode, /* ( */ , condition, /* ) */ , then, /* else */ , ...otherwise] = nonErrorChildren(node);
+                const [comments, children] = splitComments(nonErrorChildren(node));
+                const [ifNode, /* ( */ , condition, /* ) */ , then, /* else */ , ...otherwise] = children;
                 const filteredOtherwise = otherwise.filter(n => n.type !== tree_sitter_types_1.TreeSitterType.ElseStatement);
                 return {
                     type: type_1.RType.IfThenElse,
@@ -269,11 +270,14 @@ function convertTreeNode(node) {
                     otherwise: filteredOtherwise.length > 0 ? (0, normalize_meta_1.ensureExpressionList)(convertTreeNode(filteredOtherwise[0])) : undefined,
                     location: makeSourceRange(ifNode),
                     lexeme: ifNode.text,
-                    ...defaultInfo
+                    info: {
+                        ...defaultInfo.info,
+                        adToks: comments.map(c => c[1]),
+                    }
                 };
             }
             case tree_sitter_types_1.TreeSitterType.ForStatement: {
-                const children = nonErrorChildren(node);
+                const [comments, children] = splitComments(nonErrorChildren(node));
                 const forNode = children[0]; // we follow with a (
                 const variable = getNodesUntil(children, 'in', 2); // we follow with the "in"
                 const sequence = getNodesUntil(children, ')', 2 + variable.length + 1); // we follow with a (
@@ -300,31 +304,38 @@ function convertTreeNode(node) {
                     lexeme: forNode.text,
                     info: {
                         fullRange: range,
-                        adToks: variableComments.concat(sequenceComments).map(c => c[1]),
+                        adToks: variableComments.concat(comments, sequenceComments).map(c => c[1]),
                         fullLexeme: node.text,
                         tsId: node.id
                     }
                 };
             }
             case tree_sitter_types_1.TreeSitterType.WhileStatement: {
-                const [whileNode, /* ( */ , condition, /* ) */ , body] = nonErrorChildren(node);
+                const [comments, children] = splitComments(nonErrorChildren(node));
+                const [whileNode, /* ( */ , condition, /* ) */ , body] = children;
                 return {
                     type: type_1.RType.WhileLoop,
                     condition: convertTreeNode(condition),
                     body: (0, normalize_meta_1.ensureExpressionList)(convertTreeNode(body)),
                     location: makeSourceRange(whileNode),
                     lexeme: whileNode.text,
-                    ...defaultInfo
+                    info: {
+                        ...defaultInfo.info,
+                        adToks: comments.map(c => c[1]),
+                    }
                 };
             }
             case tree_sitter_types_1.TreeSitterType.RepeatStatement: {
-                const [repeatNode, body] = nonErrorChildren(node);
+                const [comments, [repeatNode, body]] = splitComments(nonErrorChildren(node));
                 return {
                     type: type_1.RType.RepeatLoop,
                     body: (0, normalize_meta_1.ensureExpressionList)(convertTreeNode(body)),
                     location: makeSourceRange(repeatNode),
                     lexeme: repeatNode.text,
-                    ...defaultInfo
+                    info: {
+                        ...defaultInfo.info,
+                        adToks: comments.map(c => c[1]),
+                    }
                 };
             }
             case tree_sitter_types_1.TreeSitterType.Call: {
@@ -404,7 +415,7 @@ function convertTreeNode(node) {
                 return {
                     type: type_1.RType.String,
                     location: range,
-                    content: (0, convert_values_1.string2ts)(node.text),
+                    content: convert_values_1.RStringValue.fromRLexeme(node.text),
                     lexeme: node.text,
                     ...defaultInfo
                 };
@@ -416,7 +427,7 @@ function convertTreeNode(node) {
                 return {
                     type: type_1.RType.Number,
                     location: range,
-                    content: (0, convert_values_1.number2ts)(node.text),
+                    content: convert_values_1.RNumberValue.fromRLexeme(node.text),
                     lexeme: node.text,
                     ...defaultInfo
                 };
@@ -449,7 +460,8 @@ function convertTreeNode(node) {
                 const [func, content] = nonErrorChildren(node);
                 // bracket is now [ or [[ and argsClosing is x] or x]]
                 const [bracket, ...argsClosing] = nonErrorChildren(content);
-                const args = (0, arrays_1.splitArrayOn)(argsClosing.slice(0, -1), x => x.type === 'comma');
+                const [argsComments, argsNoComments] = splitComments(argsClosing.slice(0, -1));
+                const args = (0, arrays_1.splitArrayOn)(argsNoComments, x => x.type === 'comma');
                 return {
                     type: type_1.RType.Access,
                     operator: bracket.text,
@@ -457,7 +469,10 @@ function convertTreeNode(node) {
                     access: args.map(n => n.length === 0 ? r_function_call_1.EmptyArgument : convertTreeNode(n[0])),
                     location: makeSourceRange(bracket),
                     lexeme: bracket.text,
-                    ...defaultInfo
+                    info: {
+                        ...defaultInfo.info,
+                        adToks: argsComments.map(c => c[1]),
+                    }
                 };
             }
             case tree_sitter_types_1.TreeSitterType.ExtractOperator: {
@@ -523,7 +538,7 @@ function convertTreeNode(node) {
                 };
             }
             case tree_sitter_types_1.TreeSitterType.Argument: {
-                const children = nonErrorChildren(node);
+                const [commentChildren, children] = splitComments(nonErrorChildren(node));
                 if (children.length === 1) {
                     const [arg] = children;
                     return {
@@ -532,7 +547,10 @@ function convertTreeNode(node) {
                         value: convertTreeNode(arg),
                         location: range,
                         lexeme: node.text,
-                        ...defaultInfo
+                        info: {
+                            ...defaultInfo.info,
+                            adToks: commentChildren.map(c => c[1]),
+                        }
                     };
                 }
                 else {
@@ -558,7 +576,7 @@ function convertTreeNode(node) {
                         lexeme: nameNode.text,
                         info: {
                             fullRange: nameRange,
-                            adToks: [],
+                            adToks: commentChildren.map(c => c[1]),
                             fullLexeme: nameNode.text,
                             tsId: nameNode.id
                         }

package/r-bridge/roxygen2/roxygen-parse.js

@@ -36,7 +36,7 @@ function parseRoxygenCommentsOfNode(node, idMap) {
     let cur = node;
     do {
         comments = cur?.info.adToks
-            ?.filter(r_comment_1.isRComment).filter(r => (0, assert_1.isNotUndefined)(r.lexeme));
+            ?.filter(r_comment_1.RComment.is).filter(r => (0, assert_1.isNotUndefined)(r.lexeme));
         cur = cur?.info.parent ? idMap?.get(cur.info.parent) : undefined;
     } while ((comments === undefined || comments.length === 0) && cur !== undefined);
     if (comments === undefined || comments.length === 0) {

package/r-bridge/shell-executor.js

@@ -35,7 +35,7 @@ class RShellExecutor {
      * Adds commands that should be executed for every {@link RShellExecutor#run|run}.
      */
     addPrerequisites(commands) {
-        this.prerequisites.push(...(typeof commands == 'string' ? [commands] : commands));
+        this.prerequisites.push(...(typeof commands === 'string' ? [commands] : commands));
         return this;
     }
     /**

package/reconstruct/auto-select/magic-comments.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeMagicCommentHandler = makeMagicCommentHandler;
-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 r_comment_1 = require("../../r-bridge/lang-4.x/ast/model/nodes/r-comment");
 const assert_1 = require("../../util/assert");
+const r_project_1 = require("../../r-bridge/lang-4.x/ast/model/nodes/r-project");
 function getLoc({ location, info: { fullRange } }) {
     const loc = location ?? fullRange;
     (0, assert_1.guard)(loc !== undefined, 'TODO: support location-less nodes!');
@@ -52,13 +52,13 @@ function makeMagicCommentHandler(and) {
         if (!lines) {
             lines = new Set();
             const startLineStack = [];
-            (0, visitor_1.visitAst)(normalizedAst.ast.files.map(f => f.root), n => {
+            r_project_1.RProject.visitAst(normalizedAst.ast, n => {
                 const comments = n.info.adToks;
                 if (!comments) {
                     return;
                 }
                 for (const c of comments) {
-                    if (c.type !== type_1.RType.Comment || !c.lexeme.startsWith('# flowr@')) {
+                    if (!r_comment_1.RComment.is(c) || !c.lexeme.startsWith('# flowr@')) {
                         continue;
                     }
                     const match = commentTriggerRegex.exec(c.lexeme);

package/reconstruct/reconstruct.js

@@ -9,6 +9,7 @@ exports.reconstructLogger = void 0;
 exports.reconstructToCode = reconstructToCode;
 const log_1 = require("../util/log");
 const assert_1 = require("../util/assert");
+const model_1 = require("../r-bridge/lang-4.x/ast/model/model");
 const type_1 = require("../r-bridge/lang-4.x/ast/model/type");
 const r_function_call_1 = require("../r-bridge/lang-4.x/ast/model/nodes/r-function-call");
 const stateful_fold_1 = require("../r-bridge/lang-4.x/ast/model/processing/stateful-fold");
@@ -19,7 +20,7 @@ function plain(text) {
 }
 exports.reconstructLogger = log_1.log.getSubLogger({ name: 'reconstruct' });
 function getLexeme(n) {
-    return n.info.fullLexeme ?? n.lexeme ?? '';
+    return model_1.RNode.lexeme(n) ?? '';
 }
 function reconstructAsLeaf(leaf, configuration) {
     const selectionHasLeaf = configuration.selection.has(leaf.info.id) || configuration.autoSelectIf(leaf, configuration.fullAst);

package/search/search-executor/search-generators.js

@@ -7,8 +7,8 @@ const parse_1 = require("../../slicing/criterion/parse");
 const assert_1 = require("../../util/assert");
 const query_1 = require("../../queries/query");
 const search_enrichers_1 = require("./search-enrichers");
-const visitor_1 = require("../../r-bridge/lang-4.x/ast/model/processing/visitor");
 const log_1 = require("../../util/log");
+const r_project_1 = require("../../r-bridge/lang-4.x/ast/model/nodes/r-project");
 exports.searchLogger = log_1.log.getSubLogger({ name: 'search' });
 /**
  * All supported generators!
@@ -110,7 +110,7 @@ async function generateSyntax(input, args) {
         return new flowr_search_1.FlowrSearchElements([]);
     }
     const nodesByTreeSitterId = new Map();
-    (0, visitor_1.visitAst)((await input.normalize()).ast.files.map(f => f.root), node => {
+    r_project_1.RProject.visitAst((await input.normalize()).ast, node => {
         const treeSitterInfo = node.info;
         if (treeSitterInfo.tsId) {
             nodesByTreeSitterId.set(treeSitterInfo.tsId, node);

package/slicing/criterion/filters/all-variables.js

@@ -16,7 +16,7 @@ const defaultAllVariablesCollectorFolds = {
     foldNumber: onLeaf,
     foldString: onLeaf,
     foldLogical: onLeaf,
-    foldSymbol: (symbol) => (0, r_symbol_1.isSpecialSymbol)(symbol) ? [] : [symbol.info.id],
+    foldSymbol: (symbol) => r_symbol_1.RSymbol.isSpecial(symbol) ? [] : [symbol.info.id],
     foldAccess: (_, name, access) => [...name, ...access.filter(assert_1.isNotNull).flat()],
     foldBinaryOp: onBinary,
     foldPipe: onBinary,

package/slicing/criterion/parse.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 { AstIdMap } from '../../r-bridge/lang-4.x/ast/model/processing/decorate';
 /** Either `line:column`, `line@variable-name`, or `$id` */
 export type SingleSlicingCriterion = `${number}:${number}` | `${number}@${string}` | `$${NodeId | number}`;

package/slicing/criterion/parse.js

@@ -25,11 +25,13 @@ exports.CriteriaParseError = CriteriaParseError;
 function slicingCriterionToId(criterion, idMap) {
     let resolved;
     if (criterion.startsWith('$')) {
-        resolved = (0, node_id_1.normalizeIdToNumberIfPossible)(criterion.substring(1));
+        resolved = node_id_1.NodeId.normalize(criterion.substring(1));
     }
     else if (criterion.includes('@')) {
-        const [line, name] = criterion.split(/@(.*)/s); // only split at first occurrence
-        resolved = conventionalCriteriaToId(parseInt(line), name, idMap);
+        const at = criterion.indexOf('@');
+        const line = parseInt(criterion.substring(0, at));
+        const name = criterion.substring(at + 1);
+        resolved = conventionalCriteriaToId(line, name, idMap);
     }
     else if (criterion.includes(':')) {
         const [line, column] = criterion.split(':').map(c => parseInt(c));

package/slicing/static/slice-call.d.ts

@@ -4,7 +4,7 @@ import { type Fingerprint } from './fingerprint';
 import type { DataflowGraphVertexFunctionCall, DataflowGraphVertexInfo } from '../../dataflow/graph/vertex';
 import type { REnvironmentInformation } from '../../dataflow/environments/environment';
 import { type DataflowGraph, type OutgoingEdges } from '../../dataflow/graph/graph';
-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 { DataflowInformation } from '../../dataflow/info';
 import type { ReadOnlyFlowrAnalyzerContext } from '../../project/context/flowr-analyzer-context';
 /**

package/slicing/static/slice-call.js

@@ -7,9 +7,9 @@ const assert_1 = require("../../util/assert");
 const fingerprint_1 = require("./fingerprint");
 const linker_1 = require("../../dataflow/internal/linker");
 const graph_1 = require("../../dataflow/graph/graph");
-const built_in_1 = require("../../dataflow/environments/built-in");
 const resolve_by_name_1 = require("../../dataflow/environments/resolve-by-name");
 const edge_1 = require("../../dataflow/graph/edge");
+const node_id_1 = require("../../r-bridge/lang-4.x/ast/model/processing/node-id");
 const identifier_1 = require("../../dataflow/environments/identifier");
 const built_in_function_definition_1 = require("../../dataflow/internal/process/functions/call/built-in/built-in-function-definition");
 const static_slicer_1 = require("./static-slicer");
@@ -24,7 +24,7 @@ function getAllFunctionCallTargetsForSlice(dataflowGraph, callerInfo, baseEnviro
     const activeEnvironment = (0, built_in_function_definition_1.retrieveActiveEnvironment)(callerInfo.environment, baseEnvironment, ctx);
     const name = callerInfo.name;
     (0, assert_1.guard)(name !== undefined, () => `name of id: ${callerInfo.id} can not be found in id map`);
-    const functionCallDefs = (0, resolve_by_name_1.resolveByName)(name, activeEnvironment, identifier_1.ReferenceType.Unknown)?.filter(d => !(0, built_in_1.isBuiltIn)(d.definedAt))?.map(d => d.nodeId) ?? [];
+    const functionCallDefs = (0, resolve_by_name_1.resolveByName)(name, activeEnvironment, identifier_1.ReferenceType.Unknown)?.filter(d => !node_id_1.NodeId.isBuiltIn(d.definedAt))?.map(d => d.nodeId) ?? [];
     for (const [target, outgoingEdge] of outgoingEdges[1].entries()) {
         if (edge_1.DfEdge.includesType(outgoingEdge, edge_1.EdgeType.Calls)) {
             functionCallDefs.push(target);

package/statistics/features/supported/assignments/assignments.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.assignments = exports.AssignmentOperators = void 0;
 const common_syntax_probability_1 = require("../../common-syntax-probability");
 const post_process_1 = require("./post-process");
-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 operators_1 = require("../../../../r-bridge/lang-4.x/ast/model/operators");
+const model_1 = require("../../../../r-bridge/lang-4.x/ast/model/model");
 const initialAssignmentInfo = {
     // operator to occurrence count
     assignmentOperator: {},
@@ -17,7 +17,7 @@ const initialAssignmentInfo = {
 exports.AssignmentOperators = new Set(operators_1.Operators.filter(op => operators_1.OperatorDatabase[op].usedAs === 'assignment'));
 function visitAssignment(info, input) {
     const assignmentStack = [];
-    (0, visitor_1.visitAst)(input.normalizedRAst.ast.files.map(r => r.root), node => {
+    model_1.RNode.visitAst(input.normalizedRAst.ast.files.map(r => r.root), node => {
         if (node.type !== type_1.RType.BinaryOp || !exports.AssignmentOperators.has(node.operator)) {
             return;
         }

package/statistics/features/supported/control-flow/control-flow.js

@@ -5,7 +5,7 @@ const common_syntax_probability_1 = require("../../common-syntax-probability");
 const post_process_1 = require("./post-process");
 const unpack_argument_1 = require("../../../../dataflow/internal/process/functions/call/argument/unpack-argument");
 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 r_project_1 = require("../../../../r-bridge/lang-4.x/ast/model/nodes/r-project");
 const initialControlflowInfo = {
     ifThen: (0, common_syntax_probability_1.emptyCommonSyntaxTypeCounts)(),
     thenBody: (0, common_syntax_probability_1.emptyCommonSyntaxTypeCounts)(),
@@ -20,7 +20,7 @@ const initialControlflowInfo = {
 };
 function visitIfThenElse(info, input) {
     const ifThenElseStack = [];
-    (0, visitor_1.visitAst)(input.normalizedRAst.ast.files.map(f => f.root), node => {
+    r_project_1.RProject.visitAst(input.normalizedRAst.ast, node => {
         if (node.type !== type_1.RType.IfThenElse) {
             if (node.type === type_1.RType.FunctionCall && node.named && node.functionName.content === 'switch') {
                 const initialArg = (0, unpack_argument_1.unpackNonameArg)(node.arguments[0]);

package/statistics/features/supported/data-access/data-access.js

@@ -5,10 +5,11 @@ const common_syntax_probability_1 = require("../../common-syntax-probability");
 const post_process_1 = require("./post-process");
 const assert_1 = require("../../../../util/assert");
 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 role_1 = require("../../../../r-bridge/lang-4.x/ast/model/processing/role");
 const statistics_file_1 = require("../../../output/statistics-file");
 const r_function_call_1 = require("../../../../r-bridge/lang-4.x/ast/model/nodes/r-function-call");
+const r_project_1 = require("../../../../r-bridge/lang-4.x/ast/model/nodes/r-project");
+const model_1 = require("../../../../r-bridge/lang-4.x/ast/model/model");
 const initialDataAccessInfo = {
     // for the nth argument, how many of them are constant, etc.
     singleBracket: {
@@ -46,7 +47,7 @@ function visitAccess(info, input) {
     const accessNest = [];
     const accessChain = [];
     const parentRoleCache = new Map();
-    (0, visitor_1.visitAst)(input.normalizedRAst.ast.files.map(f => f.root), node => {
+    r_project_1.RProject.visitAst(input.normalizedRAst.ast, node => {
         if (node.type !== type_1.RType.Access) {
             return;
         }
@@ -54,11 +55,11 @@ function visitAccess(info, input) {
         let acc = false;
         let idxAcc = false;
         for (const role of roles) {
-            if (role === "accessed" /* RoleInParent.Accessed */) {
+            if (role === "acc" /* RoleInParent.Accessed */) {
                 acc = true;
                 break; // we only account for the first one
             }
-            else if (role === "index-acc" /* RoleInParent.IndexAccess */) {
+            else if (role === "idx-acc" /* RoleInParent.IndexAccess */) {
                 idxAcc = true;
                 break;
             }
@@ -76,7 +77,7 @@ function visitAccess(info, input) {
         }
         parentRoleCache.set(node.info.id, { acc, idxAcc });
         if (accessNest.length === 0 && accessChain.length === 0) { // store topmost, after add as it must not be a child to do that
-            (0, statistics_file_1.appendStatisticsFile)(exports.dataAccess.name, 'dataAccess', [node.info.fullLexeme ?? node.lexeme], input.filepath);
+            (0, statistics_file_1.appendStatisticsFile)(exports.dataAccess.name, 'dataAccess', [model_1.RNode.lexeme(node)], input.filepath);
         }
         const op = node.operator;
         switch (op) {

package/statistics/features/supported/defined-functions/defined-functions.js

@@ -6,9 +6,10 @@ const range_1 = require("../../../../util/range");
 const assert_1 = require("../../../../util/assert");
 const edge_1 = require("../../../../dataflow/graph/edge");
 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 statistics_file_1 = require("../../../output/statistics-file");
 const vertex_1 = require("../../../../dataflow/graph/vertex");
+const r_project_1 = require("../../../../r-bridge/lang-4.x/ast/model/nodes/r-project");
+const model_1 = require("../../../../r-bridge/lang-4.x/ast/model/model");
 const initialFunctionDefinitionInfo = {
     /** all, anonymous, assigned, non-assigned, ... */
     total: 0,
@@ -45,7 +46,7 @@ function retrieveAllCallsites(input, node, recursiveCalls) {
 function visitDefinitions(info, input) {
     const definitionStack = [];
     const allDefinitions = [];
-    (0, visitor_1.visitAst)(input.normalizedRAst.ast.files.map(f => f.root), node => {
+    r_project_1.RProject.visitAst(input.normalizedRAst.ast, node => {
         if (node.type !== type_1.RType.FunctionDefinition) {
             return;
         }
@@ -67,15 +68,15 @@ function visitDefinitions(info, input) {
         if (definitionStack.length > 0) {
             info.nestedFunctions++;
             info.deepestNesting = Math.max(info.deepestNesting, definitionStack.length);
-            (0, statistics_file_1.appendStatisticsFile)(exports.definedFunctions.name, 'nested-definitions', [node.info.fullLexeme ?? node.lexeme], input.filepath);
+            (0, statistics_file_1.appendStatisticsFile)(exports.definedFunctions.name, 'nested-definitions', [model_1.RNode.lexeme(node)], input.filepath);
         }
         // parameter names:
-        const parameterNames = node.parameters.map(p => p.info.fullLexeme ?? p.lexeme);
+        const parameterNames = node.parameters.map(model_1.RNode.lexeme);
         (0, statistics_file_1.appendStatisticsFile)(exports.definedFunctions.name, 'usedParameterNames', parameterNames, input.filepath);
         const isLambda = node.lexeme.startsWith('\\');
         if (isLambda) {
             info.lambdasOnly++;
-            (0, statistics_file_1.appendStatisticsFile)(exports.definedFunctions.name, 'allLambdas', [node.info.fullLexeme ?? node.lexeme], input.filepath);
+            (0, statistics_file_1.appendStatisticsFile)(exports.definedFunctions.name, 'allLambdas', [model_1.RNode.lexeme(node)], input.filepath);
         }
         definitionStack.push(node);
         // we find definitions with silly defined-by edges
@@ -86,7 +87,7 @@ function visitDefinitions(info, input) {
                 if (edge_1.DfEdge.includesType(edge, edge_1.EdgeType.DefinedBy)) {
                     const target = input.normalizedRAst.idMap.get(targetId);
                     (0, assert_1.guard)(target !== undefined, 'Dataflow edge points to unknown node');
-                    const name = target.info.fullLexeme ?? target.lexeme;
+                    const name = model_1.RNode.lexeme(target);
                     if (name) {
                         assigned.add(name);
                     }
@@ -101,14 +102,14 @@ function visitDefinitions(info, input) {
         }
         // track all calls with the same name that do not already have a bound calls edge, superfluous if recursive tracking is explicit
         const recursiveCalls = [];
-        (0, visitor_1.visitAst)(node.body, n => {
+        model_1.RNode.visitAst(node.body, n => {
             if (n.type === type_1.RType.FunctionCall && n.named && assigned.has(n.functionName.lexeme)) {
                 recursiveCalls.push(n);
             }
         });
         // one recursive definition, but we record all
         info.recursive += recursiveCalls.length > 0 ? 1 : 0;
-        (0, statistics_file_1.appendStatisticsFile)(exports.definedFunctions.name, 'recursive', recursiveCalls.map(n => n.info.fullLexeme ?? n.lexeme ?? 'unknown'), input.filepath);
+        (0, statistics_file_1.appendStatisticsFile)(exports.definedFunctions.name, 'recursive', recursiveCalls.map(n => model_1.RNode.lexeme(n) ?? 'unknown'), input.filepath);
         const lexeme = node.info.fullLexeme;
         const lexemeSplit = lexeme?.split('\n');
         allDefinitions.push({

package/statistics/features/supported/expression-list/statistics-expression-list.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.expressionList = void 0;
 const post_process_1 = require("./post-process");
-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 r_project_1 = require("../../../../r-bridge/lang-4.x/ast/model/nodes/r-project");
 const initialExpressionListInfo = {
     allExpressionLists: 0,
     deepestNesting: 0
@@ -11,7 +11,7 @@ const initialExpressionListInfo = {
 function visitLists(info, input) {
     let nest = -1; // we start with nesting 0
     let total = 0;
-    (0, visitor_1.visitAst)(input.normalizedRAst.ast.files.map(f => f.root), node => {
+    r_project_1.RProject.visitAst(input.normalizedRAst.ast, node => {
         if (node.type === type_1.RType.ExpressionList) {
             nest++;
             total++;

package/statistics/features/supported/loops/loops.js

@@ -5,7 +5,8 @@ const common_syntax_probability_1 = require("../../common-syntax-probability");
 const post_process_1 = require("./post-process");
 const type_1 = require("../../../../r-bridge/lang-4.x/ast/model/type");
 const statistics_file_1 = require("../../../output/statistics-file");
-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");
+const model_1 = require("../../../../r-bridge/lang-4.x/ast/model/model");
 const initialLoopInfo = {
     forLoops: (0, common_syntax_probability_1.emptyCommonSyntaxTypeCounts)(),
     forLoopVar: (0, common_syntax_probability_1.emptyCommonSyntaxTypeCounts)(),
@@ -25,7 +26,7 @@ const isImplicitLoop = /[lsvmt]?apply/;
 function visitLoops(info, input) {
     // holds number of loops and their nesting depths
     const loopStack = [];
-    (0, visitor_1.visitAst)(input.normalizedRAst.ast.files.map(f => f.root), node => {
+    r_project_1.RProject.visitAst(input.normalizedRAst.ast, node => {
         switch (node.type) {
             case type_1.RType.Next:
                 info.nextStatements++;
@@ -36,7 +37,7 @@ function visitLoops(info, input) {
             case type_1.RType.FunctionCall:
                 if (node.named && isImplicitLoop.test(node.functionName.lexeme)) {
                     info.implicitLoops++;
-                    (0, statistics_file_1.appendStatisticsFile)(exports.loops.name, 'implicit-loop', [node.functionName.info.fullLexeme ?? node.functionName.lexeme], input.filepath);
+                    (0, statistics_file_1.appendStatisticsFile)(exports.loops.name, 'implicit-loop', [model_1.RNode.lexeme(node.functionName)], input.filepath);
                 }
                 return;
             case type_1.RType.ForLoop:
@@ -54,7 +55,7 @@ function visitLoops(info, input) {
                 break;
             default: return;
         }
-        (0, statistics_file_1.appendStatisticsFile)(exports.loops.name, 'all-loops', [node.info.fullLexeme ?? node.lexeme], input.filepath);
+        (0, statistics_file_1.appendStatisticsFile)(exports.loops.name, 'all-loops', [model_1.RNode.lexeme(node)], input.filepath);
         if (loopStack.length > 0) {
             info.nestedExplicitLoops++;
             info.deepestExplicitNesting = Math.max(info.deepestExplicitNesting, loopStack.length);
@@ -62,7 +63,7 @@ function visitLoops(info, input) {
         loopStack.push(node);
     }, node => {
         // drop again :D
-        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)) {
             loopStack.pop();
         }
     });

package/statistics/features/supported/used-functions/used-functions.js

@@ -4,12 +4,12 @@ exports.usedFunctions = exports.AllCallsFileBase = void 0;
 const common_syntax_probability_1 = require("../../common-syntax-probability");
 const post_process_1 = require("./post-process");
 const unpack_argument_1 = require("../../../../dataflow/internal/process/functions/call/argument/unpack-argument");
-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 statistics_file_1 = require("../../../output/statistics-file");
 const edge_1 = require("../../../../dataflow/graph/edge");
 const identifier_1 = require("../../../../dataflow/environments/identifier");
 const range_1 = require("../../../../util/range");
+const r_project_1 = require("../../../../r-bridge/lang-4.x/ast/model/nodes/r-project");
 const initialFunctionUsageInfo = {
     allFunctionCalls: 0,
     args: {
@@ -51,7 +51,7 @@ function classifyArguments(args, existing) {
 function visitCalls(info, input) {
     const calls = [];
     const allCalls = [];
-    (0, visitor_1.visitAst)(input.normalizedRAst.ast.files.map(f => f.root), node => {
+    r_project_1.RProject.visitAst(input.normalizedRAst.ast, node => {
         if (node.type !== type_1.RType.FunctionCall) {
             return;
         }

package/statistics/features/supported/variables/variables.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.variables = void 0;
 const post_process_1 = require("./post-process");
-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 r_symbol_1 = require("../../../../r-bridge/lang-4.x/ast/model/nodes/r-symbol");
 const statistics_file_1 = require("../../../output/statistics-file");
 const vertex_1 = require("../../../../dataflow/graph/vertex");
 const range_1 = require("../../../../util/range");
+const r_project_1 = require("../../../../r-bridge/lang-4.x/ast/model/nodes/r-project");
+const r_symbol_1 = require("../../../../r-bridge/lang-4.x/ast/model/nodes/r-symbol");
+const model_1 = require("../../../../r-bridge/lang-4.x/ast/model/model");
 const initialVariableInfo = {
     numberOfVariableUses: 0,
     numberOfDefinitions: 0,
@@ -16,8 +16,8 @@ const initialVariableInfo = {
     unknownVariables: 0
 };
 function visitVariables(info, input) {
-    (0, visitor_1.visitAst)(input.normalizedRAst.ast.files.map(f => f.root), node => {
-        if (node.type !== type_1.RType.Symbol || (0, r_symbol_1.isSpecialSymbol)(node)) {
+    r_project_1.RProject.visitAst(input.normalizedRAst.ast, node => {
+        if (!r_symbol_1.RSymbol.is(node) || r_symbol_1.RSymbol.isSpecial(node)) {
             return;
         }
         // search for the node in the DF graph
@@ -25,7 +25,7 @@ function visitVariables(info, input) {
         if (mayNode === undefined) {
             info.unknownVariables++;
             (0, statistics_file_1.appendStatisticsFile)(exports.variables.name, 'unknown', [[
-                    node.info.fullLexeme ?? node.lexeme,
+                    model_1.RNode.lexeme(node),
                     range_1.SourceRange.getStart(node.location)
                 ]], input.filepath);
             return;
@@ -33,7 +33,7 @@ function visitVariables(info, input) {
         const [dfNode] = mayNode;
         if (dfNode.tag === vertex_1.VertexType.VariableDefinition) {
             info.numberOfDefinitions++;
-            const lexeme = node.info.fullLexeme ?? node.lexeme;
+            const lexeme = model_1.RNode.lexeme(node);
             (0, statistics_file_1.appendStatisticsFile)(exports.variables.name, 'definedVariables', [[
                     lexeme,
                     range_1.SourceRange.getStart(node.location)
@@ -43,7 +43,7 @@ function visitVariables(info, input) {
         else if (dfNode.tag === 'use') {
             info.numberOfVariableUses++;
             (0, statistics_file_1.appendStatisticsFile)(exports.variables.name, 'usedVariables', [[
-                    node.info.fullLexeme ?? node.lexeme,
+                    model_1.RNode.lexeme(node),
                     range_1.SourceRange.getStart(node.location)
                 ]], input.filepath);
         }

package/util/mermaid/ast.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizedAstToMermaid = normalizedAstToMermaid;
 exports.normalizedAstToMermaidUrl = normalizedAstToMermaidUrl;
 const mermaid_1 = require("./mermaid");
-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 r_function_call_1 = require("../../r-bridge/lang-4.x/ast/model/nodes/r-function-call");
 const flowr_file_1 = require("../../project/context/flowr-file");
 const info_1 = require("./info");
+const model_1 = require("../../r-bridge/lang-4.x/ast/model/model");
 function identifyMermaidDirection(prefix) {
     const directionMatch = prefix.match(/flowchart (TD|LR|RL|BT)/);
     if (directionMatch) {
@@ -31,7 +31,7 @@ function normalizedAstToMermaid(ast, { prefix = 'flowchart TD\n', markStyle = in
         }
         if (n.info.parent !== undefined && (!includeOnlyIds || includeOnlyIds.has(n.info.parent))) {
             const context = n.info;
-            const roleSuffix = context.role === "expr-list-child" /* RoleInParent.ExpressionListChild */ || context.role === "call-arg" /* RoleInParent.FunctionCallArgument */ || context.role === "param" /* RoleInParent.FunctionDefinitionParameter */ ? `-${context.index}` : '';
+            const roleSuffix = context.role === "el-c" /* RoleInParent.ExpressionListChild */ || context.role === "call-arg" /* RoleInParent.FunctionCallArgument */ || context.role === "param" /* RoleInParent.FunctionDefinitionParameter */ ? `-${context.index}` : '';
             output += `    n${n.info.parent} -->|"${context.role}${roleSuffix}"| n${n.info.id}\n`;
         }
         if (n.type === type_1.RType.ExpressionList && n.grouping !== undefined) {
@@ -40,7 +40,7 @@ function normalizedAstToMermaid(ast, { prefix = 'flowchart TD\n', markStyle = in
         }
     }
     function showAst(ast) {
-        (0, visitor_1.visitAst)(ast, n => {
+        model_1.RNode.visitAst(ast, n => {
             showNode(n);
             if (n.type === 'RAccess' && (n.operator !== '[' && n.operator !== '[[')) {
                 for (const k of n.access) {