@eagleoutice/flowr 2.9.10 → 2.9.12

package/dataflow/internal/linker.js

@@ -235,7 +235,7 @@ function linkFunctionCallWithSingleTarget(graph, { subflow: fnSubflow, exitPoint
                 continue;
             }
             for (const { nodeId, type, value } of defs) {
-                if (!(0, built_in_1.isBuiltIn)(nodeId)) {
+                if (!node_id_1.NodeId.isBuiltIn(nodeId)) {
                     graph.addEdge(ingoing.nodeId, nodeId, edge_1.EdgeType.DefinedByOnCall);
                     graph.addEdge(id, nodeId, edge_1.EdgeType.DefinesOnCall);
                     if (type === identifier_1.ReferenceType.Function && ingoing.type === identifier_1.ReferenceType.S7MethodPrefix && Array.isArray(value)) {
@@ -291,7 +291,7 @@ function linkFunctionCall(graph, id, info, idMap, thisGraph, calledFunctionDefin
     }
     const functionDefinitionReadIds = new Set();
     for (const [t, e] of edges.entries()) {
-        if (!(0, built_in_1.isBuiltIn)(t) && edge_1.DfEdge.doesNotIncludeType(e, edge_1.EdgeType.Argument) && edge_1.DfEdge.includesType(e, FCallLinkReadBits)) {
+        if (!node_id_1.NodeId.isBuiltIn(t) && edge_1.DfEdge.doesNotIncludeType(e, edge_1.EdgeType.Argument) && edge_1.DfEdge.includesType(e, FCallLinkReadBits)) {
             functionDefinitionReadIds.add(t);
         }
     }
@@ -391,22 +391,22 @@ function getAllLinkedFunctionDefinitions(functionDefinitionReadIds, dataflowGrap
     while (potential.length !== 0) {
         const cid = potential.pop();
         visited.add(cid);
-        if ((0, built_in_1.isBuiltIn)(cid)) {
+        if (node_id_1.NodeId.isBuiltIn(cid)) {
             builtIns.add(cid);
             continue;
         }
-        const currentInfo = dataflowGraph.get(cid, true);
-        if (currentInfo === undefined) {
+        const vertex = dataflowGraph.getVertex(cid);
+        if (vertex === undefined) {
             continue;
         }
-        const [vertex, edges] = currentInfo;
         // Found a function definition
         if (vertex.subflow !== undefined) {
             result.add(vertex);
             continue;
         }
         let hasReturnEdge = false;
-        for (const [target, e] of edges) {
+        const outgoing = dataflowGraph.outgoingEdges(cid) ?? [];
+        for (const [target, e] of outgoing) {
             if (edge_1.DfEdge.includesType(e, edge_1.EdgeType.Returns)) {
                 hasReturnEdge = true;
                 if (!visited.has(target)) {
@@ -417,7 +417,7 @@ function getAllLinkedFunctionDefinitions(functionDefinitionReadIds, dataflowGrap
         if (vertex.tag === vertex_1.VertexType.FunctionCall || hasReturnEdge || (vertex.tag === vertex_1.VertexType.VariableDefinition && vertex.par)) {
             continue;
         }
-        for (const [target, e] of edges) {
+        for (const [target, e] of outgoing) {
             if (edge_1.DfEdge.includesType(e, LinkedFnFollowBits) && !visited.has(target)) {
                 potential.push(target);
             }
@@ -438,7 +438,6 @@ function linkInputs(referencesToLinkAgainstEnvironment, environmentInformation,
     for (const bodyInput of referencesToLinkAgainstEnvironment) {
         const probableTarget = bodyInput.name ? (0, resolve_by_name_1.resolveByName)(bodyInput.name, environmentInformation, bodyInput.type) : undefined;
         if (probableTarget === undefined) {
-            log_1.log.trace(`found no target for ${bodyInput.name ? identifier_1.Identifier.toString(bodyInput.name) : '<no-name>'}`);
             if (maybeForRemaining) {
                 bodyInput.cds ??= [];
             }
@@ -496,7 +495,9 @@ function linkCircularRedefinitionsWithinALoop(graph, openIns, outgoing) {
  */
 function reapplyLoopExitPoints(exits, references, graph) {
     // just apply the cds of all exit points not already present
-    const exitCds = new Set(exits.flatMap(e => e.cds?.map(info_1.negateControlDependency)).filter(assert_1.isNotUndefined));
+    const exitCds = exits.flatMap(e => e.cds?.map(info_1.negateControlDependency))
+        .filter(assert_1.isNotUndefined)
+        .map(cd => ({ ...cd, byIteration: true }));
     const seenRefs = new Set();
     for (const ref of references) {
         if (seenRefs.has(ref.nodeId)) {
@@ -508,12 +509,12 @@ function reapplyLoopExitPoints(exits, references, graph) {
             let setVertex = false;
             if (ref.cds) {
                 if (!ref.cds?.find(c => c.id === cId)) {
-                    ref.cds.push({ ...cd, byIteration: true });
+                    ref.cds.push(cd);
                     setVertex = true;
                 }
             }
             else {
-                ref.cds = [{ ...cd, byIteration: true }];
+                ref.cds = [cd];
                 setVertex = true;
             }
             if (setVertex) {
@@ -521,11 +522,11 @@ function reapplyLoopExitPoints(exits, references, graph) {
                 if (vertex) {
                     if (vertex.cds) {
                         if (!vertex.cds?.find(c => c.id === cId)) {
-                            vertex.cds.push({ ...cd, byIteration: true });
+                            vertex.cds.push(cd);
                         }
                     }
                     else {
-                        vertex.cds = [{ ...cd, byIteration: true }];
+                        vertex.cds = [cd];
                     }
                 }
             }

package/dataflow/internal/process/functions/call/argument/make-argument.d.ts

@@ -2,6 +2,7 @@ import type { RNode } from '../../../../../../r-bridge/lang-4.x/ast/model/model'
 import type { AstIdMap, ParentInformation } from '../../../../../../r-bridge/lang-4.x/ast/model/processing/decorate';
 import { EmptyArgument } from '../../../../../../r-bridge/lang-4.x/ast/model/nodes/r-function-call';
 import type { RUnnamedArgument } from '../../../../../../r-bridge/lang-4.x/ast/model/nodes/r-argument';
+import { RArgument } from '../../../../../../r-bridge/lang-4.x/ast/model/nodes/r-argument';
 /**
  * Converts a normalized node into an unnamed argument (wraps it with an argument node).
  */
@@ -9,4 +10,4 @@ export declare function toUnnamedArgument<OtherInfo>(node: RNode<OtherInfo & Par
 /**
  * Wraps the given nodes as unnamed arguments where necessary.
  */
-export declare function wrapArgumentsUnnamed<OtherInfo>(nodes: readonly (RNode<OtherInfo & ParentInformation> | typeof EmptyArgument | undefined)[], idMap: AstIdMap<OtherInfo>): ("<>" | import("../../../../../../r-bridge/lang-4.x/ast/model/nodes/r-argument").RArgument<OtherInfo & ParentInformation>)[];
+export declare function wrapArgumentsUnnamed<OtherInfo>(nodes: readonly (RNode<OtherInfo & ParentInformation> | typeof EmptyArgument | undefined)[], idMap: AstIdMap<OtherInfo>): ("<>" | RArgument<OtherInfo & ParentInformation>)[];

package/dataflow/internal/process/functions/call/argument/make-argument.js

@@ -4,6 +4,7 @@ exports.toUnnamedArgument = toUnnamedArgument;
 exports.wrapArgumentsUnnamed = wrapArgumentsUnnamed;
 const range_1 = require("../../../../../../util/range");
 const r_function_call_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/nodes/r-function-call");
+const r_argument_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/nodes/r-argument");
 const type_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/type");
 const graph_1 = require("../../../../../graph/graph");
 /**
@@ -31,6 +32,6 @@ function toUnnamedArgument(node, idMap) {
  * Wraps the given nodes as unnamed arguments where necessary.
  */
 function wrapArgumentsUnnamed(nodes, idMap) {
-    return nodes.map(n => graph_1.FunctionArgument.isEmpty(n) || n?.type === type_1.RType.Argument ? n : toUnnamedArgument(n, idMap));
+    return nodes.map(n => graph_1.FunctionArgument.isEmpty(n) || r_argument_1.RArgument.is(n) ? n : toUnnamedArgument(n, idMap));
 }
 //# sourceMappingURL=make-argument.js.map

package/dataflow/internal/process/functions/call/built-in/built-in-access.d.ts

@@ -3,7 +3,7 @@ import type { DataflowInformation } from '../../../../../info';
 import type { ParentInformation } from '../../../../../../r-bridge/lang-4.x/ast/model/processing/decorate';
 import { type RFunctionArgument } 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';
-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 { ForceArguments } from '../common';
 /**
  * Processes different types of access operations.

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

@@ -4,6 +4,7 @@ exports.processAccess = processAccess;
 exports.symbolArgumentsToStrings = symbolArgumentsToStrings;
 const known_call_handling_1 = require("../known-call-handling");
 const r_function_call_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/nodes/r-function-call");
+const node_id_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/processing/node-id");
 const logger_1 = require("../../../../../logger");
 const type_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/type");
 const edge_1 = require("../../../../../graph/edge");
@@ -94,7 +95,7 @@ function processAccess(name, args, rootId, data, config) {
 function processNumberBasedAccess(data, name, args, rootId, config, head) {
     const existing = data.environment.current.memory.get(':=');
     const outInfo = { definitionRootNodes: [] };
-    const tableAssignId = (0, built_in_1.builtInId)(':=-table');
+    const tableAssignId = node_id_1.NodeId.toBuiltIn(':=-table');
     data.environment.current.memory.set(':=', [{
             type: identifier_1.ReferenceType.BuiltInFunction,
             definedAt: tableAssignId,

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

@@ -15,6 +15,7 @@ const r_value_1 = require("../../../../../eval/values/r-value");
 const log_1 = require("../../../../../../util/log");
 const alias_tracking_1 = require("../../../../../eval/resolve/alias-tracking");
 const built_in_1 = require("../../../../../environments/built-in");
+const r_string_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/nodes/r-string");
 /**
  * Process an apply call like `vapply` or `mapply`.
  */
@@ -65,13 +66,10 @@ function processApply(name, args, rootId, data, config) {
     let functionName = undefined;
     let anonymous = false;
     const val = arg.value;
-    if (unquoteFunction && val.type === type_1.RType.String) {
+    if (unquoteFunction && r_string_1.RString.is(val)) {
         functionId = val.info.id;
         functionName = val.content.str;
-        information = {
-            ...information,
-            in: [...information.in, { type: identifier_1.ReferenceType.Function, name: functionName, cds: data.cds, nodeId: functionId }]
-        };
+        information.in = [...information.in, { type: identifier_1.ReferenceType.Function, name: functionName, cds: data.cds, nodeId: functionId }];
     }
     else if (val.type === type_1.RType.Symbol) {
         functionId = val.info.id;

package/dataflow/internal/process/functions/call/built-in/built-in-expression-list.d.ts

@@ -4,7 +4,7 @@
  */
 import type { DataflowInformation } from '../../../../../info';
 import { type DataflowProcessorInformation } from '../../../../../processor';
-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 { ParentInformation } from '../../../../../../r-bridge/lang-4.x/ast/model/processing/decorate';
 import type { RFunctionArgument } 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/dataflow/internal/process/functions/call/built-in/built-in-expression-list.js

@@ -7,6 +7,7 @@ const linker_1 = require("../../../../linker");
 const assert_1 = require("../../../../../../util/assert");
 const unpack_argument_1 = require("../argument/unpack-argument");
 const common_1 = require("../common");
+const node_id_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/processing/node-id");
 const graph_1 = require("../../../../../graph/graph");
 const identifier_1 = require("../../../../../environments/identifier");
 const resolve_by_name_1 = require("../../../../../environments/resolve-by-name");
@@ -20,13 +21,13 @@ const log_1 = require("../../../../../../util/log");
 const reference_to_maybe_1 = require("../../../../../environments/reference-to-maybe");
 function linkReadNameToWriteIfPossible(read, environments, listEnvironments, remainingRead, nextGraph) {
     const readName = read.name && identifier_1.Identifier.isDotDotDotAccess(read.name) ? identifier_1.Identifier.dotdotdot() : read.name;
-    const readId = readName ? identifier_1.Identifier.getName(readName) : undefined;
     const probableTarget = readName ? (0, resolve_by_name_1.resolveByName)(readName, environments, read.type) : undefined;
     // record if at least one has not been defined
     if (probableTarget === undefined || probableTarget.some(t => !listEnvironments.has(t.nodeId) || !(0, info_1.happensInEveryBranch)(t.cds))) {
+        const readId = readName ? identifier_1.Identifier.getName(readName) : undefined;
         const has = remainingRead.get(readId);
         if (has) {
-            if (!has?.some(h => h.nodeId === read.nodeId && h.name === read.name && h.cds === read.cds)) {
+            if (!has.some(h => h.nodeId === read.nodeId && h.name === read.name && h.cds === read.cds)) {
                 has.push(read);
             }
         }
@@ -42,7 +43,7 @@ function linkReadNameToWriteIfPossible(read, environments, listEnvironments, rem
     const rid = read.nodeId;
     for (const target of probableTarget) {
         const tid = target.nodeId;
-        if ((read.type === identifier_1.ReferenceType.Function || read.type === identifier_1.ReferenceType.BuiltInFunction) && (0, built_in_1.isBuiltIn)(target.definedAt)) {
+        if (node_id_1.NodeId.isBuiltIn(target.definedAt) && (read.type === identifier_1.ReferenceType.Function || read.type === identifier_1.ReferenceType.BuiltInFunction)) {
             nextGraph.addEdge(rid, tid, edge_1.EdgeType.Reads | edge_1.EdgeType.Calls);
         }
         else {
@@ -66,7 +67,7 @@ function updateSideEffectsForCalledFunctions(calledEnvs, inputEnvironment, nextG
             while (!current?.builtInEnv) {
                 for (const definitions of current.memory.values()) {
                     for (const def of definitions) {
-                        if (!(0, built_in_1.isBuiltIn)(def.definedAt)) {
+                        if (!node_id_1.NodeId.isBuiltIn(def.definedAt)) {
                             hasUpdate = true;
                             nextGraph.addEdge(def.nodeId, functionCall, edge_1.EdgeType.SideEffectOnCall);
                         }
@@ -179,7 +180,7 @@ function processExpressionList(name, args, rootId, data) {
             argumentProcessResult: processedExpressions,
             origin: built_in_1.BuiltInProcName.ExpressionList
         });
-        nextGraph.addEdge(rootId, (0, built_in_1.builtInId)('{'), edge_1.EdgeType.Reads | edge_1.EdgeType.Calls);
+        nextGraph.addEdge(rootId, node_id_1.NodeId.toBuiltIn('{'), edge_1.EdgeType.Reads | edge_1.EdgeType.Calls);
         // process all exit points as potential returns:
         for (const exit of exitPoints) {
             if (exit.type === 1 /* ExitPointType.Return */ || exit.type === 0 /* ExitPointType.Default */) {

package/dataflow/internal/process/functions/call/built-in/built-in-function-definition.d.ts

@@ -3,7 +3,7 @@ import { type DataflowInformation } from '../../../../../info';
 import type { ParentInformation } from '../../../../../../r-bridge/lang-4.x/ast/model/processing/decorate';
 import type { RSymbol } from '../../../../../../r-bridge/lang-4.x/ast/model/nodes/r-symbol';
 import { type RFunctionArgument } from '../../../../../../r-bridge/lang-4.x/ast/model/nodes/r-function-call';
-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 { DataflowGraph } from '../../../../../graph/graph';
 import { type REnvironmentInformation } from '../../../../../environments/environment';
 import type { ReadOnlyFlowrAnalyzerContext } from '../../../../../../project/context/flowr-analyzer-context';

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

@@ -11,6 +11,7 @@ const unpack_argument_1 = require("../argument/unpack-argument");
 const assert_1 = require("../../../../../../util/assert");
 const logger_1 = require("../../../../../logger");
 const r_function_call_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/nodes/r-function-call");
+const node_id_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/processing/node-id");
 const graph_1 = require("../../../../../graph/graph");
 const identifier_1 = require("../../../../../environments/identifier");
 const overwrite_1 = require("../../../../../environments/overwrite");
@@ -248,7 +249,7 @@ function updateNestedFunctionCalls(graph, outEnvironment) {
         const collectedNextMethods = new Set();
         const treatAsS3 = origin.includes(built_in_1.BuiltInProcName.S3Dispatch);
         for (const target of targets) {
-            if ((0, built_in_1.isBuiltIn)(target)) {
+            if (node_id_1.NodeId.isBuiltIn(target)) {
                 graph.addEdge(id, target, edge_1.EdgeType.Calls);
                 continue;
             }
@@ -289,7 +290,7 @@ function updateNestedFunctionCalls(graph, outEnvironment) {
                 const inId = ingoing.nodeId;
                 (0, log_1.expensiveTrace)(logger_1.dataflowLogger, () => `Found ${resolved.length} references to open ref ${id} in closure of function definition ${id}`);
                 for (const { nodeId } of resolved) {
-                    if (!(0, built_in_1.isBuiltIn)(nodeId)) {
+                    if (!node_id_1.NodeId.isBuiltIn(nodeId)) {
                         graph.addEdge(inId, nodeId, edge_1.EdgeType.DefinedByOnCall);
                         graph.addEdge(id, nodeId, edge_1.EdgeType.DefinesOnCall);
                     }

package/dataflow/internal/process/functions/call/built-in/built-in-if-then-else.js

@@ -14,8 +14,8 @@ const general_1 = require("../../../../../eval/values/general");
 const alias_tracking_1 = require("../../../../../eval/resolve/alias-tracking");
 const reference_to_maybe_1 = require("../../../../../environments/reference-to-maybe");
 const linker_1 = require("../../../../linker");
-const r_argument_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/nodes/r-argument");
 const built_in_1 = require("../../../../../environments/built-in");
+const r_argument_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/nodes/r-argument");
 function getArguments(config, args) {
     let condArg;
     let thenArg;
@@ -28,9 +28,9 @@ function getArguments(config, args) {
             '...': '...'
         };
         const argMaps = (0, linker_1.invertArgumentMap)((0, linker_1.pMatch)((0, common_1.convertFnArguments)(args), params));
-        condArg = (0, unpack_argument_1.unpackArg)((0, r_argument_1.getArgumentWithId)(args, argMaps.get('cond')?.[0]));
-        thenArg = (0, unpack_argument_1.unpackArg)((0, r_argument_1.getArgumentWithId)(args, argMaps.get('yes')?.[0]));
-        otherwiseArg = (0, unpack_argument_1.unpackArg)((0, r_argument_1.getArgumentWithId)(args, argMaps.get('no')?.[0]));
+        condArg = (0, unpack_argument_1.unpackArg)(r_argument_1.RArgument.getWithId(args, argMaps.get('cond')?.[0]));
+        thenArg = (0, unpack_argument_1.unpackArg)(r_argument_1.RArgument.getWithId(args, argMaps.get('yes')?.[0]));
+        otherwiseArg = (0, unpack_argument_1.unpackArg)(r_argument_1.RArgument.getWithId(args, argMaps.get('no')?.[0]));
     }
     else {
         [condArg, thenArg, otherwiseArg] = args.map(e => (0, unpack_argument_1.unpackArg)(e));

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

@@ -7,10 +7,10 @@ const known_call_handling_1 = require("../known-call-handling");
 const linker_1 = require("../../../../linker");
 const common_1 = require("../common");
 const unpack_argument_1 = require("../argument/unpack-argument");
-const r_argument_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/nodes/r-argument");
 const scoping_1 = require("../../../../../environments/scoping");
 const built_in_1 = require("../../../../../environments/built-in");
 const identifier_1 = require("../../../../../environments/identifier");
+const r_argument_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/nodes/r-argument");
 /**
  * Processes a built-in 'local' function call.
  */
@@ -24,8 +24,8 @@ function processLocal(name, args, rootId, data, config) {
         '...': '...'
     };
     const argMaps = (0, linker_1.invertArgumentMap)((0, linker_1.pMatch)((0, common_1.convertFnArguments)(args), params));
-    const env = (0, unpack_argument_1.unpackArg)((0, r_argument_1.getArgumentWithId)(args, argMaps.get('env')?.[0]));
-    const expr = (0, unpack_argument_1.unpackArg)((0, r_argument_1.getArgumentWithId)(args, argMaps.get('expr')?.[0]));
+    const env = (0, unpack_argument_1.unpackArg)(r_argument_1.RArgument.getWithId(args, argMaps.get('env')?.[0]));
+    const expr = (0, unpack_argument_1.unpackArg)(r_argument_1.RArgument.getWithId(args, argMaps.get('expr')?.[0]));
     if (!expr) {
         return (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: 'default' }).information;
     }

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

@@ -4,7 +4,7 @@ import { type ForceArguments } from '../common';
 import type { ParentInformation } from '../../../../../../r-bridge/lang-4.x/ast/model/processing/decorate';
 import type { RSymbol } from '../../../../../../r-bridge/lang-4.x/ast/model/nodes/r-symbol';
 import { type RFunctionArgument } from '../../../../../../r-bridge/lang-4.x/ast/model/nodes/r-function-call';
-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';
 /**
  * Process a replacement function call like `<-`, `[[<-`, `$<-`, etc.
  * These are automatically created when doing assignments like `x[y] <- value` or in general `fun(x) <- value` will call `fun<- (x, value)`.

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

@@ -6,6 +6,7 @@ const known_call_handling_1 = require("../known-call-handling");
 const log_1 = require("../../../../../../util/log");
 const common_1 = require("../common");
 const r_function_call_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/nodes/r-function-call");
+const node_id_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/processing/node-id");
 const logger_1 = require("../../../../../logger");
 const vertex_1 = require("../../../../../graph/vertex");
 const edge_1 = require("../../../../../graph/edge");
@@ -110,7 +111,7 @@ args, rootId, data, config) {
         fn.type = identifier_1.ReferenceType.S3MethodPrefix;
     }
     // link the built-in replacement op
-    res.graph.addEdge(rootId, (0, built_in_1.builtInId)(identifier_1.Identifier.getName(name.content)), edge_1.EdgeType.Calls | edge_1.EdgeType.Reads);
+    res.graph.addEdge(rootId, node_id_1.NodeId.toBuiltIn(identifier_1.Identifier.getName(name.content)), edge_1.EdgeType.Calls | edge_1.EdgeType.Reads);
     return res;
 }
 //# sourceMappingURL=built-in-replacement.js.map

package/dataflow/internal/process/functions/call/built-in/built-in-s-seven-new-generic.js

@@ -33,7 +33,7 @@ function processS7NewGeneric(name, args, rootId, data, config) {
     params[config.args.fun] = 'fun';
     params['...'] = '...';
     const argMaps = (0, linker_1.invertArgumentMap)((0, linker_1.pMatch)((0, common_1.convertFnArguments)(args), params));
-    const genName = (0, unpack_argument_1.unpackArg)((0, r_argument_1.getArgumentWithId)(args, argMaps.get('name')?.[0]));
+    const genName = (0, unpack_argument_1.unpackArg)(r_argument_1.RArgument.getWithId(args, argMaps.get('name')?.[0]));
     if (!genName) {
         return (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: 'default' }).information;
     }
@@ -51,10 +51,10 @@ function processS7NewGeneric(name, args, rootId, data, config) {
         return (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: 'default' }).information;
     }
     data = { ...data, currentS7name: accessedIdentifiers };
-    let funArg = (0, unpack_argument_1.unpackArg)((0, r_argument_1.getArgumentWithId)(args, argMaps.get('fun')?.[0]))?.info.id;
+    let funArg = (0, unpack_argument_1.unpackArg)(r_argument_1.RArgument.getWithId(args, argMaps.get('fun')?.[0]))?.info.id;
     const effectiveArgs = args.slice();
     if (!funArg) {
-        const dispatchArg = (0, unpack_argument_1.unpackArg)((0, r_argument_1.getArgumentWithId)(args, argMaps.get('dispatchArg')?.[0]));
+        const dispatchArg = (0, unpack_argument_1.unpackArg)(r_argument_1.RArgument.getWithId(args, argMaps.get('dispatchArg')?.[0]));
         const newFun = makeS7DispatchFDef(name, [dispatchArg?.lexeme ?? undefined], rootId, args.length, data.completeAst.idMap);
         // fake it 'function([dispatch_args],...) S7_dispatch()'
         effectiveArgs.push(newFun[0]);

package/dataflow/internal/process/functions/call/built-in/built-in-s-three-dispatch.js

@@ -8,13 +8,13 @@ const logger_1 = require("../../../../../logger");
 const built_in_1 = require("../../../../../environments/built-in");
 const linker_1 = require("../../../../linker");
 const common_1 = require("../common");
-const r_argument_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/nodes/r-argument");
 const unpack_argument_1 = require("../argument/unpack-argument");
 const alias_tracking_1 = require("../../../../../eval/resolve/alias-tracking");
 const r_value_1 = require("../../../../../eval/values/r-value");
 const identifier_1 = require("../../../../../environments/identifier");
 const type_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/type");
 const range_1 = require("../../../../../../util/range");
+const r_argument_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/nodes/r-argument");
 /**
  * Process an S3 dispatch call like `UseMethod`.
  */
@@ -29,11 +29,11 @@ function processS3Dispatch(name, args, rootId, data, config) {
         '...': '...'
     };
     const argMaps = (0, linker_1.invertArgumentMap)((0, linker_1.pMatch)((0, common_1.convertFnArguments)(args), params));
-    const generic = (0, unpack_argument_1.unpackArg)((0, r_argument_1.getArgumentWithId)(args, argMaps.get('generic')?.[0]));
+    const generic = (0, unpack_argument_1.unpackArg)(r_argument_1.RArgument.getWithId(args, argMaps.get('generic')?.[0]));
     if (!generic && !config.inferFromClosure) {
         return (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: 'default' }).information;
     }
-    const obj = (0, unpack_argument_1.unpackArg)((0, r_argument_1.getArgumentWithId)(args, argMaps.get('object')?.[0]));
+    const obj = (0, unpack_argument_1.unpackArg)(r_argument_1.RArgument.getWithId(args, argMaps.get('object')?.[0]));
     const dfObj = obj ? (0, processor_1.processDataflowFor)(obj, data) : (0, info_1.initializeCleanDataflowInformation)(rootId, data);
     if ((0, info_1.alwaysExits)(dfObj)) {
         (0, common_1.patchFunctionCall)({

package/dataflow/internal/process/functions/call/common.d.ts

@@ -40,7 +40,7 @@ export declare function convertFnArguments<OtherInfo>(args: readonly (typeof Emp
  * Transforms a function argument into a function argument reference for a function call vertex.
  * Please be aware, that the ids here are those inferred from the AST, not from the dataflow graph!
  */
-export declare function convertFnArgument<OtherInfo>(arg: typeof EmptyArgument | RNode<OtherInfo & ParentInformation>): FunctionArgument;
+export declare function convertFnArgument<OtherInfo>(this: void, arg: typeof EmptyArgument | RNode<OtherInfo & ParentInformation>): FunctionArgument;
 /**
  * Processes all arguments for a function call, updating the given final graph and environment.
  */

package/dataflow/internal/process/functions/call/common.js

@@ -6,6 +6,7 @@ exports.processAllArguments = processAllArguments;
 exports.patchFunctionCall = patchFunctionCall;
 const info_1 = require("../../../../info");
 const processor_1 = require("../../../../processor");
+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 identifier_1 = require("../../../../environments/identifier");
 const overwrite_1 = require("../../../../environments/overwrite");
@@ -13,33 +14,34 @@ const resolve_by_name_1 = require("../../../../environments/resolve-by-name");
 const type_1 = require("../../../../../r-bridge/lang-4.x/ast/model/type");
 const vertex_1 = require("../../../../graph/vertex");
 const edge_1 = require("../../../../graph/edge");
+const r_argument_1 = require("../../../../../r-bridge/lang-4.x/ast/model/nodes/r-argument");
 function forceVertexArgumentValueReferences(rootId, value, graph, env) {
     const valueVertex = graph.getVertex(value.entryPoint);
     if (!valueVertex) {
         return;
     }
     // link read if it is function definition directly and reference the exit point
-    if (valueVertex.tag !== vertex_1.VertexType.Value) {
-        if (valueVertex.tag === vertex_1.VertexType.FunctionDefinition) {
-            for (const exit of valueVertex.exitPoints) {
-                graph.addEdge(rootId, exit.nodeId, edge_1.EdgeType.Reads);
-            }
+    if (valueVertex.tag === vertex_1.VertexType.FunctionDefinition) {
+        for (const exit of valueVertex.exitPoints) {
+            graph.addEdge(rootId, exit.nodeId, edge_1.EdgeType.Reads);
         }
-        else {
-            for (const exit of value.exitPoints) {
-                graph.addEdge(rootId, exit.nodeId, edge_1.EdgeType.Reads);
-            }
+    }
+    else if (valueVertex.tag !== vertex_1.VertexType.Value) {
+        for (const exit of value.exitPoints) {
+            graph.addEdge(rootId, exit.nodeId, edge_1.EdgeType.Reads);
         }
     }
     const containedSubflowIn = graph.verticesOfType(vertex_1.VertexType.FunctionDefinition)
-        .flatMap(([, info]) => info.subflow.in)
-        .toArray();
+        .flatMap(([, info]) => info.subflow.in);
     // try to resolve them against the current environment
-    for (const ref of value.in.concat(containedSubflowIn)) {
-        if (ref.name) {
-            const resolved = ref.name ? (0, resolve_by_name_1.resolveByName)(ref.name, env, ref.type) ?? [] : [];
-            for (const resolve of resolved) {
-                graph.addEdge(ref.nodeId, resolve.nodeId, edge_1.EdgeType.Reads);
+    for (const l of [value.in, containedSubflowIn]) {
+        for (const ref of l) {
+            if (ref.name) {
+                const refId = ref.nodeId;
+                const resolved = (0, resolve_by_name_1.resolveByName)(ref.name, env, ref.type) ?? [];
+                for (const resolve of resolved) {
+                    graph.addEdge(refId, resolve.nodeId, edge_1.EdgeType.Reads);
+                }
             }
         }
     }
@@ -51,7 +53,7 @@ function forceVertexArgumentValueReferences(rootId, value, graph, env) {
  * @see convertFnArgument
  */
 function convertFnArguments(args) {
-    return args.map(arg => convertFnArgument(arg));
+    return args.map(convertFnArgument);
 }
 /**
  * Transforms a function argument into a function argument reference for a function call vertex.
@@ -93,32 +95,38 @@ function processAllArguments({ functionName, args, data, finalGraph, functionRoo
             continue;
         }
         const processed = (0, processor_1.processDataflowFor)(arg, { ...data, environment: argEnv });
-        if (arg.type === type_1.RType.Argument && arg.value && (forceArgs === 'all' || forceArgs[i]) && arg.value.type !== type_1.RType.Number && arg.value.type !== type_1.RType.String && arg.value.type !== type_1.RType.Logical) {
+        if (r_argument_1.RArgument.isWithValue(arg) && (forceArgs === 'all' || forceArgs[i]) && !model_1.RConstant.is(arg.value)) {
             forceVertexArgumentValueReferences(functionRootId, processed, processed.graph, argEnv);
         }
         processedArguments.push(processed);
         finalEnv = (0, overwrite_1.overwriteEnvironment)(finalEnv, processed.environment);
         finalGraph.mergeWith(processed.graph);
         // resolve reads within argument, we resolve before adding the `processed.environment` to avoid cyclic dependencies
-        for (const ingoing of processed.in.concat(processed.unknownReferences)) {
-            // check if it is called directly
-            const vtx = finalGraph.getVertex(ingoing.nodeId);
-            const tryToResolve = ingoing.name ? (0, resolve_by_name_1.resolveByName)(ingoing.name, argEnv, vtx?.tag === vertex_1.VertexType.FunctionCall ? identifier_1.ReferenceType.Function : identifier_1.ReferenceType.Unknown) : undefined;
-            if (tryToResolve === undefined) {
-                remainingReadInArgs.push(ingoing);
-            }
-            else {
-                /* maybe all targets are not definitely of the current scope and should be still kept */
-                let assumeItMayHaveAHigherTarget = true;
-                for (const resolved of tryToResolve) {
-                    if ((0, info_1.happensInEveryBranch)(resolved.cds) && !(0, identifier_1.isReferenceType)(resolved.type, identifier_1.ReferenceType.BuiltInFunction | identifier_1.ReferenceType.BuiltInConstant)) {
-                        assumeItMayHaveAHigherTarget = false;
-                    }
-                    finalGraph.addEdge(ingoing.nodeId, resolved.nodeId, edge_1.EdgeType.Reads);
-                }
-                if (assumeItMayHaveAHigherTarget) {
+        for (const l of [processed.in, processed.unknownReferences]) {
+            for (const ingoing of l) {
+                // check if it is called directly
+                const inId = ingoing.nodeId;
+                const refType = finalGraph.getVertex(inId)?.tag === vertex_1.VertexType.FunctionCall ? identifier_1.ReferenceType.Function : identifier_1.ReferenceType.Unknown;
+                const tryToResolve = ingoing.name ? (0, resolve_by_name_1.resolveByName)(ingoing.name, argEnv, refType) : undefined;
+                if (tryToResolve === undefined) {
                     remainingReadInArgs.push(ingoing);
                 }
+                else {
+                    /* maybe all targets are not definitely of the current scope and should be still kept */
+                    let assumeItMayHaveAHigherTarget = true;
+                    for (const resolved of tryToResolve) {
+                        if ((0, identifier_1.isReferenceType)(resolved.type, identifier_1.ReferenceType.BuiltInFunction | identifier_1.ReferenceType.BuiltInConstant)) {
+                            continue;
+                        }
+                        else if ((0, info_1.happensInEveryBranch)(resolved.cds)) {
+                            assumeItMayHaveAHigherTarget = false;
+                        }
+                        finalGraph.addEdge(inId, resolved.nodeId, edge_1.EdgeType.Reads);
+                    }
+                    if (assumeItMayHaveAHigherTarget) {
+                        remainingReadInArgs.push(ingoing);
+                    }
+                }
             }
         }
         argEnv = (0, overwrite_1.overwriteEnvironment)(argEnv, processed.environment);

package/dataflow/internal/process/functions/process-argument.d.ts

@@ -1,7 +1,7 @@
 import { type DataflowProcessorInformation } from '../../../processor';
 import { type DataflowInformation } from '../../../info';
 import type { ParentInformation } from '../../../../r-bridge/lang-4.x/ast/model/processing/decorate';
-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 { IdentifierReference } from '../../../environments/identifier';
 import { DataflowGraph } from '../../../graph/graph';
 import type { RArgument } from '../../../../r-bridge/lang-4.x/ast/model/nodes/r-argument';

package/dataflow/internal/process/functions/process-argument.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.linkReadsForArgument = linkReadsForArgument;
 exports.processFunctionArgument = processFunctionArgument;
 const processor_1 = require("../../../processor");
-const collect_1 = require("../../../../r-bridge/lang-4.x/ast/model/collect");
+const model_1 = require("../../../../r-bridge/lang-4.x/ast/model/model");
 const graph_1 = require("../../../graph/graph");
 const type_1 = require("../../../../r-bridge/lang-4.x/ast/model/type");
 const edge_1 = require("../../../graph/edge");
@@ -12,9 +12,9 @@ const vertex_1 = require("../../../graph/vertex");
  * Links all reads that occur before the argument to the argument root node.
  */
 function linkReadsForArgument(root, ingoingRefs, graph) {
-    const allIdsBeforeArguments = new Set((0, collect_1.collectAllIds)(root, n => n.type === type_1.RType.Argument && n.info.id !== root.info.id));
-    const ingoingBeforeArgs = ingoingRefs.filter(r => allIdsBeforeArguments.has(r.nodeId));
     const rid = root.info.id;
+    const allIdsBeforeArguments = new Set(model_1.RNode.collectAllIdsWithStop(root, n => n.type === type_1.RType.Argument && n.info.id !== rid));
+    const ingoingBeforeArgs = ingoingRefs.filter(r => allIdsBeforeArguments.has(r.nodeId));
     for (const ref of ingoingBeforeArgs) {
         // link against the root reference currently I do not know how to deal with nested function calls otherwise
         graph.addEdge(rid, ref.nodeId, edge_1.EdgeType.Reads);

package/dataflow/internal/process/functions/process-parameter.js

@@ -5,8 +5,8 @@ const processor_1 = require("../../../processor");
 const log_1 = require("../../../../util/log");
 const identifier_1 = require("../../../environments/identifier");
 const define_1 = require("../../../environments/define");
-const type_1 = require("../../../../r-bridge/lang-4.x/ast/model/type");
 const edge_1 = require("../../../graph/edge");
+const r_function_definition_1 = require("../../../../r-bridge/lang-4.x/ast/model/nodes/r-function-definition");
 /**
  *
  */
@@ -26,7 +26,7 @@ function processFunctionParameter(parameter, data) {
         graph.setDefinitionOfVertex(writtenNode);
         environment = (0, define_1.define)(writtenNode, false, environment);
         if (defaultValue !== undefined) {
-            if (parameter.defaultValue?.type === type_1.RType.FunctionDefinition) {
+            if (r_function_definition_1.RFunctionDefinition.is(parameter.defaultValue)) {
                 graph.addEdge(wid, parameter.defaultValue.info.id, edge_1.EdgeType.DefinedBy);
             }
             else {

package/dataflow/origin/dfg-get-origin.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 { DataflowGraph } from '../graph/graph';
 import type { Identifier } from '../environments/identifier';
 export declare const enum OriginType {