@eagleoutice/flowr 2.8.15 → 2.9.1

package/r-bridge/lang-4.x/ast/parser/main/internal/other/normalize-line-directive.js

@@ -25,7 +25,7 @@ function normalizeLineDirective(data, obj) {
             lexeme: content,
             info: {
                 fullRange: data.currentRange,
-                additionalTokens: [],
+                adToks: [],
                 fullLexeme: content
             },
             content: content.slice(1)
@@ -40,7 +40,7 @@ function normalizeLineDirective(data, obj) {
             lexeme: content,
             info: {
                 fullRange: data.currentRange,
-                additionalTokens: [],
+                adToks: [],
                 fullLexeme: content
             }
         };

package/r-bridge/lang-4.x/ast/parser/main/internal/structure/normalize-expressions.js

@@ -131,7 +131,7 @@ function processBraces([start, end], processed, comments, data) {
         lexeme: undefined,
         location: undefined,
         info: {
-            additionalTokens: comments,
+            adToks: comments,
         }
     };
 }
@@ -159,8 +159,8 @@ function normalizeExpressions(data, tokens) {
             }
             else if (processed.length > 0) {
                 if (parsedComments) {
-                    processed[0].info.additionalTokens ??= [];
-                    processed[0].info.additionalTokens.push(...parsedComments);
+                    processed[0].info.adToks ??= [];
+                    processed[0].info.adToks.push(...parsedComments);
                 }
                 return processed;
             }

package/r-bridge/lang-4.x/ast/parser/main/internal/structure/normalize-root.js

@@ -34,7 +34,7 @@ function normalizeRootObjToAst(data, obj, filePath) {
                     lexeme: undefined,
                     info: {
                         fullRange: data.currentRange,
-                        additionalTokens: delimiters,
+                        adToks: delimiters,
                         fullLexeme: data.currentLexeme
                     }
                 }

package/r-bridge/lang-4.x/ast/parser/main/internal/values/normalize-number.js

@@ -18,7 +18,7 @@ function normalizeNumber(data, obj) {
         lexeme: content,
         info: {
             fullRange: data.currentRange,
-            additionalTokens: [],
+            adToks: [],
             fullLexeme: data.currentLexeme
         }
     };
@@ -26,7 +26,6 @@ function normalizeNumber(data, obj) {
     if ((0, convert_values_1.isNA)(content)) {
         return {
             ...common,
-            namespace: undefined,
             type: type_1.RType.Symbol,
             content
         };

package/r-bridge/lang-4.x/ast/parser/main/internal/values/normalize-string.js

@@ -27,7 +27,7 @@ function normalizeString(data, obj) {
         lexeme: stringContent,
         info: {
             fullRange: data.currentRange,
-            additionalTokens: [],
+            adToks: [],
             fullLexeme: data.currentLexeme
         }
     };

package/r-bridge/lang-4.x/ast/parser/main/internal/values/normalize-symbol.d.ts

@@ -3,10 +3,9 @@ import type { RSymbol } from '../../../../model/nodes/r-symbol';
 import type { NamedJsonEntry } from '../../../json/format';
 /**
  * Normalize the given object as an R symbol (incorporating namespace information).
- * <p>
- * The special symbols `T` and `F` are parsed as logic values.
  * @param data - The data used by the parser (see {@link NormalizerData})
  * @param objs - The JSON object to extract the meta-information from
  * @returns The parsed symbol (with populated namespace information) or `undefined` if the given object is not a symbol.
+ * @see {@link RSymbol} for more information about R symbols.
  */
 export declare function tryNormalizeSymbol(data: NormalizerData, objs: readonly NamedJsonEntry[]): RSymbol | undefined;

package/r-bridge/lang-4.x/ast/parser/main/internal/values/normalize-symbol.js

@@ -3,44 +3,43 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryNormalizeSymbol = tryNormalizeSymbol;
 const assert_1 = require("../../../../../../../util/assert");
 const normalize_meta_1 = require("../../normalize-meta");
-const strings_1 = require("../../../../../../../util/text/strings");
 const type_1 = require("../../../../model/type");
+const identifier_1 = require("../../../../../../../dataflow/environments/identifier");
 /**
  * Normalize the given object as an R symbol (incorporating namespace information).
- * <p>
- * The special symbols `T` and `F` are parsed as logic values.
  * @param data - The data used by the parser (see {@link NormalizerData})
  * @param objs - The JSON object to extract the meta-information from
  * @returns The parsed symbol (with populated namespace information) or `undefined` if the given object is not a symbol.
+ * @see {@link RSymbol} for more information about R symbols.
  */
 function tryNormalizeSymbol(data, objs) {
     (0, assert_1.guard)(objs.length > 0, 'to parse symbols we need at least one object to work on!');
-    let location, content, namespace;
+    let content, location;
+    let meta;
     if (objs.length === 1 && (0, type_1.isSymbol)(objs[0].name)) {
-        const meta = (0, normalize_meta_1.retrieveMetaStructure)(objs[0].content);
+        meta = (0, normalize_meta_1.retrieveMetaStructure)(objs[0].content);
         location = meta.location;
-        content = meta.content;
-        namespace = undefined;
+        content = identifier_1.Identifier.make(meta.content);
     }
     else if (objs.length === 3 && (0, type_1.isSymbol)(objs[2].name)) {
-        const meta = (0, normalize_meta_1.retrieveMetaStructure)(objs[2].content);
+        meta = (0, normalize_meta_1.retrieveMetaStructure)(objs[2].content);
         location = meta.location;
-        content = meta.content;
-        namespace = (0, normalize_meta_1.retrieveMetaStructure)(objs[0].content).content;
+        const namespace = objs[0].content.text;
+        const internal = objs[1].content.text === ':::';
+        content = identifier_1.Identifier.make(meta.content, namespace, internal);
     }
     else {
         return undefined;
     }
     return {
         type: type_1.RType.Symbol,
-        namespace,
         location,
         // remove backticks from symbol
-        content: (0, strings_1.startAndEndsWith)(content, '`') ? content.substring(1, content.length - 1) : content,
-        lexeme: content,
+        content,
+        lexeme: meta.content,
         info: {
             fullRange: data.currentRange,
-            additionalTokens: [],
+            adToks: [],
             fullLexeme: data.currentLexeme
         }
     };

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

@@ -15,6 +15,7 @@ const r_function_call_1 = require("../ast/model/nodes/r-function-call");
 const strings_1 = require("../../../util/text/strings");
 const log_1 = require("../../../util/log");
 const parser_1 = require("../ast/parser/json/parser");
+const identifier_1 = require("../../../dataflow/environments/identifier");
 /**
  * @param tree - The tree to normalize
  * @param lax - Whether to use lax parsing (i.e., ignore errors) or strict parsing (i.e., fail on errors)
@@ -74,7 +75,7 @@ function convertTreeNode(node) {
             grouping: undefined,
             info: {
                 fullRange: (0, range_1.invalidRange)(),
-                additionalTokens: [],
+                adToks: [],
                 treeSitterId: -1,
             }
         };
@@ -86,7 +87,7 @@ function convertTreeNode(node) {
         const defaultInfo = {
             info: {
                 fullRange: range,
-                additionalTokens: [],
+                adToks: [],
                 fullLexeme: node.text,
                 treeSitterId: node.id
             }
@@ -102,7 +103,7 @@ function convertTreeNode(node) {
                     grouping: undefined,
                     lexeme: undefined,
                     info: {
-                        additionalTokens: remainingComments.map(c => c[1]),
+                        adToks: remainingComments.map(c => c[1]),
                         treeSitterId: node.id
                     }
                 };
@@ -125,19 +126,17 @@ function convertTreeNode(node) {
                             location: makeSourceRange(opening),
                             content: (0, retriever_1.removeRQuotes)(opening.text),
                             lexeme: opening.text,
-                            namespace: undefined,
                             ...defaultInfo
                         }, {
                             type: type_1.RType.Symbol,
                             location: makeSourceRange(closing),
                             content: (0, retriever_1.removeRQuotes)(closing.text),
                             lexeme: closing.text,
-                            namespace: undefined,
                             ...defaultInfo
                         }
                     ],
                     info: {
-                        additionalTokens: remainingComments.map(c => c[1]),
+                        adToks: remainingComments.map(c => c[1]),
                         treeSitterId: node.id
                     }
                 };
@@ -169,7 +168,6 @@ function convertTreeNode(node) {
                             location: opSource,
                             lexeme: op.text,
                             content: op.text,
-                            namespace: undefined,
                             info: {
                                 treeSitterId: op.id
                             }
@@ -187,7 +185,7 @@ function convertTreeNode(node) {
                         named: true,
                         infixSpecial: true,
                         info: {
-                            additionalTokens: comments,
+                            adToks: comments,
                             treeSitterId: node.id
                         }
                     };
@@ -202,7 +200,7 @@ function convertTreeNode(node) {
                         ...defaultInfo,
                         info: {
                             fullRange: range,
-                            additionalTokens: comments,
+                            adToks: comments,
                             fullLexeme: node.text,
                             treeSitterId: node.id
                         }
@@ -217,7 +215,7 @@ function convertTreeNode(node) {
                         lexeme: op.text,
                         info: {
                             fullRange: range,
-                            additionalTokens: comments,
+                            adToks: comments,
                             fullLexeme: node.text,
                             treeSitterId: node.id
                         }
@@ -236,13 +234,12 @@ function convertTreeNode(node) {
                 };
             }
             case tree_sitter_types_1.TreeSitterType.NamespaceOperator: {
-                const [lhs, /* :: or ::: */ , rhs] = nonErrorChildren(node);
+                const [lhs, int, rhs] = nonErrorChildren(node);
                 return {
                     type: type_1.RType.Symbol,
                     location: makeSourceRange(rhs),
-                    content: rhs.text,
+                    content: identifier_1.Identifier.make(rhs.text, lhs.text, int.text === ':::'),
                     lexeme: rhs.text,
-                    namespace: lhs.text,
                     ...defaultInfo
                 };
             }
@@ -259,7 +256,6 @@ function convertTreeNode(node) {
                     location: range,
                     content: (0, strings_1.startAndEndsWith)(node.text, '`') ? node.text.slice(1, -1) : (0, retriever_1.removeRQuotes)(node.text),
                     lexeme: node.text,
-                    namespace: undefined,
                     ...defaultInfo
                 };
             case tree_sitter_types_1.TreeSitterType.IfStatement: {
@@ -290,10 +286,9 @@ function convertTreeNode(node) {
                         location: makeSourceRange(variableNode),
                         content: (0, retriever_1.removeRQuotes)(variableNode.text),
                         lexeme: variableNode.text,
-                        namespace: undefined,
                         info: {
                             fullRange: undefined,
-                            additionalTokens: [],
+                            adToks: [],
                             fullLexeme: undefined,
                             treeSitterId: variableNode.id
                         }
@@ -304,7 +299,7 @@ function convertTreeNode(node) {
                     lexeme: forNode.text,
                     info: {
                         fullRange: range,
-                        additionalTokens: variableComments.concat(sequenceComments).map(c => c[1]),
+                        adToks: variableComments.concat(sequenceComments).map(c => c[1]),
                         fullLexeme: node.text,
                         treeSitterId: node.id
                     }
@@ -352,7 +347,7 @@ function convertTreeNode(node) {
                     ...defaultInfo,
                     info: {
                         ...defaultInfo.info,
-                        additionalTokens: comments.map(c => c[1]),
+                        adToks: comments.map(c => c[1]),
                     }
                 };
                 if (func.type === tree_sitter_types_1.TreeSitterType.Identifier || func.type === tree_sitter_types_1.TreeSitterType.String || func.type === tree_sitter_types_1.TreeSitterType.NamespaceOperator || func.type === tree_sitter_types_1.TreeSitterType.Return) {
@@ -361,7 +356,6 @@ function convertTreeNode(node) {
                         funcNode = {
                             ...funcNode,
                             type: type_1.RType.Symbol,
-                            namespace: undefined,
                             content: (0, retriever_1.removeRQuotes)(func.text)
                         };
                     }
@@ -372,7 +366,7 @@ function convertTreeNode(node) {
                             ...funcNode,
                             info: {
                                 fullRange: range,
-                                additionalTokens: [],
+                                adToks: [],
                                 fullLexeme: node.text,
                                 treeSitterId: node.id
                             }
@@ -401,7 +395,7 @@ function convertTreeNode(node) {
                     lexeme: name.text,
                     info: {
                         ...defaultInfo.info,
-                        additionalTokens: comments.map(c => c[1]),
+                        adToks: comments.map(c => c[1]),
                     }
                 };
             }
@@ -477,7 +471,7 @@ function convertTreeNode(node) {
                             lexeme: rhs?.text,
                             info: {
                                 fullRange: rhsRange,
-                                additionalTokens: [],
+                                adToks: [],
                                 fullLexeme: rhs?.text,
                                 treeSitterId: rhs?.id
                             }
@@ -504,7 +498,7 @@ function convertTreeNode(node) {
                         lexeme: name.text,
                         info: {
                             fullRange: range,
-                            additionalTokens: [],
+                            adToks: [],
                             fullLexeme: name.text,
                             treeSitterId: name.id
                         }
@@ -515,7 +509,7 @@ function convertTreeNode(node) {
                     lexeme: name.text,
                     info: {
                         fullRange: range,
-                        additionalTokens: [],
+                        adToks: [],
                         fullLexeme: name.text,
                         treeSitterId: name.id
                     }
@@ -542,8 +536,7 @@ function convertTreeNode(node) {
                         name = {
                             ...name,
                             type: type_1.RType.Symbol,
-                            content: name.content.str,
-                            namespace: undefined
+                            content: name.content.str
                         };
                     }
                     else if ((0, strings_1.startAndEndsWith)(name.content, '`')) {
@@ -558,7 +551,7 @@ function convertTreeNode(node) {
                         lexeme: nameNode.text,
                         info: {
                             fullRange: nameRange,
-                            additionalTokens: [],
+                            adToks: [],
                             fullLexeme: nameNode.text,
                             treeSitterId: nameNode.id
                         }
@@ -594,7 +587,7 @@ function convertTreeNode(node) {
         grouping: undefined,
         info: {
             fullRange: (0, range_1.invalidRange)(),
-            additionalTokens: [],
+            adToks: [],
             treeSitterId: -1,
         }
     };
@@ -629,7 +622,7 @@ function splitComments(nodes) {
                     location: makeSourceRange(node),
                     lexeme: node.text,
                     info: {
-                        additionalTokens: [],
+                        adToks: [],
                         fullLexeme: node.text,
                         treeSitterId: node.id
                     }
@@ -658,8 +651,8 @@ function linkCommentsToNextNodes(nodes, comments) {
         // if there is no valid sibling, we just link the comment to the first node (see normalize-expressions.ts)
         const [, node] = (sibling ? nodes.find(([s]) => s.equals(sibling)) : undefined) ?? nodes[0] ?? [];
         if (node) {
-            node.info.additionalTokens ??= [];
-            node.info.additionalTokens.push(commentNode);
+            node.info.adToks ??= [];
+            node.info.adToks.push(commentNode);
         }
         else {
             remain.push([commentSyntaxNode, commentNode]);

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

@@ -35,7 +35,7 @@ function parseRoxygenCommentsOfNode(node, idMap) {
     let comments;
     let cur = node;
     do {
-        comments = cur?.info.additionalTokens
+        comments = cur?.info.adToks
             ?.filter(r_comment_1.isRComment).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);

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

@@ -53,7 +53,7 @@ function makeMagicCommentHandler(and) {
             lines = new Set();
             const startLineStack = [];
             (0, visitor_1.visitAst)(normalizedAst.ast.files.map(f => f.root), n => {
-                const comments = n.info.additionalTokens;
+                const comments = n.info.adToks;
                 if (!comments) {
                     return;
                 }

package/reconstruct/reconstruct.js

@@ -13,8 +13,9 @@ 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");
 const auto_select_defaults_1 = require("./auto-select/auto-select-defaults");
+const identifier_1 = require("../dataflow/environments/identifier");
 function plain(text) {
-    return [{ line: text, indent: 0 }];
+    return [{ line: Array.isArray(text) ? identifier_1.Identifier.toString(text) : text, indent: 0 }];
 }
 exports.reconstructLogger = log_1.log.getSubLogger({ name: 'reconstruct' });
 function getLexeme(n) {
@@ -49,8 +50,8 @@ function reconstructExpressionList(exprList, _grouping, expressions, config) {
         if (g && fst.length > 0) {
             const start = g[0].content;
             const end = g[1].content;
-            fst[0].line = `${start}${start === '{' ? ' ' : ''}${fst[0].line}`;
-            fst[fst.length - 1].line = `${fst[fst.length - 1].line}${end === '}' ? ' ' : ''}${end}`;
+            fst[0].line = `${identifier_1.Identifier.toString(start)}${start === '{' ? ' ' : ''}${fst[0].line}`;
+            fst[fst.length - 1].line = `${fst[fst.length - 1].line}${end === '}' ? ' ' : ''}${identifier_1.Identifier.toString(end)}`;
         }
         return fst;
     }
@@ -323,13 +324,13 @@ function reconstructSpecialInfixFunctionCall(args, call) {
         const lhsText = lhs.map(l => `${getIndentString(l.indent)}${l.line}`).join('\n');
         if (rhs !== r_function_call_1.EmptyArgument && rhs.length > 0) {
             const rhsText = rhs.map(l => `${getIndentString(l.indent)}${l.line}`).join('\n');
-            return plain(`${lhsText} ${call.functionName.content} ${rhsText}`);
+            return plain(`${lhsText} ${identifier_1.Identifier.toString(call.functionName.content)} ${rhsText}`);
         }
         else {
             return plain(lhsText);
         }
     }
-    return plain(`${getLexeme(call.arguments[0])} ${call.functionName.content} ${getLexeme(call.arguments[1])}`);
+    return plain(`${getLexeme(call.arguments[0])} ${identifier_1.Identifier.toString(call.functionName.content)} ${getLexeme(call.arguments[1])}`);
 }
 function reconstructFunctionCall(call, functionName, args, configuration) {
     const selected = isSelected(configuration, call);

package/search/flowr-search-filters.js

@@ -8,6 +8,7 @@ exports.evalFilter = evalFilter;
 const type_1 = require("../r-bridge/lang-4.x/ast/model/type");
 const vertex_1 = require("../dataflow/graph/vertex");
 const search_enrichers_1 = require("./search-executor/search-enrichers");
+const identifier_1 = require("../dataflow/environments/identifier");
 var FlowrFilter;
 (function (FlowrFilter) {
     /**
@@ -43,7 +44,7 @@ exports.FlowrFilters = {
                 if (typeof fn === 'string' && args.test.test(fn)) {
                     return true;
                 }
-                if (typeof fn === 'object' && 'node' in fn && fn.node.type === type_1.RType.FunctionCall && fn.node.named && args.test.test(fn.node.functionName.content)) {
+                if (typeof fn === 'object' && 'node' in fn && fn.node.type === type_1.RType.FunctionCall && fn.node.named && args.test.test(identifier_1.Identifier.getName(fn.node.functionName.content))) {
                     return true;
                 }
             }

package/search/search-executor/search-enrichers.d.ts

@@ -1,7 +1,6 @@
 import type { FlowrSearchElement, FlowrSearchElements } from '../flowr-search';
 import type { ParentInformation } from '../../r-bridge/lang-4.x/ast/model/processing/decorate';
 import { type MergeableRecord } from '../../util/objects';
-import type { Identifier } from '../../dataflow/environments/identifier';
 import type { LinkToLastCall } from '../../queries/catalog/call-context-query/call-context-query-format';
 import { type NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import type { ControlFlowInformation } from '../../control-flow/control-flow-graph';
@@ -39,7 +38,7 @@ export interface CallTargetsContent extends MergeableRecord {
      * The call targets of the function call.
      * For identifier call targets, the identifier is the name of the library function being called.
      */
-    targets: (FlowrSearchElement<ParentInformation> | Identifier)[];
+    targets: (FlowrSearchElement<ParentInformation> | string)[];
 }
 export interface LastCallContent extends MergeableRecord {
     linkedIds: FlowrSearchElement<ParentInformation>[];

package/search/search-executor/search-enrichers.js

@@ -12,6 +12,7 @@ const cfg_simplification_1 = require("../../control-flow/cfg-simplification");
 const call_context_query_executor_1 = require("../../queries/catalog/call-context-query/call-context-query-executor");
 const cfg_kind_1 = require("../../project/cfg-kind");
 const identify_link_to_last_call_relation_1 = require("../../queries/catalog/call-context-query/identify-link-to-last-call-relation");
+const identifier_1 = require("../../dataflow/environments/identifier");
 /**
  * An enumeration that stores the names of the available enrichments that can be applied to a set of search elements.
  * See {@link FlowrSearchBuilder.with} for more information on how to apply enrichments.
@@ -49,7 +50,7 @@ exports.Enrichments = {
                                     node: n.idMap.get(o.id),
                                 };
                             case 3 /* OriginType.BuiltInFunctionOrigin */:
-                                return o.fn.name;
+                                return identifier_1.Identifier.toString(o.fn.name);
                             default:
                                 return undefined;
                         }

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

@@ -10,7 +10,7 @@ import type { ReadOnlyFlowrAnalyzerContext } from '../../project/context/flowr-a
 /**
  * Returns the function call targets (definitions) by the given caller
  */
-export declare function getAllFunctionCallTargets(dataflowGraph: DataflowGraph, callerInfo: DataflowGraphVertexFunctionCall, baseEnvironment: REnvironmentInformation, queue: VisitingQueue, ctx: ReadOnlyFlowrAnalyzerContext): [Set<DataflowGraphVertexInfo>, REnvironmentInformation];
+export declare function getAllFunctionCallTargetsForSlice(dataflowGraph: DataflowGraph, callerInfo: DataflowGraphVertexFunctionCall, baseEnvironment: REnvironmentInformation, queue: VisitingQueue, ctx: ReadOnlyFlowrAnalyzerContext): [Set<DataflowGraphVertexInfo>, REnvironmentInformation];
 /** returns the new threshold hit count */
 export declare function sliceForCall(current: NodeToSlice, callerInfo: DataflowGraphVertexFunctionCall, { graph }: DataflowInformation, queue: VisitingQueue, ctx: ReadOnlyFlowrAnalyzerContext): void;
 /** Returns true if we found at least one return edge */

package/slicing/static/slice-call.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAllFunctionCallTargets = getAllFunctionCallTargets;
+exports.getAllFunctionCallTargetsForSlice = getAllFunctionCallTargetsForSlice;
 exports.sliceForCall = sliceForCall;
 exports.handleReturns = handleReturns;
 const assert_1 = require("../../util/assert");
@@ -16,7 +16,7 @@ const static_slicer_1 = require("./static-slicer");
 /**
  * Returns the function call targets (definitions) by the given caller
  */
-function getAllFunctionCallTargets(dataflowGraph, callerInfo, baseEnvironment, queue, ctx) {
+function getAllFunctionCallTargetsForSlice(dataflowGraph, callerInfo, baseEnvironment, queue, ctx) {
     // bind with call-local environments during slicing
     const outgoingEdges = dataflowGraph.get(callerInfo.id, true);
     (0, assert_1.guard)(outgoingEdges !== undefined, () => `outgoing edges of id: ${callerInfo.id} must be in graph but can not be found, keep in slice to be sure`);
@@ -26,7 +26,7 @@ function getAllFunctionCallTargets(dataflowGraph, callerInfo, baseEnvironment, q
     (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) ?? [];
     for (const [target, outgoingEdge] of outgoingEdges[1].entries()) {
-        if ((0, edge_1.edgeIncludesType)(outgoingEdge.types, edge_1.EdgeType.Calls)) {
+        if (edge_1.DfEdge.includesType(outgoingEdge, edge_1.EdgeType.Calls)) {
             functionCallDefs.push(target);
         }
     }
@@ -60,7 +60,7 @@ function linkCallTargets(onlyForSideEffects, functionCallTargets, activeEnvironm
 }
 /** returns the new threshold hit count */
 function sliceForCall(current, callerInfo, { graph }, queue, ctx) {
-    const [functionCallTargets, activeEnvironment] = getAllFunctionCallTargets(graph, callerInfo, current.baseEnvironment, queue, ctx);
+    const [functionCallTargets, activeEnvironment] = getAllFunctionCallTargetsForSlice(graph, callerInfo, current.baseEnvironment, queue, ctx);
     if (functionCallTargets.size === 0) {
         /*
          * if we do not have any call to resolve this function, we have to assume that every function passed is actually called!
@@ -78,18 +78,18 @@ const PotentialFollowOnReturn = edge_1.EdgeType.DefinesOnCall | edge_1.EdgeType.
 /** Returns true if we found at least one return edge */
 function handleReturns(from, queue, currentEdges, baseEnvFingerprint, baseEnvironment) {
     const e = Array.from(currentEdges.entries());
-    const found = e.filter(([_, edge]) => (0, edge_1.edgeIncludesType)(edge.types, edge_1.EdgeType.Returns));
+    const found = e.filter(([_, edge]) => edge_1.DfEdge.includesType(edge, edge_1.EdgeType.Returns));
     if (found.length === 0) {
         return false;
     }
-    for (const [target,] of found) {
+    for (const [target] of found) {
         queue.add(target, baseEnvironment, baseEnvFingerprint, false);
     }
     for (const [target, edge] of e) {
-        if ((0, edge_1.edgeIncludesType)(edge.types, edge_1.EdgeType.Reads)) {
+        if (edge_1.DfEdge.includesType(edge, edge_1.EdgeType.Reads)) {
             queue.add(target, baseEnvironment, baseEnvFingerprint, false);
         }
-        else if ((0, edge_1.edgeIncludesType)(edge.types, PotentialFollowOnReturn)) {
+        else if (edge_1.DfEdge.includesType(edge, PotentialFollowOnReturn)) {
             (0, static_slicer_1.updatePotentialAddition)(queue, from, target, baseEnvironment, baseEnvFingerprint);
         }
     }

package/slicing/static/static-slicer.js

@@ -83,8 +83,8 @@ function staticSlice(ctx, info, { idMap }, criteria, direction, threshold = 75,
                 continue;
             }
         }
-        for (const [target, { types }] of currentEdges) {
-            const t = (0, edge_1.shouldTraverseEdge)(types);
+        for (const [target, e] of currentEdges) {
+            const t = (0, edge_1.shouldTraverseEdge)(e);
             switch (t) {
                 case 0 /* TraverseEdge.Never */:
                     continue;

package/statistics/features/common-syntax-probability.js

@@ -11,6 +11,7 @@ const numbers_1 = require("../../util/numbers");
 const summarizer_1 = require("../../util/summarizer");
 const convert_values_1 = require("../../r-bridge/lang-4.x/convert-values");
 const type_1 = require("../../r-bridge/lang-4.x/ast/model/type");
+const identifier_1 = require("../../dataflow/environments/identifier");
 /**
  *
  */
@@ -68,7 +69,7 @@ function updateCommonSyntaxTypeCounts(current, ...nodes) {
             incrementEntry(current.string, node.content.str);
             break;
         case type_1.RType.Symbol:
-            incrementEntry(current.singleVar, node.content);
+            incrementEntry(current.singleVar, identifier_1.Identifier.getName(node.content));
             break;
         case type_1.RType.Logical:
             incrementEntry(current.logical, node.content ? convert_values_1.RTrue : convert_values_1.RFalse);
@@ -89,7 +90,7 @@ function updateCommonSyntaxTypeCounts(current, ...nodes) {
                 current.unnamedCall++;
             }
             else {
-                incrementEntry(current.call, node.functionName.content);
+                incrementEntry(current.call, identifier_1.Identifier.getName(node.functionName.content));
             }
             break;
         case type_1.RType.BinaryOp:

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

@@ -26,7 +26,7 @@ function retrieveAllCallsites(input, node, recursiveCalls) {
     const dfStart = input.dataflow.graph.outgoingEdges(node.info.id);
     const callsites = [];
     for (const [target, edge] of dfStart ?? []) {
-        if (!(0, edge_1.edgeIncludesType)(edge.types, edge_1.EdgeType.Calls)) {
+        if (!edge_1.DfEdge.includesType(edge, edge_1.EdgeType.Calls)) {
             continue;
         }
         const loc = input.normalizedRAst.idMap.get(target)?.location;
@@ -83,7 +83,7 @@ function visitDefinitions(info, input) {
         const edges = input.dataflow.graph.ingoingEdges(node.info.id);
         if (edges !== undefined) {
             for (const [targetId, edge] of edges) {
-                if ((0, edge_1.edgeIncludesType)(edge.types, edge_1.EdgeType.DefinedBy)) {
+                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;
@@ -93,7 +93,7 @@ function visitDefinitions(info, input) {
                     info.assignedFunctions++;
                     (0, statistics_file_1.appendStatisticsFile)(exports.definedFunctions.name, 'assignedFunctions', [name ?? '<unknown>'], input.filepath);
                 }
-                if ((0, edge_1.edgeIncludesType)(edge.types, edge_1.EdgeType.Calls)) {
+                if (edge_1.DfEdge.includesType(edge, edge_1.EdgeType.Calls)) {
                     const target = input.normalizedRAst.idMap.get(targetId);
                     (0, assert_1.guard)(target !== undefined, 'Dataflow edge points to unknown node');
                 }