@eagleoutice/flowr 2.9.13 → 2.10.1

package/dataflow/internal/linker.js

@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.findNonLocalReads = findNonLocalReads;
 exports.produceNameSharedIdMap = produceNameSharedIdMap;
 exports.linkArgumentsOnCall = linkArgumentsOnCall;
-exports.getAllIdsWithTarget = getAllIdsWithTarget;
-exports.invertArgumentMap = invertArgumentMap;
 exports.pMatch = pMatch;
 exports.linkFunctionCallWithSingleTarget = linkFunctionCallWithSingleTarget;
 exports.linkFunctionCalls = linkFunctionCalls;
@@ -25,10 +23,10 @@ const edge_1 = require("../graph/edge");
 const type_1 = require("../../r-bridge/lang-4.x/ast/model/type");
 const vertex_1 = require("../graph/vertex");
 const resolve_by_name_1 = require("../environments/resolve-by-name");
-const built_in_1 = require("../environments/built-in");
 const prefix_1 = require("../../util/prefix");
 const info_1 = require("../info");
 const unnamed_call_handling_1 = require("./process/functions/call/unnamed-call-handling");
+const built_in_proc_name_1 = require("../environments/built-in-proc-name");
 /**
  * Find all reads within the graph that do not reference a local definition in the graph.
  */
@@ -137,38 +135,37 @@ function linkArgumentsOnCall(args, params, graph) {
     }
     return maps;
 }
-/**
- * Returns all argument ids that map to the given target parameter id.
- */
-function getAllIdsWithTarget(maps, target) {
-    return maps.entries().filter(([, v]) => v === target).map(([k]) => k).toArray();
-}
-/**
- * Inverts the argument to parameter map to a parameter to argument map.
- */
-function invertArgumentMap(maps) {
-    const inverted = new Map();
-    for (const [arg, param] of maps.entries()) {
-        const existing = inverted.get(param);
-        if (existing) {
-            existing.push(arg);
-        }
-        else {
-            inverted.set(param, [arg]);
-        }
-    }
-    return inverted;
-}
 /**
  * Links the given arguments to the given parameters within the given graph by name only.
+ * @example
+ * ```ts
+ * const parameterSpec = {
+ *   'paramName':         'paramId',
+ *   'anotherParamName':  'anotherParamId',
+ *   // we recommend to always add '...' to your specification
+ *   // this way you can collect all arguments that could not be matched!
+ *   '...':               '...'
+ * } as const;
+ *
+ * const match = pMatch(convertFnArguments(args), parameterSpec);
+ * const addParam = match.get('paramId');
+ * ```
  * @note
  * To obtain the arguments from a {@link RFunctionCall}[], either use {@link processAllArguments} (also available via {@link processKnownFunctionCall})
  * or convert them with {@link convertFnArguments}.
- * You can use {@link getAllIdsWithTarget} to get all argument ids that map to a given parameter.
  */
 function pMatch(args, params) {
     const nameArgMap = new Map(args.filter(graph_1.FunctionArgument.isNamed).map(a => [a.name, a]));
     const maps = new Map();
+    function addToMaps(key, value) {
+        const e = maps.get(key);
+        if (e) {
+            e.push(value);
+        }
+        else {
+            maps.set(key, [value]);
+        }
+    }
     const sid = params['...'];
     const paramNames = Object.keys(params);
     // all parameters matched by name
@@ -178,11 +175,11 @@ function pMatch(args, params) {
         const pmatchName = (0, prefix_1.findByPrefixIfUnique)(name, paramNames) ?? name;
         const param = params[pmatchName];
         if (param) {
-            maps.set(argId, param);
+            addToMaps(param, argId);
             matchedParameters.add(name);
         }
         else if (sid) {
-            maps.set(argId, sid);
+            addToMaps(sid, argId);
         }
     }
     const remainingParameter = paramNames.filter(p => !matchedParameters.has(p));
@@ -195,13 +192,13 @@ function pMatch(args, params) {
         const aid = arg.nodeId;
         if (remainingParameter.length <= i) {
             if (sid) {
-                maps.set(aid, sid);
+                addToMaps(sid, aid);
             }
             continue;
         }
         const param = params[remainingParameter[i]];
         if (param) {
-            maps.set(aid, param);
+            addToMaps(param, aid);
         }
     }
     return maps;
@@ -342,8 +339,8 @@ function getAllFunctionCallTargets(call, graph, environment) {
     }
     if (environment !== undefined || info.environment !== undefined) {
         let functionCallDefs = [];
-        const refType = info.origin.includes(built_in_1.BuiltInProcName.S3Dispatch) ? identifier_1.ReferenceType.S3MethodPrefix :
-            info.origin.includes(built_in_1.BuiltInProcName.S7Dispatch) ? identifier_1.ReferenceType.S7MethodPrefix : identifier_1.ReferenceType.Function;
+        const refType = info.origin.includes(built_in_proc_name_1.BuiltInProcName.S3Dispatch) ? identifier_1.ReferenceType.S3MethodPrefix :
+            info.origin.includes(built_in_proc_name_1.BuiltInProcName.S7Dispatch) ? identifier_1.ReferenceType.S7MethodPrefix : identifier_1.ReferenceType.Function;
         if (info.name !== undefined && !identifier_1.Identifier.getName(info.name).startsWith(unnamed_call_handling_1.UnnamedFunctionCallPrefix)) {
             functionCallDefs = (0, resolve_by_name_1.resolveByName)(info.name, environment ?? info.environment, refType)?.map(d => d.nodeId) ?? [];
         }

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

@@ -8,13 +8,13 @@ const node_id_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/process
 const logger_1 = require("../../../../../logger");
 const type_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/type");
 const edge_1 = require("../../../../../graph/edge");
-const built_in_1 = require("../../../../../environments/built-in");
 const built_in_assignment_1 = require("./built-in-assignment");
 const identifier_1 = require("../../../../../environments/identifier");
 const reference_to_maybe_1 = require("../../../../../environments/reference-to-maybe");
+const built_in_proc_name_1 = require("../../../../../environments/built-in-proc-name");
 function tableAssignmentProcessor(name, args, rootId, data, outInfo) {
     outInfo.definitionRootNodes.push(rootId);
-    return (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: built_in_1.BuiltInProcName.TableAssignment }).information;
+    return (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: built_in_proc_name_1.BuiltInProcName.TableAssignment }).information;
 }
 /**
  * Processes different types of access operations.
@@ -36,7 +36,7 @@ function processAccess(name, args, rootId, data, config) {
     let fnCall;
     if (head === r_function_call_1.EmptyArgument) {
         // in this case we may be within a pipe
-        fnCall = (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, forceArgs: config.forceArgs, origin: built_in_1.BuiltInProcName.Access });
+        fnCall = (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, forceArgs: config.forceArgs, origin: built_in_proc_name_1.BuiltInProcName.Access });
     }
     else if (config.treatIndicesAsString) {
         fnCall = processStringBasedAccess(args, data, name, rootId, config);
@@ -104,7 +104,7 @@ function processNumberBasedAccess(data, name, args, rootId, config, head) {
             name: ':=',
             nodeId: tableAssignId
         }]);
-    const fnCall = (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, forceArgs: config.forceArgs, origin: built_in_1.BuiltInProcName.Access });
+    const fnCall = (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, forceArgs: config.forceArgs, origin: built_in_proc_name_1.BuiltInProcName.Access });
     /* recover the environment */
     if (existing !== undefined) {
         data.environment.current.memory.set(':=', existing);
@@ -156,7 +156,7 @@ function processStringBasedAccess(args, data, name, rootId, config) {
         rootId,
         data,
         forceArgs: config.forceArgs,
-        origin: built_in_1.BuiltInProcName.Access
+        origin: built_in_proc_name_1.BuiltInProcName.Access
     });
 }
 //# sourceMappingURL=built-in-access.js.map

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

@@ -14,8 +14,8 @@ const general_1 = require("../../../../../eval/values/general");
 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");
+const built_in_proc_name_1 = require("../../../../../environments/built-in-proc-name");
 /**
  * Process an apply call like `vapply` or `mapply`.
  */
@@ -25,7 +25,7 @@ function processApply(name, args, rootId, data, config) {
     const forceArgsMask = new Array(indexOfFunction).fill(false);
     forceArgsMask.push(true);
     const resFn = (0, known_call_handling_1.processKnownFunctionCall)({
-        name, args, rootId, data, forceArgs: forceArgsMask, origin: built_in_1.BuiltInProcName.Apply
+        name, args, rootId, data, forceArgs: forceArgsMask, origin: built_in_proc_name_1.BuiltInProcName.Apply
     });
     let information = resFn.information;
     const processedArguments = resFn.processedArguments;
@@ -98,6 +98,7 @@ function processApply(name, args, rootId, data, config) {
         if (arg && counterpart !== r_function_call_1.EmptyArgument) {
             return {
                 name: counterpart.name?.content,
+                valueId: counterpart.value?.info.id,
                 cds: data.cds,
                 type: identifier_1.ReferenceType.Argument,
                 nodeId: arg.entryPoint
@@ -119,7 +120,7 @@ function processApply(name, args, rootId, data, config) {
             onlyBuiltin: false,
             cds: data.cds,
             args: allOtherArguments, // same reference
-            origin: [built_in_1.BuiltInProcName.Function]
+            origin: [built_in_proc_name_1.BuiltInProcName.Function]
         }, data.ctx.env.makeCleanEnv());
         information.graph.addEdge(rootId, rootFnId, edge_1.EdgeType.Calls | edge_1.EdgeType.Reads);
         information.graph.addEdge(rootId, functionId, edge_1.EdgeType.Calls | edge_1.EdgeType.Argument);
@@ -168,7 +169,7 @@ function processApply(name, args, rootId, data, config) {
             environment: resolveInEnvironment === 'global' ? undefined : data.environment,
             onlyBuiltin: resolveInEnvironment === 'global',
             cds: data.cds,
-            origin: [built_in_1.BuiltInProcName.Function]
+            origin: [built_in_proc_name_1.BuiltInProcName.Function]
         });
     }
     for (const arg of processedArguments) {

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

@@ -23,6 +23,7 @@ const built_in_1 = require("../../../../../environments/built-in");
 const unknown_side_effect_1 = require("../../../../../graph/unknown-side-effect");
 const alias_tracking_1 = require("../../../../../eval/resolve/alias-tracking");
 const r_value_1 = require("../../../../../eval/values/r-value");
+const built_in_proc_name_1 = require("../../../../../environments/built-in-proc-name");
 function toReplacementSymbol(target, prefix, superAssignment) {
     return {
         type: type_1.RType.Symbol,
@@ -54,7 +55,7 @@ function tryReplacement(rootId, functionName, data, name, args) {
     if (resolved.length !== 1 || resolved[0].type !== identifier_1.ReferenceType.BuiltInFunction) {
         return (0, process_named_call_1.processAsNamedCall)(functionName, data, name, args);
     }
-    const info = built_in_1.BuiltInProcessorMapper[built_in_1.BuiltInProcName.Replacement]({
+    const info = built_in_1.BuiltInProcessorMapper[built_in_proc_name_1.BuiltInProcName.Replacement]({
         type: type_1.RType.Symbol,
         info: functionName.info,
         content: name,
@@ -119,7 +120,7 @@ args, rootId, data, config) {
                 data,
                 reverseOrder: !config.swapSourceAndTarget,
                 forceArgs: config.forceArgs,
-                origin: built_in_1.BuiltInProcName.Assignment
+                origin: built_in_proc_name_1.BuiltInProcName.Assignment
             });
             return processAssignmentToSymbol({
                 ...config,
@@ -145,7 +146,7 @@ args, rootId, data, config) {
                         data,
                         reverseOrder: !config.swapSourceAndTarget,
                         forceArgs: config.forceArgs,
-                        origin: built_in_1.BuiltInProcName.Assignment
+                        origin: built_in_proc_name_1.BuiltInProcName.Assignment
                     });
                     return processAssignmentToSymbol({
                         ...config,
@@ -183,7 +184,7 @@ args, rootId, data, config) {
                 data,
                 reverseOrder: !config.swapSourceAndTarget,
                 forceArgs: config.forceArgs,
-                origin: built_in_1.BuiltInProcName.Assignment
+                origin: built_in_proc_name_1.BuiltInProcName.Assignment
             });
             return processAssignmentToSymbol({
                 ...config,
@@ -203,7 +204,7 @@ args, rootId, data, config) {
     logger_1.dataflowLogger.warn(`Assignment ${identifier_1.Identifier.toString(name.content)} has an unknown target type ${target.type} => unknown impact`);
     const info = (0, known_call_handling_1.processKnownFunctionCall)({
         name, args: effectiveArgs, rootId, data, forceArgs: config.forceArgs,
-        origin: built_in_1.BuiltInProcName.Assignment
+        origin: built_in_proc_name_1.BuiltInProcName.Assignment
     }).information;
     (0, unknown_side_effect_1.handleUnknownSideEffect)(info.graph, info.environment, rootId);
     return info;
@@ -252,7 +253,7 @@ function processAssignmentToString(target, args, name, rootId, data, config, sou
         data,
         reverseOrder: !config.swapSourceAndTarget,
         forceArgs: config.forceArgs,
-        origin: built_in_1.BuiltInProcName.Assignment
+        origin: built_in_proc_name_1.BuiltInProcName.Assignment
     });
     return processAssignmentToSymbol({
         ...config,
@@ -296,7 +297,7 @@ function checkTargetReferenceType(sourceInfo, fnModes) {
  */
 function markAsAssignment(information, nodeToDefine, sourceIds, rootIdOfAssignment, data, assignmentConfig) {
     information.environment = (0, define_1.define)(nodeToDefine, assignmentConfig?.superAssignment, information.environment);
-    information.graph.setDefinitionOfVertex(nodeToDefine);
+    information.graph.setDefinitionOfVertex(nodeToDefine, sourceIds);
     const nid = nodeToDefine.nodeId;
     if (!assignmentConfig?.quoteSource) {
         for (const sourceId of sourceIds) {

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

@@ -1,5 +1,5 @@
 import { type DataflowProcessorInformation } from '../../../../../processor';
-import { type DataflowInformation } from '../../../../../info';
+import { 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';

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

@@ -18,8 +18,8 @@ const string_constants_1 = require("../../../../../eval/values/string/string-con
 const unknown_side_effect_1 = require("../../../../../graph/unknown-side-effect");
 const alias_tracking_1 = require("../../../../../eval/resolve/alias-tracking");
 const arrays_1 = require("../../../../../../util/collections/arrays");
-const built_in_1 = require("../../../../../environments/built-in");
 const identifier_1 = require("../../../../../environments/identifier");
+const built_in_proc_name_1 = require("../../../../../environments/built-in-proc-name");
 /**
  * Process a call to `eval()`, trying to resolve the code being evaluated if possible.
  */
@@ -29,8 +29,8 @@ function processEvalCall(name, args, rootId, data, config) {
         return (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: 'default' }).information;
     }
     const information = config.includeFunctionCall ?
-        (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, forceArgs: [true], origin: built_in_1.BuiltInProcName.Eval }).information
-        : (0, info_1.initializeCleanDataflowInformation)(rootId, data);
+        (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, forceArgs: [true], origin: built_in_proc_name_1.BuiltInProcName.Eval }).information
+        : info_1.DataflowInformation.initialize(rootId, data);
     const evalArgument = args[0];
     if (config.includeFunctionCall) {
         information.graph.addEdge(rootId, args[0].value.info.id, edge_1.EdgeType.Returns);

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

@@ -14,11 +14,11 @@ const resolve_by_name_1 = require("../../../../../environments/resolve-by-name")
 const edge_1 = require("../../../../../graph/edge");
 const vertex_1 = require("../../../../../graph/vertex");
 const scoping_1 = require("../../../../../environments/scoping");
-const built_in_1 = require("../../../../../environments/built-in");
 const overwrite_1 = require("../../../../../environments/overwrite");
 const logger_1 = require("../../../../../logger");
 const log_1 = require("../../../../../../util/log");
 const reference_to_maybe_1 = require("../../../../../environments/reference-to-maybe");
+const built_in_proc_name_1 = require("../../../../../environments/built-in-proc-name");
 function linkReadNameToWriteIfPossible(read, environments, listEnvironments, remainingRead, nextGraph) {
     const readName = read.name && identifier_1.Identifier.isDotDotDotAccess(read.name) ? identifier_1.Identifier.dotdotdot() : read.name;
     const probableTarget = readName ? (0, resolve_by_name_1.resolveByName)(readName, environments, read.type) : undefined;
@@ -178,7 +178,7 @@ function processExpressionList(name, args, rootId, data) {
             name,
             data,
             argumentProcessResult: processedExpressions,
-            origin: built_in_1.BuiltInProcName.ExpressionList
+            origin: built_in_proc_name_1.BuiltInProcName.ExpressionList
         });
         nextGraph.addEdge(rootId, node_id_1.NodeId.toBuiltIn('{'), edge_1.EdgeType.Reads | edge_1.EdgeType.Calls);
         // process all exit points as potential returns:

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

@@ -15,7 +15,7 @@ const append_1 = require("../../../../../environments/append");
 const edge_1 = require("../../../../../graph/edge");
 const identifier_1 = require("../../../../../environments/identifier");
 const reference_to_maybe_1 = require("../../../../../environments/reference-to-maybe");
-const built_in_1 = require("../../../../../environments/built-in");
+const built_in_proc_name_1 = require("../../../../../environments/built-in-proc-name");
 /**
  * Processes a for-loop call: `for(<variable> in <vector>) <body>`
  * desugared as:
@@ -60,7 +60,7 @@ function processForLoop(name, args, rootId, data) {
     const nameIdShares = (0, linker_1.produceNameSharedIdMap)((0, linker_1.findNonLocalReads)(nextGraph, writtenIds));
     for (const write of writtenVariable) {
         nextGraph.addEdge(write.nodeId, vector.entryPoint, edge_1.EdgeType.DefinedBy);
-        nextGraph.setDefinitionOfVertex(write);
+        nextGraph.setDefinitionOfVertex(write, [vector.entryPoint]);
     }
     (0, reference_to_maybe_1.applyCdToReferences)(body.out, cd);
     const outgoing = variable.out.concat(writtenVariable, body.out);
@@ -72,7 +72,7 @@ function processForLoop(name, args, rootId, data) {
         name,
         data: { ...data, cds: originalDependency },
         argumentProcessResult: [variable, vector, body],
-        origin: built_in_1.BuiltInProcName.ForLoop
+        origin: built_in_proc_name_1.BuiltInProcName.ForLoop
     });
     /* mark the last argument as nse */
     nextGraph.addEdge(rootId, body.entryPoint, edge_1.EdgeType.NonStandardEvaluation);

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

@@ -20,9 +20,9 @@ const scoping_1 = require("../../../../../environments/scoping");
 const resolve_by_name_1 = require("../../../../../environments/resolve-by-name");
 const edge_1 = require("../../../../../graph/edge");
 const log_1 = require("../../../../../../util/log");
-const built_in_1 = require("../../../../../environments/built-in");
 const type_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/type");
 const hooks_1 = require("../../../../../hooks");
+const built_in_proc_name_1 = require("../../../../../environments/built-in-proc-name");
 /**
  * Process a function definition, i.e., `function(a, b) { ... }`
  */
@@ -99,10 +99,10 @@ function processFunctionDefinition(name, args, rootId, data) {
             return r_function_call_1.EmptyArgument;
         }
         else if (!p.name && p.value && p.value.type === type_1.RType.Parameter) {
-            return { type: identifier_1.ReferenceType.Argument, cds: data.cds, nodeId: p.value.name.info.id, name: p.value.name.content };
+            return { type: identifier_1.ReferenceType.Argument, cds: data.cds, nodeId: p.value.name.info.id, name: p.value.name.content, valueId: p.value.defaultValue?.info.id };
         }
         else if (p.name) {
-            return { type: identifier_1.ReferenceType.Argument, cds: data.cds, nodeId: p.name.info.id, name: p.name.content };
+            return { type: identifier_1.ReferenceType.Argument, valueId: p.value?.info.id, cds: data.cds, nodeId: p.name.info.id, name: p.name.content };
         }
         else {
             return r_function_call_1.EmptyArgument;
@@ -173,7 +173,7 @@ function retrieveActiveEnvironment(callerEnvironment, baseEnvironment, ctx) {
 }
 function updateDispatches(graph, myArgs) {
     for (const [, info] of graph.vertices(false)) {
-        if (info.tag !== vertex_1.VertexType.FunctionCall || (!info.origin.includes(built_in_1.BuiltInProcName.S3Dispatch) && !info.origin.includes(built_in_1.BuiltInProcName.S7Dispatch))) {
+        if (info.tag !== vertex_1.VertexType.FunctionCall || (!info.origin.includes(built_in_proc_name_1.BuiltInProcName.S3Dispatch) && !info.origin.includes(built_in_proc_name_1.BuiltInProcName.S7Dispatch))) {
             continue;
         }
         if (info.args.length === 0) {
@@ -247,7 +247,7 @@ function updateNestedFunctionCalls(graph, outEnvironment) {
         }
         const targets = new Set((0, linker_1.getAllFunctionCallTargets)(id, graph, effectiveEnvironment));
         const collectedNextMethods = new Set();
-        const treatAsS3 = origin.includes(built_in_1.BuiltInProcName.S3Dispatch);
+        const treatAsS3 = origin.includes(built_in_proc_name_1.BuiltInProcName.S3Dispatch);
         for (const target of targets) {
             if (node_id_1.NodeId.isBuiltIn(target)) {
                 graph.addEdge(id, target, edge_1.EdgeType.Calls);
@@ -274,7 +274,7 @@ function updateNestedFunctionCalls(graph, outEnvironment) {
                 // collect all next method calls to link them to the same targets!
                 for (const s of targetVertex.subflow.graph) {
                     const v = graph.getVertex(s);
-                    if (v?.tag === vertex_1.VertexType.FunctionCall && v.origin.includes(built_in_1.BuiltInProcName.S3DispatchNext)) {
+                    if (v?.tag === vertex_1.VertexType.FunctionCall && v.origin.includes(built_in_proc_name_1.BuiltInProcName.S3DispatchNext)) {
                         collectedNextMethods.add(v.id);
                     }
                 }

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

@@ -8,8 +8,8 @@ const logger_1 = require("../../../../../logger");
 const retriever_1 = require("../../../../../../r-bridge/retriever");
 const type_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/type");
 const edge_1 = require("../../../../../graph/edge");
-const built_in_1 = require("../../../../../environments/built-in");
 const identifier_1 = require("../../../../../environments/identifier");
+const built_in_proc_name_1 = require("../../../../../environments/built-in-proc-name");
 /**
  * Processes a built-in 'get' function call.
  */
@@ -35,7 +35,7 @@ function processGet(name, args, rootId, data) {
         args: (0, make_argument_1.wrapArgumentsUnnamed)([treatTargetAsSymbol], data.completeAst.idMap),
         rootId,
         data,
-        origin: built_in_1.BuiltInProcName.Get
+        origin: built_in_proc_name_1.BuiltInProcName.Get
     });
     const firstArg = processedArguments[0];
     if (firstArg) {

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 built_in_1 = require("../../../../../environments/built-in");
 const r_argument_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/nodes/r-argument");
+const built_in_proc_name_1 = require("../../../../../environments/built-in-proc-name");
 function getArguments(config, args) {
     let condArg;
     let thenArg;
@@ -27,7 +27,7 @@ function getArguments(config, args) {
             [config.args.no]: 'no',
             '...': '...'
         };
-        const argMaps = (0, linker_1.invertArgumentMap)((0, linker_1.pMatch)((0, common_1.convertFnArguments)(args), params));
+        const argMaps = (0, linker_1.pMatch)((0, common_1.convertFnArguments)(args), params);
         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]));
@@ -113,7 +113,7 @@ function processIfThenElse(name, args, rootId, data, config) {
         name,
         data: { ...data, cds: originalDependency },
         argumentProcessResult: [cond, then, otherwise],
-        origin: built_in_1.BuiltInProcName.IfThenElse
+        origin: built_in_proc_name_1.BuiltInProcName.IfThenElse
     });
     // as an if always evaluates its condition, we add a 'reads'-edge
     nextGraph.addEdge(rootId, cond.entryPoint, edge_1.EdgeType.Reads);

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

@@ -6,8 +6,8 @@ const logger_1 = require("../../../../../logger");
 const unpack_argument_1 = require("../argument/unpack-argument");
 const type_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/type");
 const make_argument_1 = require("../argument/make-argument");
-const built_in_1 = require("../../../../../environments/built-in");
 const identifier_1 = require("../../../../../environments/identifier");
+const built_in_proc_name_1 = require("../../../../../environments/built-in-proc-name");
 /**
  * Process a library call like `library` or `require`
  */
@@ -39,7 +39,7 @@ function processLibrary(name, args, rootId, data) {
     return (0, known_call_handling_1.processKnownFunctionCall)({
         name, args: (0, make_argument_1.wrapArgumentsUnnamed)([newArg], data.completeAst.idMap), rootId, data,
         hasUnknownSideEffect: true,
-        origin: built_in_1.BuiltInProcName.Library
+        origin: built_in_proc_name_1.BuiltInProcName.Library
     }).information;
 }
 //# sourceMappingURL=built-in-library.js.map

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processList = processList;
 const known_call_handling_1 = require("../known-call-handling");
-const built_in_1 = require("../../../../../environments/built-in");
+const built_in_proc_name_1 = require("../../../../../environments/built-in-proc-name");
 /**
  * Process a list call.
  *
@@ -12,6 +12,6 @@ const built_in_1 = require("../../../../../environments/built-in");
  * ```
  */
 function processList(name, args, rootId, data) {
-    return (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: built_in_1.BuiltInProcName.List }).information;
+    return (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: built_in_proc_name_1.BuiltInProcName.List }).information;
 }
 //# sourceMappingURL=built-in-list.js.map

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

@@ -1,5 +1,5 @@
 import type { DataflowProcessorInformation } from '../../../../../processor';
-import type { DataflowInformation } from '../../../../../info';
+import { 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';

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

@@ -8,9 +8,9 @@ const linker_1 = require("../../../../linker");
 const common_1 = require("../common");
 const unpack_argument_1 = require("../argument/unpack-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");
+const built_in_proc_name_1 = require("../../../../../environments/built-in-proc-name");
 /**
  * Processes a built-in 'local' function call.
  */
@@ -23,13 +23,13 @@ function processLocal(name, args, rootId, data, config) {
         [config.args.env]: 'env',
         '...': '...'
     };
-    const argMaps = (0, linker_1.invertArgumentMap)((0, linker_1.pMatch)((0, common_1.convertFnArguments)(args), params));
+    const argMaps = (0, linker_1.pMatch)((0, common_1.convertFnArguments)(args), params);
     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;
     }
-    const dfEnv = env ? (0, processor_1.processDataflowFor)(env, data) : (0, info_1.initializeCleanDataflowInformation)(rootId, data);
+    const dfEnv = env ? (0, processor_1.processDataflowFor)(env, data) : info_1.DataflowInformation.initialize(rootId, data);
     if ((0, info_1.alwaysExits)(dfEnv)) {
         (0, common_1.patchFunctionCall)({
             nextGraph: dfEnv.graph,
@@ -37,7 +37,7 @@ function processLocal(name, args, rootId, data, config) {
             name,
             data,
             argumentProcessResult: [dfEnv],
-            origin: built_in_1.BuiltInProcName.Local
+            origin: built_in_proc_name_1.BuiltInProcName.Local
         });
         return dfEnv;
     }
@@ -49,7 +49,7 @@ function processLocal(name, args, rootId, data, config) {
         name,
         data,
         argumentProcessResult: [dfExpr, dfEnv],
-        origin: built_in_1.BuiltInProcName.Local
+        origin: built_in_proc_name_1.BuiltInProcName.Local
     });
     const ingoing = dfEnv.in.concat(dfExpr.in, dfEnv.unknownReferences, dfExpr.unknownReferences);
     ingoing.push({ nodeId: rootId, name: name.content, cds: data.cds, type: identifier_1.ReferenceType.Function });

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

@@ -9,12 +9,12 @@ 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 identifier_1 = require("../../../../../environments/identifier");
-const built_in_1 = require("../../../../../environments/built-in");
+const built_in_proc_name_1 = require("../../../../../environments/built-in-proc-name");
 /**
  * Suport for R's pipe functions like `|>`.
  */
 function processPipe(name, args, rootId, data) {
-    const { information, processedArguments } = (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: built_in_1.BuiltInProcName.Pipe });
+    const { information, processedArguments } = (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: built_in_proc_name_1.BuiltInProcName.Pipe });
     if (args.length !== 2) {
         logger_1.dataflowLogger.warn(`Pipe ${identifier_1.Identifier.toString(name.content)} has something else than 2 arguments, skipping`);
         return information;

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

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.processQuote = processQuote;
 const known_call_handling_1 = require("../known-call-handling");
 const edge_1 = require("../../../../../graph/edge");
-const built_in_1 = require("../../../../../environments/built-in");
+const built_in_proc_name_1 = require("../../../../../environments/built-in-proc-name");
 /**
  * Process a call to `quote` or similar nse/substitution functions.
  */
 function processQuote(name, args, rootId, data, config) {
     const startEnv = data.environment;
-    const { information, processedArguments, fnRef } = (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, forceArgs: config.forceArgs, origin: built_in_1.BuiltInProcName.Quote });
+    const { information, processedArguments, fnRef } = (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, forceArgs: config.forceArgs, origin: built_in_proc_name_1.BuiltInProcName.Quote });
     let inRefs = [fnRef];
     let outRefs = [];
     let unknownRefs = [];

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

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processRecall = processRecall;
 const known_call_handling_1 = require("../known-call-handling");
-const built_in_1 = require("../../../../../environments/built-in");
 const log_1 = require("../../../../../../util/log");
 const edge_1 = require("../../../../../graph/edge");
 const vertex_1 = require("../../../../../graph/vertex");
 const unnamed_call_handling_1 = require("../unnamed-call-handling");
 const identifier_1 = require("../../../../../environments/identifier");
+const built_in_proc_name_1 = require("../../../../../environments/built-in-proc-name");
 /**
  * Processes a built-in 'Recall' function call, linking
  * the recall to the enveloping function closure.
@@ -18,7 +18,7 @@ function processRecall(name, args, rootId, data) {
         args,
         rootId,
         data,
-        origin: built_in_1.BuiltInProcName.Recall
+        origin: built_in_proc_name_1.BuiltInProcName.Recall
     });
     let cur = data.environment.current;
     let closure;