@eagleoutice/flowr 2.6.3 → 2.7.2

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

@@ -7,12 +7,12 @@ const r_function_call_1 = require("../../../../../../r-bridge/lang-4.x/ast/model
 const logger_1 = require("../../../../../logger");
 const type_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/type");
 const edge_1 = require("../../../../../graph/edge");
-const environment_1 = require("../../../../../environments/environment");
 const built_in_1 = require("../../../../../environments/built-in");
 const built_in_assignment_1 = require("./built-in-assignment");
 const identifier_1 = require("../../../../../environments/identifier");
 const vertex_1 = require("../../../../../graph/vertex");
 const containers_1 = require("../../../../../../util/containers");
+const reference_to_maybe_1 = require("../../../../../environments/reference-to-maybe");
 function tableAssignmentProcessor(name, args, rootId, data, outInfo) {
     outInfo.definitionRootNodes.push(rootId);
     return (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: 'table:assign' }).information;
@@ -71,12 +71,12 @@ function processAccess(name, args, rootId, data, config) {
          * ```
          * the read for a will use both accesses as potential definitions and not just the last one!
          */
-        unknownReferences: (0, environment_1.makeAllMaybe)(info.unknownReferences, info.graph, info.environment, false),
+        unknownReferences: (0, reference_to_maybe_1.makeAllMaybe)(info.unknownReferences, info.graph, info.environment, false),
         entryPoint: rootId,
         /** it is, to be precise, the accessed element we want to map to maybe */
         in: head === r_function_call_1.EmptyArgument ? info.in : info.in.map(ref => {
             if (ref.nodeId === head.value?.info.id) {
-                return (0, environment_1.makeReferenceMaybe)(ref, info.graph, info.environment, false);
+                return (0, reference_to_maybe_1.makeReferenceMaybe)(ref, info.graph, info.environment, false);
             }
             else {
                 return ref;

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

@@ -60,7 +60,7 @@ function processApply(name, args, rootId, data, config) {
     else if (val.type === type_1.RType.Symbol) {
         functionId = val.info.id;
         if (resolveValue) {
-            const resolved = (0, general_1.valueSetGuard)((0, alias_tracking_1.resolveIdToValue)(val.info.id, { environment: data.environment, idMap: data.completeAst.idMap, resolve: data.ctx.config.solver.variables }));
+            const resolved = (0, general_1.valueSetGuard)((0, alias_tracking_1.resolveIdToValue)(val.info.id, { environment: data.environment, idMap: data.completeAst.idMap, resolve: data.ctx.config.solver.variables, ctx: data.ctx }));
             if (resolved?.elements.length === 1 && resolved.elements[0].type === 'string') {
                 functionName = (0, r_value_1.isValue)(resolved.elements[0].value) ? resolved.elements[0].value.str : undefined;
             }
@@ -105,7 +105,7 @@ function processApply(name, args, rootId, data, config) {
             cds: data.controlDependencies,
             args: allOtherArguments, // same reference
             origin: ['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);
         information = {

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

@@ -51,4 +51,6 @@ export interface AssignmentToSymbolParameters<OtherInfo> extends AssignmentConfi
 export declare function markAsAssignment<OtherInfo>(information: {
     environment: REnvironmentInformation;
     graph: DataflowGraph;
-}, nodeToDefine: InGraphIdentifierDefinition, sourceIds: readonly NodeId[], rootIdOfAssignment: NodeId, data: DataflowProcessorInformation<OtherInfo>, assignmentConfig?: AssignmentConfiguration): void;
+}, nodeToDefine: InGraphIdentifierDefinition & {
+    name: string;
+}, sourceIds: readonly NodeId[], rootIdOfAssignment: NodeId, data: DataflowProcessorInformation<OtherInfo>, assignmentConfig?: AssignmentConfiguration): void;

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

@@ -112,7 +112,7 @@ args, rootId, data, config) {
         }
         else {
             // try to resolve the variable first
-            const n = (0, alias_tracking_1.resolveIdToValue)(target.info.id, { environment: data.environment, resolve: data.ctx.config.solver.variables, idMap: data.completeAst.idMap, full: true });
+            const n = (0, alias_tracking_1.resolveIdToValue)(target.info.id, { environment: data.environment, resolve: data.ctx.config.solver.variables, idMap: data.completeAst.idMap, full: true, ctx: data.ctx });
             if (n.type === 'set' && n.elements.length === 1 && n.elements[0].type === 'string') {
                 const val = n.elements[0].value;
                 if ((0, r_value_1.isValue)(val)) {
@@ -187,8 +187,8 @@ args, rootId, data, config) {
     return info;
 }
 function extractSourceAndTarget(args) {
-    const source = (0, unpack_argument_1.unpackArgument)(args[1], false);
-    const target = (0, unpack_argument_1.unpackArgument)(args[0], false);
+    const source = (0, unpack_argument_1.unpackArg)(args[1]);
+    const target = (0, unpack_argument_1.unpackArg)(args[0]);
     return { source, target };
 }
 /**

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

@@ -38,7 +38,7 @@ function processEvalCall(name, args, rootId, data, config) {
         (0, unknown_side_effect_1.handleUnknownSideEffect)(information.graph, information.environment, rootId);
         return information;
     }
-    const code = resolveEvalToCode(evalArgument.value, data.environment, data.completeAst.idMap, data.ctx.config);
+    const code = resolveEvalToCode(evalArgument.value, data.environment, data.completeAst.idMap, data.ctx);
     if (code) {
         const idGenerator = (0, decorate_1.sourcedDeterministicCountingIdGenerator)(name.lexeme + '::' + rootId, name.location);
         data = {
@@ -70,7 +70,7 @@ function processEvalCall(name, args, rootId, data, config) {
     (0, unknown_side_effect_1.handleUnknownSideEffect)(information.graph, information.environment, rootId);
     return information;
 }
-function resolveEvalToCode(evalArgument, env, idMap, config) {
+function resolveEvalToCode(evalArgument, env, idMap, ctx) {
     const val = evalArgument;
     if (val.type === type_1.RType.FunctionCall && val.named && val.functionName.content === 'parse') {
         const arg = val.arguments.find(v => v !== r_function_call_1.EmptyArgument && v.name?.content === 'text');
@@ -82,13 +82,13 @@ function resolveEvalToCode(evalArgument, env, idMap, config) {
             return [arg.value.content.str];
         }
         else if (arg.value?.type === type_1.RType.Symbol) {
-            const resolved = (0, general_1.valueSetGuard)((0, alias_tracking_1.resolveIdToValue)(arg.value.info.id, { environment: env, idMap: idMap, resolve: config.solver.variables }));
+            const resolved = (0, general_1.valueSetGuard)((0, alias_tracking_1.resolveIdToValue)(arg.value.info.id, { environment: env, idMap: idMap, resolve: ctx.config.solver.variables, ctx }));
             if (resolved) {
                 return (0, string_constants_1.collectStrings)(resolved.elements);
             }
         }
         else if (arg.value?.type === type_1.RType.FunctionCall && arg.value.named && ['paste', 'paste0'].includes(arg.value.functionName.content)) {
-            return handlePaste(config, arg.value.arguments, env, idMap, arg.value.functionName.content === 'paste' ? [' '] : ['']);
+            return handlePaste(ctx.config, arg.value.arguments, env, idMap, arg.value.functionName.content === 'paste' ? [' '] : [''], ctx);
         }
         return undefined;
     }
@@ -101,7 +101,7 @@ function resolveEvalToCode(evalArgument, env, idMap, config) {
         return undefined;
     }
 }
-function getAsString(config, val, env, idMap) {
+function getAsString(config, val, env, idMap, ctx) {
     if (!val) {
         return undefined;
     }
@@ -109,17 +109,17 @@ function getAsString(config, val, env, idMap) {
         return [val.content.str];
     }
     else if (val.type === type_1.RType.Symbol) {
-        const resolved = (0, general_1.valueSetGuard)((0, alias_tracking_1.resolveIdToValue)(val.info.id, { environment: env, idMap: idMap, resolve: config.solver.variables }));
+        const resolved = (0, general_1.valueSetGuard)((0, alias_tracking_1.resolveIdToValue)(val.info.id, { environment: env, idMap: idMap, resolve: config.solver.variables, ctx }));
         if (resolved) {
             return (0, string_constants_1.collectStrings)(resolved.elements);
         }
     }
     return undefined;
 }
-function handlePaste(config, args, env, idMap, sepDefault) {
+function handlePaste(config, args, env, idMap, sepDefault, ctx) {
     const sepArg = args.find(v => v !== r_function_call_1.EmptyArgument && v.name?.content === 'sep');
     if (sepArg) {
-        const res = sepArg !== r_function_call_1.EmptyArgument && sepArg.value ? getAsString(config, sepArg.value, env, idMap) : undefined;
+        const res = sepArg !== r_function_call_1.EmptyArgument && sepArg.value ? getAsString(config, sepArg.value, env, idMap, ctx) : undefined;
         if (!res) {
             // sep not resolvable clearly / unknown
             return undefined;
@@ -128,7 +128,7 @@ function handlePaste(config, args, env, idMap, sepDefault) {
     }
     const allArgs = args
         .filter(v => v !== r_function_call_1.EmptyArgument && v.name?.content !== 'sep' && v.value)
-        .map(v => getAsString(config, v.value, env, idMap));
+        .map(v => getAsString(config, v.value, env, idMap, ctx));
     if (allArgs.some(assert_1.isUndefined)) {
         return undefined;
     }

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

@@ -7,7 +7,6 @@ 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 environment_1 = require("../../../../../environments/environment");
 const graph_1 = require("../../../../../graph/graph");
 const identifier_1 = require("../../../../../environments/identifier");
 const resolve_by_name_1 = require("../../../../../environments/resolve-by-name");
@@ -18,7 +17,7 @@ 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 remove_1 = require("../../../../../environments/remove");
+const reference_to_maybe_1 = require("../../../../../environments/reference-to-maybe");
 const dotDotDotAccess = /^\.\.\d+$/;
 function linkReadNameToWriteIfPossible(read, environments, listEnvironments, remainingRead, nextGraph) {
     const readName = read.name && dotDotDotAccess.test(read.name) ? '...' : read.name;
@@ -82,7 +81,10 @@ function updateSideEffectsForCalledFunctions(calledEnvs, inputEnvironment, nextG
                 // we update all definitions to be linked with the corresponding function call
                 // we, however, have to ignore expression-local writes!
                 if (localDefs.length > 0) {
-                    environment = (0, remove_1.removeAll)(localDefs, environment);
+                    environment = {
+                        current: environment.current.removeAll(localDefs.filter(d => (0, assert_1.isNotUndefined)(d.name))),
+                        level: environment.level
+                    };
                 }
                 if (callDependencies === null) {
                     callDependencies = nextGraph.getVertex(functionCall, true)?.cds;
@@ -97,7 +99,7 @@ function updateSideEffectsForCalledFunctions(calledEnvs, inputEnvironment, nextG
  *
  */
 function processExpressionList(name, args, rootId, data) {
-    const expressions = args.map(e => (0, unpack_argument_1.unpackArgument)(e));
+    const expressions = args.map(unpack_argument_1.unpackNonameArg);
     (0, log_1.expensiveTrace)(logger_1.dataflowLogger, () => `[expr list] with ${expressions.length} expressions`);
     let { environment } = data;
     // used to detect if a "write" happens within the same expression list
@@ -124,9 +126,9 @@ function processExpressionList(name, args, rootId, data) {
         // if the expression contained next or break anywhere before the next loop, the "overwrite" should be an "append", because we do not know if the rest is executed
         // update the environments for the next iteration with the previous writes
         if (exitPoints.length > 0) {
-            processed.out = (0, environment_1.makeAllMaybe)(processed.out, nextGraph, processed.environment, true);
-            processed.in = (0, environment_1.makeAllMaybe)(processed.in, nextGraph, processed.environment, false);
-            processed.unknownReferences = (0, environment_1.makeAllMaybe)(processed.unknownReferences, nextGraph, processed.environment, false);
+            processed.out = (0, reference_to_maybe_1.makeAllMaybe)(processed.out, nextGraph, processed.environment, true);
+            processed.in = (0, reference_to_maybe_1.makeAllMaybe)(processed.in, nextGraph, processed.environment, false);
+            processed.unknownReferences = (0, reference_to_maybe_1.makeAllMaybe)(processed.unknownReferences, nextGraph, processed.environment, false);
         }
         (0, info_1.addNonDefaultExitPoints)(exitPoints, processed.exitPoints);
         out = out.concat(processed.out);

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

@@ -12,9 +12,9 @@ const logger_1 = require("../../../../../logger");
 const overwrite_1 = require("../../../../../environments/overwrite");
 const define_1 = require("../../../../../environments/define");
 const append_1 = require("../../../../../environments/append");
-const environment_1 = require("../../../../../environments/environment");
 const edge_1 = require("../../../../../graph/edge");
 const identifier_1 = require("../../../../../environments/identifier");
+const reference_to_maybe_1 = require("../../../../../environments/reference-to-maybe");
 /**
  *
  */
@@ -23,7 +23,7 @@ function processForLoop(name, args, rootId, data) {
         logger_1.dataflowLogger.warn(`For-Loop ${name.content} does not have three arguments, skipping`);
         return (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: 'default' }).information;
     }
-    const [variableArg, vectorArg, bodyArg] = args.map(e => (0, unpack_argument_1.unpackArgument)(e));
+    const [variableArg, vectorArg, bodyArg] = args.map(e => (0, unpack_argument_1.unpackNonameArg)(e));
     (0, assert_1.guard)(variableArg !== undefined && vectorArg !== undefined && bodyArg !== undefined, () => `For-Loop ${JSON.stringify(args)} has missing arguments! Bad!`);
     const vector = (0, processor_1.processDataflowFor)(vectorArg, data);
     if ((0, info_1.alwaysExits)(vector)) {
@@ -50,7 +50,7 @@ function processForLoop(name, args, rootId, data) {
         nextGraph.addEdge(write.nodeId, vector.entryPoint, edge_1.EdgeType.DefinedBy);
         nextGraph.setDefinitionOfVertex(write);
     }
-    const outgoing = variable.out.concat(writtenVariable, (0, environment_1.makeAllMaybe)(body.out, nextGraph, outEnvironment, true));
+    const outgoing = variable.out.concat(writtenVariable, (0, reference_to_maybe_1.makeAllMaybe)(body.out, nextGraph, outEnvironment, true));
     (0, linker_1.linkCircularRedefinitionsWithinALoop)(nextGraph, nameIdShares, body.out);
     (0, linker_1.reapplyLoopExitPoints)(body.exitPoints, body.in.concat(body.out, body.unknownReferences));
     (0, common_1.patchFunctionCall)({

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

@@ -6,6 +6,7 @@ import { type RFunctionArgument } from '../../../../../../r-bridge/lang-4.x/ast/
 import type { 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';
 /**
  * Process a function definition, i.e., `function(a, b) { ... }`
  */
@@ -13,7 +14,7 @@ export declare function processFunctionDefinition<OtherInfo>(name: RSymbol<Other
 /**
  *
  */
-export declare function retrieveActiveEnvironment(callerEnvironment: REnvironmentInformation | undefined, baseEnvironment: REnvironmentInformation): REnvironmentInformation;
+export declare function retrieveActiveEnvironment(callerEnvironment: REnvironmentInformation | undefined, baseEnvironment: REnvironmentInformation, ctx: ReadOnlyFlowrAnalyzerContext): REnvironmentInformation;
 /**
  * Update the closure links of all nested function definitions
  * @param graph          - dataflow graph to collect the function definitions from and to update the closure links for

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

@@ -16,7 +16,6 @@ const identifier_1 = require("../../../../../environments/identifier");
 const overwrite_1 = require("../../../../../environments/overwrite");
 const vertex_1 = require("../../../../../graph/vertex");
 const scoping_1 = require("../../../../../environments/scoping");
-const environment_1 = require("../../../../../environments/environment");
 const resolve_by_name_1 = require("../../../../../environments/resolve-by-name");
 const edge_1 = require("../../../../../graph/edge");
 const log_1 = require("../../../../../../util/log");
@@ -31,7 +30,7 @@ function processFunctionDefinition(name, args, rootId, data) {
     }
     /* we remove the last argument, as it is the body */
     const parameters = args.slice(0, -1);
-    const bodyArg = (0, unpack_argument_1.unpackArgument)(args[args.length - 1]);
+    const bodyArg = (0, unpack_argument_1.unpackNonameArg)(args[args.length - 1]);
     (0, assert_1.guard)(bodyArg !== undefined, () => `Function Definition ${JSON.stringify(args)} has missing body! This is bad!`);
     const originalEnvironment = data.environment;
     // within a function def we do not pass on the outer binds as they could be overwritten when called
@@ -74,7 +73,7 @@ function processFunctionDefinition(name, args, rootId, data) {
                 id: read.nodeId,
                 environment: undefined,
                 cds: undefined
-            });
+            }, data.ctx.env.makeCleanEnv());
         }
     }
     const flow = {
@@ -95,7 +94,7 @@ function processFunctionDefinition(name, args, rootId, data) {
         cds: data.controlDependencies,
         subflow: flow,
         exitPoints: exitPoints?.filter(e => e.type === 1 /* ExitPointType.Return */ || e.type === 0 /* ExitPointType.Default */).map(e => e.nodeId) ?? []
-    });
+    }, data.ctx.env.makeCleanEnv());
     return {
         /* nothing escapes a function definition, but the function itself, will be forced in assignment: { nodeId: functionDefinition.info.id, scope: data.activeScope, used: 'always', name: functionDefinition.info.id as string } */
         unknownReferences: [],
@@ -112,8 +111,8 @@ function processFunctionDefinition(name, args, rootId, data) {
 /**
  *
  */
-function retrieveActiveEnvironment(callerEnvironment, baseEnvironment) {
-    callerEnvironment ??= (0, environment_1.initializeCleanEnvironments)(undefined, true);
+function retrieveActiveEnvironment(callerEnvironment, baseEnvironment, ctx) {
+    callerEnvironment ??= ctx.env.makeCleanEnv();
     let level = callerEnvironment.level ?? 0;
     if (baseEnvironment.level !== level) {
         while (baseEnvironment.level < level) {
@@ -135,10 +134,7 @@ function retrieveActiveEnvironment(callerEnvironment, baseEnvironment) {
 function updateNestedFunctionClosures(graph, outEnvironment, fnId) {
     // track *all* function definitions - including those nested within the current graph,
     // try to resolve their 'in' by only using the lowest scope which will be popped after this definition
-    for (const [id, { subflow, tag }] of graph.vertices(true)) {
-        if (tag !== vertex_1.VertexType.FunctionDefinition) {
-            continue;
-        }
+    for (const [id, { subflow }] of graph.verticesOfType(vertex_1.VertexType.FunctionDefinition)) {
         const ingoingRefs = subflow.in;
         const remainingIn = [];
         for (const ingoing of ingoingRefs) {
@@ -171,8 +167,8 @@ function updateNestedFunctionClosures(graph, outEnvironment, fnId) {
 function updateNestedFunctionCalls(graph, outEnvironment) {
     // track *all* function definitions - including those nested within the current graph,
     // try to resolve their 'in' by only using the lowest scope which will be popped after this definition
-    for (const [id, { onlyBuiltin, tag, environment, name }] of graph.vertices(true)) {
-        if (tag !== vertex_1.VertexType.FunctionCall || !name || onlyBuiltin) {
+    for (const [id, { onlyBuiltin, environment, name }] of graph.verticesOfType(vertex_1.VertexType.FunctionCall)) {
+        if (!name || onlyBuiltin) {
             continue;
         }
         // only the call environment counts!
@@ -218,7 +214,7 @@ function updateNestedFunctionCalls(graph, outEnvironment) {
     }
 }
 function prepareFunctionEnvironment(data) {
-    let env = (0, environment_1.initializeCleanEnvironments)(data.builtInEnvironment.memory);
+    let env = data.ctx.env.makeCleanEnv();
     for (let i = 0; i < data.environment.level + 1 /* add another env */; i++) {
         env = (0, scoping_1.pushLocalEnvironment)(env);
     }

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

@@ -16,7 +16,7 @@ function processGet(name, args, rootId, data) {
         logger_1.dataflowLogger.warn(`symbol access with ${name.content} has not 1 argument, skipping`);
         return (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: 'default' }).information;
     }
-    const retrieve = (0, unpack_argument_1.unpackArgument)(args[0]);
+    const retrieve = (0, unpack_argument_1.unpackNonameArg)(args[0]);
     if (retrieve === undefined || retrieve.type !== type_1.RType.String) {
         logger_1.dataflowLogger.warn(`symbol access with ${name.content} has not 1 argument, skipping`);
         return (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: 'default' }).information;

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

@@ -5,6 +5,8 @@ import type { ParentInformation } from '../../../../../../r-bridge/lang-4.x/ast/
 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';
 /**
- *
+ * Processes an if-then-else built-in function call.
+ * For example, `if(cond) thenExpr else elseExpr` and `if(cond) thenExpr`.
+ * The arguments will be either `[cond, thenExpr]` or `[cond, thenExpr, elseExpr]`.
  */
 export declare function processIfThenElse<OtherInfo>(name: RSymbol<OtherInfo & ParentInformation>, args: readonly RFunctionArgument<OtherInfo & ParentInformation>[], rootId: NodeId, data: DataflowProcessorInformation<OtherInfo & ParentInformation>): DataflowInformation;

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

@@ -10,18 +10,20 @@ const logger_1 = require("../../../../../logger");
 const edge_1 = require("../../../../../graph/edge");
 const append_1 = require("../../../../../environments/append");
 const identifier_1 = require("../../../../../environments/identifier");
-const environment_1 = require("../../../../../environments/environment");
 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");
 /**
- *
+ * Processes an if-then-else built-in function call.
+ * For example, `if(cond) thenExpr else elseExpr` and `if(cond) thenExpr`.
+ * The arguments will be either `[cond, thenExpr]` or `[cond, thenExpr, elseExpr]`.
  */
 function processIfThenElse(name, args, rootId, data) {
     if (args.length !== 2 && args.length !== 3) {
         logger_1.dataflowLogger.warn(`If-then-else ${name.content} has something different from 2 or 3 arguments, skipping`);
         return (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: 'default' }).information;
     }
-    const [condArg, thenArg, otherwiseArg] = args.map(e => (0, unpack_argument_1.unpackArgument)(e));
+    const [condArg, thenArg, otherwiseArg] = args.map(e => (0, unpack_argument_1.unpackNonameArg)(e));
     if (condArg === undefined || thenArg === undefined) {
         logger_1.dataflowLogger.warn(`If-then-else ${name.content} has empty condition or then case in ${JSON.stringify(args)}, skipping`);
         return (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: 'default' }).information;
@@ -37,7 +39,7 @@ function processIfThenElse(name, args, rootId, data) {
     let then;
     let makeThenMaybe = false;
     // we should defer this to the abstract interpretation
-    const values = (0, alias_tracking_1.resolveIdToValue)(condArg?.info.id, { environment: data.environment, idMap: data.completeAst.idMap, resolve: data.ctx.config.solver.variables });
+    const values = (0, alias_tracking_1.resolveIdToValue)(condArg?.info.id, { environment: data.environment, idMap: data.completeAst.idMap, resolve: data.ctx.config.solver.variables, ctx: data.ctx });
     const conditionIsAlwaysFalse = (0, general_1.valueSetGuard)(values)?.elements.every(d => d.type === 'logical' && d.value === false) ?? false;
     const conditionIsAlwaysTrue = (0, general_1.valueSetGuard)(values)?.elements.every(d => d.type === 'logical' && d.value === true) ?? false;
     if (!conditionIsAlwaysFalse) {
@@ -77,10 +79,10 @@ function processIfThenElse(name, args, rootId, data) {
     const cdTrue = { id: rootId, when: true };
     const cdFalse = { id: rootId, when: false };
     // again within an if-then-else we consider all actives to be read
-    const ingoing = cond.in.concat(makeThenMaybe ? (0, environment_1.makeAllMaybe)(then?.in, nextGraph, finalEnvironment, false, cdTrue) : then?.in ?? [], makeOtherwiseMaybe ? (0, environment_1.makeAllMaybe)(otherwise?.in, nextGraph, finalEnvironment, false, cdFalse) : otherwise?.in ?? [], cond.unknownReferences, makeThenMaybe ? (0, environment_1.makeAllMaybe)(then?.unknownReferences, nextGraph, finalEnvironment, false, cdTrue) : then?.unknownReferences ?? [], makeOtherwiseMaybe ? (0, environment_1.makeAllMaybe)(otherwise?.unknownReferences, nextGraph, finalEnvironment, false, cdFalse) : otherwise?.unknownReferences ?? []);
+    const ingoing = cond.in.concat(makeThenMaybe ? (0, reference_to_maybe_1.makeAllMaybe)(then?.in, nextGraph, finalEnvironment, false, cdTrue) : then?.in ?? [], makeOtherwiseMaybe ? (0, reference_to_maybe_1.makeAllMaybe)(otherwise?.in, nextGraph, finalEnvironment, false, cdFalse) : otherwise?.in ?? [], cond.unknownReferences, makeThenMaybe ? (0, reference_to_maybe_1.makeAllMaybe)(then?.unknownReferences, nextGraph, finalEnvironment, false, cdTrue) : then?.unknownReferences ?? [], makeOtherwiseMaybe ? (0, reference_to_maybe_1.makeAllMaybe)(otherwise?.unknownReferences, nextGraph, finalEnvironment, false, cdFalse) : otherwise?.unknownReferences ?? []);
     // we assign all with a maybe marker
     // we do not merge even if they appear in both branches because the maybe links will refer to different ids
-    const outgoing = cond.out.concat((makeThenMaybe ? (0, environment_1.makeAllMaybe)(then?.out, nextGraph, finalEnvironment, true, cdTrue) : then?.out ?? []), (makeOtherwiseMaybe ? (0, environment_1.makeAllMaybe)(otherwise?.out, nextGraph, finalEnvironment, true, cdFalse) : otherwise?.out ?? []));
+    const outgoing = cond.out.concat((makeThenMaybe ? (0, reference_to_maybe_1.makeAllMaybe)(then?.out, nextGraph, finalEnvironment, true, cdTrue) : then?.out ?? []), (makeOtherwiseMaybe ? (0, reference_to_maybe_1.makeAllMaybe)(otherwise?.out, nextGraph, finalEnvironment, true, cdFalse) : otherwise?.out ?? []));
     (0, common_1.patchFunctionCall)({
         nextGraph,
         rootId,

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

@@ -15,7 +15,7 @@ function processLibrary(name, args, rootId, data) {
         logger_1.dataflowLogger.warn(`Currently only one-arg library-likes are allows (for ${name.content}), skipping`);
         return (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, hasUnknownSideEffect: true, origin: 'default' }).information;
     }
-    const nameToLoad = (0, unpack_argument_1.unpackArgument)(args[0]);
+    const nameToLoad = (0, unpack_argument_1.unpackNonameArg)(args[0]);
     if (nameToLoad === undefined || nameToLoad.type !== type_1.RType.Symbol) {
         logger_1.dataflowLogger.warn('No library name provided, skipping');
         return (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, hasUnknownSideEffect: true, origin: 'default' }).information;

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

@@ -18,7 +18,7 @@ function processPipe(name, args, rootId, data) {
         logger_1.dataflowLogger.warn(`Pipe ${name.content} has something else than 2 arguments, skipping`);
         return information;
     }
-    const [lhs, rhs] = args.map(e => (0, unpack_argument_1.unpackArgument)(e));
+    const [lhs, rhs] = args.map(e => (0, unpack_argument_1.unpackNonameArg)(e));
     (0, assert_1.guard)(lhs !== undefined && rhs !== undefined, () => `lhs and rhs must be present, but ${JSON.stringify(lhs)} and ${JSON.stringify(rhs)} were found instead.`);
     if (rhs.type !== type_1.RType.FunctionCall) {
         logger_1.dataflowLogger.warn(`Expected rhs of pipe to be a function call, but got ${rhs.type} instead.`);

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

@@ -21,7 +21,7 @@ function processRepeatLoop(name, args, rootId, data) {
         logger_1.dataflowLogger.warn(`Repeat-Loop ${name.content} does not have 1 argument, skipping`);
         return (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: 'default' }).information;
     }
-    const unpacked = (0, unpack_argument_1.unpackArgument)(args[0]);
+    const unpacked = (0, unpack_argument_1.unpackNonameArg)(args[0]);
     const { information, processedArguments } = (0, known_call_handling_1.processKnownFunctionCall)({
         name,
         args: unpacked ? [unpacked] : args,

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

@@ -59,11 +59,11 @@ args, rootId, data, config) {
         data,
         rootId,
         name,
-        argumentProcessResult: args.map(a => a === r_function_call_1.EmptyArgument ? undefined : { entryPoint: (0, unpack_argument_1.unpackArgument)(a)?.info.id }),
+        argumentProcessResult: args.map(a => a === r_function_call_1.EmptyArgument ? undefined : { entryPoint: (0, unpack_argument_1.unpackNonameArg)(a)?.info.id }),
         origin: 'builtin:replacement',
         link: config.assignRootId ? { origin: [config.assignRootId] } : undefined
     });
-    const firstArg = (0, unpack_argument_1.unpackArgument)(args[0]);
+    const firstArg = (0, unpack_argument_1.unpackNonameArg)(args[0]);
     (0, unknown_replacement_1.handleReplacementOperator)({
         operator: name.content,
         target: firstArg?.lexeme,
@@ -80,7 +80,7 @@ args, rootId, data, config) {
             res.graph.addEdge(rootId, ref, edge_1.EdgeType.Reads);
         }
     }
-    const fa = (0, unpack_argument_1.unpackArgument)(args[0]);
+    const fa = (0, unpack_argument_1.unpackNonameArg)(args[0]);
     if (!data.ctx.config.solver.pointerTracking && fa) {
         res = {
             ...res,

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

@@ -4,7 +4,6 @@ exports.processRm = processRm;
 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 logger_1 = require("../../../../../logger");
-const remove_1 = require("../../../../../environments/remove");
 const type_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/type");
 /**
  *
@@ -32,13 +31,16 @@ function processRm(name, args, rootId, data) {
             names.push(unpacked.content.str);
         }
     }
-    let env = res.environment;
+    let env = res.environment.current;
     for (const name of names) {
-        env = (0, remove_1.remove)(name, env, data.builtInEnvironment);
+        env = env.remove(name);
     }
     return {
         ...res,
-        environment: env
+        environment: {
+            current: env,
+            level: res.environment.level
+        }
     };
 }
 //# sourceMappingURL=built-in-rm.js.map

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

@@ -148,7 +148,7 @@ function processSourceCall(name, args, rootId, data, config) {
         sourceFile = [(0, retriever_1.removeRQuotes)(sourceFileArgument.lexeme)];
     }
     else if (sourceFileArgument !== r_function_call_1.EmptyArgument) {
-        const resolved = (0, general_1.valueSetGuard)((0, alias_tracking_1.resolveIdToValue)(sourceFileArgument.info.id, { environment: data.environment, idMap: data.completeAst.idMap, resolve: data.ctx.config.solver.variables }));
+        const resolved = (0, general_1.valueSetGuard)((0, alias_tracking_1.resolveIdToValue)(sourceFileArgument.info.id, { environment: data.environment, idMap: data.completeAst.idMap, resolve: data.ctx.config.solver.variables, ctx: data.ctx }));
         sourceFile = resolved?.elements.map(r => r.type === 'string' && (0, r_value_1.isValue)(r.value) ? r.value.str : undefined).filter(assert_1.isNotUndefined);
     }
     if (sourceFile && sourceFile.length === 1) {

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

@@ -8,11 +8,11 @@ const assert_1 = require("../../../../../../util/assert");
 const unpack_argument_1 = require("../argument/unpack-argument");
 const r_function_call_1 = require("../../../../../../r-bridge/lang-4.x/ast/model/nodes/r-function-call");
 const logger_1 = require("../../../../../logger");
-const environment_1 = require("../../../../../environments/environment");
 const edge_1 = require("../../../../../graph/edge");
 const identifier_1 = require("../../../../../environments/identifier");
 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");
 /**
  *
  */
@@ -21,13 +21,13 @@ function processWhileLoop(name, args, rootId, data) {
         logger_1.dataflowLogger.warn(`While-Loop ${name.content} does not have 2 arguments, skipping`);
         return (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: 'default' }).information;
     }
-    const unpackedArgs = args.map(e => (0, unpack_argument_1.unpackArgument)(e));
+    const unpackedArgs = args.map(e => (0, unpack_argument_1.unpackNonameArg)(e));
     if (unpackedArgs.some(assert_1.isUndefined)) {
         logger_1.dataflowLogger.warn(`While-Loop ${name.content} has empty arguments in ${JSON.stringify(args)}, skipping`);
         return (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, origin: 'default' }).information;
     }
     // we should defer this to the abstract interpretation
-    const values = (0, alias_tracking_1.resolveIdToValue)(unpackedArgs[0]?.info.id, { environment: data.environment, idMap: data.completeAst.idMap, resolve: data.ctx.config.solver.variables });
+    const values = (0, alias_tracking_1.resolveIdToValue)(unpackedArgs[0]?.info.id, { environment: data.environment, idMap: data.completeAst.idMap, resolve: data.ctx.config.solver.variables, ctx: data.ctx });
     const conditionIsAlwaysFalse = (0, general_1.valueSetGuard)(values)?.elements.every(d => d.type === 'logical' && d.value === false) ?? false;
     //We don't care about the body if it never executes
     if (conditionIsAlwaysFalse) {
@@ -69,7 +69,7 @@ function processWhileLoop(name, args, rootId, data) {
         return condition;
     }
     const cdTrue = { id: name.info.id, when: true };
-    const remainingInputs = (0, linker_1.linkInputs)((0, environment_1.makeAllMaybe)(body.unknownReferences, information.graph, information.environment, false, cdTrue).concat((0, environment_1.makeAllMaybe)(body.in, information.graph, information.environment, false, cdTrue)), information.environment, condition.in.concat(condition.unknownReferences), information.graph, true);
+    const remainingInputs = (0, linker_1.linkInputs)((0, reference_to_maybe_1.makeAllMaybe)(body.unknownReferences, information.graph, information.environment, false, cdTrue).concat((0, reference_to_maybe_1.makeAllMaybe)(body.in, information.graph, information.environment, false, cdTrue)), information.environment, condition.in.concat(condition.unknownReferences), information.graph, true);
     (0, linker_1.linkCircularRedefinitionsWithinALoop)(information.graph, (0, linker_1.produceNameSharedIdMap)((0, linker_1.findNonLocalReads)(information.graph, condition.in)), body.out);
     (0, linker_1.reapplyLoopExitPoints)(body.exitPoints, body.in.concat(body.out, body.unknownReferences));
     // as the while-loop always evaluates its condition
@@ -77,7 +77,7 @@ function processWhileLoop(name, args, rootId, data) {
     return {
         unknownReferences: [],
         in: [{ nodeId: name.info.id, name: name.lexeme, controlDependencies: originalDependency, type: identifier_1.ReferenceType.Function }, ...remainingInputs],
-        out: condition.out.concat((0, environment_1.makeAllMaybe)(body.out, information.graph, information.environment, true, cdTrue)),
+        out: condition.out.concat((0, reference_to_maybe_1.makeAllMaybe)(body.out, information.graph, information.environment, true, cdTrue)),
         entryPoint: name.info.id,
         exitPoints: (0, info_1.filterOutLoopExitPoints)(body.exitPoints),
         graph: information.graph,

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

@@ -29,8 +29,7 @@ function forceVertexArgumentValueReferences(rootId, value, graph, env) {
             }
         }
     }
-    const containedSubflowIn = graph.vertices(true)
-        .filter(([, info]) => (0, vertex_1.isFunctionDefinitionVertex)(info))
+    const containedSubflowIn = graph.verticesOfType(vertex_1.VertexType.FunctionDefinition)
         .flatMap(([, info]) => info.subflow.in)
         .toArray();
     // try to resolve them against the current environment
@@ -122,7 +121,7 @@ function patchFunctionCall({ nextGraph, rootId, name, data, argumentProcessResul
         args: argumentProcessResult.map(arg => arg === undefined ? r_function_call_1.EmptyArgument : { nodeId: arg.entryPoint, controlDependencies: undefined, call: undefined, type: identifier_1.ReferenceType.Argument }),
         origin: [origin],
         link
-    }, !nextGraph.hasVertex(rootId) || nextGraph.isRoot(rootId), true);
+    }, data.ctx.env.makeCleanEnv(), !nextGraph.hasVertex(rootId) || nextGraph.isRoot(rootId), true);
     for (const arg of argumentProcessResult) {
         if (arg) {
             nextGraph.addEdge(rootId, arg.entryPoint, edge_1.EdgeType.Argument);

package/dataflow/internal/process/functions/call/known-call-handling.js

@@ -52,7 +52,7 @@ function processKnownFunctionCall({ name, args, rootId, data, reverseOrder = fal
         args: reverseOrder ? callArgs.reverse() : callArgs,
         indicesCollection: indicesCollection,
         origin: origin === 'default' ? ['function'] : [origin]
-    });
+    }, data.ctx.env.makeCleanEnv());
     if (hasUnknownSideEffect) {
         (0, unknown_side_effect_1.handleUnknownSideEffect)(finalGraph, data.environment, rootId);
     }

package/dataflow/internal/process/functions/call/unnamed-call-handling.js

@@ -45,7 +45,7 @@ function processUnnamedFunctionCall(functionCall, data) {
         cds: data.controlDependencies,
         args: callArgs, // same reference
         origin: [exports.UnnamedFunctionCallOrigin]
-    });
+    }, data.ctx.env.makeCleanEnv());
     let inIds = remainingReadInArgs;
     inIds.push({ nodeId: functionRootId, name: functionCallName, controlDependencies: data.controlDependencies, type: identifier_1.ReferenceType.Function });
     if (functionCall.calledFunction.type === type_1.RType.FunctionDefinition) {

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

@@ -34,7 +34,7 @@ function processFunctionArgument(argument, data) {
             tag: vertex_1.VertexType.Use,
             id: argument.info.id,
             cds: data.controlDependencies
-        });
+        }, data.ctx.env.makeCleanEnv());
         entryPoint = argument.info.id;
     }
     const ingoingRefs = [...value?.unknownReferences ?? [], ...value?.in ?? [], ...(name === undefined ? [] : [...name.in])];

package/dataflow/internal/process/process-symbol.js

@@ -22,7 +22,7 @@ function processSymbol(symbol, data) {
             tag: vertex_1.VertexType.Use,
             id: symbol.info.id,
             cds: data.controlDependencies
-        }),
+        }, data.ctx.env.makeCleanEnv()),
         entryPoint: symbol.info.id,
         exitPoints: [{ nodeId: symbol.info.id, type: 0 /* ExitPointType.Default */, controlDependencies: data.controlDependencies }]
     };

package/dataflow/internal/process/process-value.d.ts

@@ -4,4 +4,4 @@ import type { RNodeWithParent } from '../../../r-bridge/lang-4.x/ast/model/proce
 /**
  *
  */
-export declare function processValue<OtherInfo>({ info: { id } }: RNodeWithParent, data: DataflowProcessorInformation<OtherInfo>): DataflowInformation;
+export declare function processValue<OtherInfo>({ info: { id } }: RNodeWithParent, { controlDependencies, completeAst: { idMap }, ctx: { env }, environment }: DataflowProcessorInformation<OtherInfo>): DataflowInformation;