@eagleoutice/flowr 2.9.14 → 2.10.2

package/config.js

@@ -93,7 +93,8 @@ exports.FlowrConfig = {
                     dataflowExtractors: undefined
                 },
                 slicer: {
-                    threshold: 50
+                    threshold: 50,
+                    autoExtend: false
                 }
             },
             abstractInterpretation: {
@@ -153,7 +154,8 @@ exports.FlowrConfig = {
                 applyReplacements: joi_1.default.array().items(joi_1.default.object()).description('Provide name replacements for loaded files')
             }).optional().description('If lax source calls are active, flowR searches for sourced files much more freely, based on the configurations you give it. This option is only in effect if `ignoreSourceCalls` is set to false.'),
             slicer: joi_1.default.object({
-                threshold: joi_1.default.number().optional().description('The maximum number of iterations to perform on a single function call during slicing.')
+                threshold: joi_1.default.number().optional().description('The maximum number of iterations to perform on a single function call during slicing.'),
+                autoExtend: joi_1.default.boolean().optional().description('If set, the slicer will gain an additional post-pass.')
             }).optional().description('The configuration for the slicer.')
         }).description('How to resolve constants, constraints, cells, ...'),
         abstractInterpretation: joi_1.default.object({
@@ -250,7 +252,7 @@ exports.FlowrConfig = {
      */
     setInConfigInPlace(config, key, value) {
         object_path_1.default.set(config, key, value);
-    }
+    },
 };
 function loadConfigFromFile(configFile, workingDirectory) {
     if (configFile !== undefined) {

package/control-flow/control-flow-graph.js

@@ -589,16 +589,20 @@ class ControlFlowGraph {
      * @see {@link ControlFlowGraph#addEdges|addEdges()} - to add multiple edges at once
      */
     addEdge(from, to, edge) {
-        const edgesFrom = this.edgeInfos.get(from) ?? new Map();
-        if (!this.edgeInfos.has(from)) {
-            this.edgeInfos.set(from, edgesFrom);
+        const edgesFrom = this.edgeInfos.get(from);
+        if (!edgesFrom) {
+            this.edgeInfos.set(from, new Map([[to, edge]]));
+        }
+        else {
+            edgesFrom.set(to, edge);
         }
-        edgesFrom.set(to, edge);
-        const edgesTo = this.revEdgeInfos.get(to) ?? new Map();
-        if (!this.revEdgeInfos.has(to)) {
-            this.revEdgeInfos.set(to, edgesTo);
+        const edgesTo = this.revEdgeInfos.get(to);
+        if (!edgesTo) {
+            this.revEdgeInfos.set(to, new Map([[from, edge]]));
+        }
+        else {
+            edgesTo.set(from, edge);
         }
-        edgesTo.set(from, edge);
         return this;
     }
     /**
@@ -762,7 +766,7 @@ class ControlFlowGraph {
         const roots = other.roots;
         if (this._mayBB) {
             for (const [id, node] of other.vtxInfos) {
-                this.addVertex(node, forceNested ? false : roots.has(id));
+                this.addVertex(node, !forceNested && roots.has(id));
             }
         }
         else {

package/control-flow/semantic-cfg-guided-visitor.d.ts

@@ -566,4 +566,10 @@ export declare class SemanticCfgGuidedVisitor<OtherInfo = NoInfo, ControlFlow ex
     protected onRecallCall(_data: {
         call: DataflowGraphVertexFunctionCall;
     }): void;
+    /**
+     * This event triggers for any purr formula as in `map(df, ~ .x + 1)`
+     */
+    protected onPurrFormulaCall(_data: {
+        call: DataflowGraphVertexFunctionCall;
+    }): void;
 }

package/control-flow/semantic-cfg-guided-visitor.js

@@ -278,6 +278,8 @@ class SemanticCfgGuidedVisitor extends dfg_cfg_guided_visitor_1.DataflowAwareCfg
                 return this.onUnnamedCall({ call });
             case built_in_proc_name_1.BuiltInProcName.Recall:
                 return this.onRecallCall({ call });
+            case built_in_proc_name_1.BuiltInProcName.PurrrFormula:
+                return this.onPurrFormulaCall({ call });
             case built_in_proc_name_1.BuiltInProcName.Default:
             case built_in_proc_name_1.BuiltInProcName.DefaultReadAllArgs:
             case built_in_proc_name_1.BuiltInProcName.Function:
@@ -640,6 +642,10 @@ class SemanticCfgGuidedVisitor extends dfg_cfg_guided_visitor_1.DataflowAwareCfg
      * @protected
      */
     onRecallCall(_data) { }
+    /**
+     * This event triggers for any purr formula as in `map(df, ~ .x + 1)`
+     */
+    onPurrFormulaCall(_data) { }
 }
 exports.SemanticCfgGuidedVisitor = SemanticCfgGuidedVisitor;
 //# sourceMappingURL=semantic-cfg-guided-visitor.js.map

package/dataflow/environments/built-in-proc-name.d.ts

@@ -38,6 +38,12 @@ export declare enum BuiltInProcName {
     Local = "builtin:local",
     /** for the pipe operators, see {@link processPipe} */
     Pipe = "builtin:pipe",
+    /**
+     * Support for purrr's functional style of formulas with implicit arguments,
+     * for example, supports `map(g, ~ .x + 2)`
+     * @see {@link processPurrrFormula}
+     */
+    PurrrFormula = "builtin:purrr-formula",
     /** for `quote`, and other substituting calls, see {@link processQuote} */
     Quote = "builtin:quote",
     /**

package/dataflow/environments/built-in-proc-name.js

@@ -42,6 +42,12 @@ var BuiltInProcName;
     BuiltInProcName["Local"] = "builtin:local";
     /** for the pipe operators, see {@link processPipe} */
     BuiltInProcName["Pipe"] = "builtin:pipe";
+    /**
+     * Support for purrr's functional style of formulas with implicit arguments,
+     * for example, supports `map(g, ~ .x + 2)`
+     * @see {@link processPurrrFormula}
+     */
+    BuiltInProcName["PurrrFormula"] = "builtin:purrr-formula";
     /** for `quote`, and other substituting calls, see {@link processQuote} */
     BuiltInProcName["Quote"] = "builtin:quote";
     /**

package/dataflow/environments/built-in.d.ts

@@ -15,7 +15,7 @@ import { processFunctionDefinition } from '../internal/process/functions/call/bu
 import { processExpressionList } from '../internal/process/functions/call/built-in/built-in-expression-list';
 import { processGet } from '../internal/process/functions/call/built-in/built-in-get';
 import type { AstIdMap, ParentInformation, RNodeWithParent } 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 PotentiallyEmptyRArgument } from '../../r-bridge/lang-4.x/ast/model/nodes/r-function-call';
 import { RSymbol } from '../../r-bridge/lang-4.x/ast/model/nodes/r-symbol';
 import { type BuiltIn, NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import { processLibrary } from '../internal/process/functions/call/built-in/built-in-library';
@@ -43,8 +43,9 @@ import { processRecall } from '../internal/process/functions/call/built-in/built
 import { processS7NewGeneric } from '../internal/process/functions/call/built-in/built-in-s-seven-new-generic';
 import { processS7Dispatch } from '../internal/process/functions/call/built-in/built-in-s-seven-dispatch';
 import { BuiltInProcName } from './built-in-proc-name';
-export type BuiltInIdentifierProcessor = <OtherInfo>(name: RSymbol<OtherInfo & ParentInformation>, args: readonly RFunctionArgument<OtherInfo & ParentInformation>[], rootId: NodeId, data: DataflowProcessorInformation<OtherInfo & ParentInformation>) => DataflowInformation;
-export type BuiltInIdentifierProcessorWithConfig<Config> = <OtherInfo>(name: RSymbol<OtherInfo & ParentInformation>, args: readonly RFunctionArgument<OtherInfo & ParentInformation>[], rootId: NodeId, data: DataflowProcessorInformation<OtherInfo & ParentInformation>, config: Config) => DataflowInformation;
+import { processPurrrFormula } from '../internal/process/functions/call/built-in/built-in-purrr-formula';
+export type BuiltInIdentifierProcessor = <OtherInfo>(name: RSymbol<OtherInfo & ParentInformation>, args: readonly PotentiallyEmptyRArgument<OtherInfo & ParentInformation>[], rootId: NodeId, data: DataflowProcessorInformation<OtherInfo & ParentInformation>) => DataflowInformation;
+export type BuiltInIdentifierProcessorWithConfig<Config> = <OtherInfo>(name: RSymbol<OtherInfo & ParentInformation>, args: readonly PotentiallyEmptyRArgument<OtherInfo & ParentInformation>[], rootId: NodeId, data: DataflowProcessorInformation<OtherInfo & ParentInformation>, config: Config) => DataflowInformation;
 export interface BuiltInIdentifierDefinition extends IdentifierReference {
     type: ReferenceType.BuiltInFunction;
     definedAt: BuiltIn;
@@ -81,8 +82,8 @@ export interface BuiltInEvalHandlerArgs {
     blocked?: Set<NodeId>;
 }
 export type BuiltInEvalHandler = (args: BuiltInEvalHandlerArgs) => Value;
-declare function defaultBuiltInProcessor<OtherInfo>(name: RSymbol<OtherInfo & ParentInformation>, args: readonly RFunctionArgument<OtherInfo & ParentInformation>[], rootId: NodeId, data: DataflowProcessorInformation<OtherInfo & ParentInformation>, { returnsNthArgument, useAsProcessor, forceArgs, readAllArguments, cfg, hasUnknownSideEffects, treatAsFnCall }: DefaultBuiltInProcessorConfiguration): DataflowInformation;
-declare function defaultBuiltInProcessorReadallArgs<OtherInfo>(name: RSymbol<OtherInfo & ParentInformation>, args: readonly RFunctionArgument<OtherInfo & ParentInformation>[], rootId: NodeId, data: DataflowProcessorInformation<OtherInfo & ParentInformation>, { useAsProcessor, forceArgs }: Pick<DefaultBuiltInProcessorConfiguration, 'useAsProcessor' | 'forceArgs'>): DataflowInformation;
+declare function defaultBuiltInProcessor<OtherInfo>(name: RSymbol<OtherInfo & ParentInformation>, args: readonly PotentiallyEmptyRArgument<OtherInfo & ParentInformation>[], rootId: NodeId, data: DataflowProcessorInformation<OtherInfo & ParentInformation>, { returnsNthArgument, useAsProcessor, forceArgs, readAllArguments, cfg, hasUnknownSideEffects, treatAsFnCall }: DefaultBuiltInProcessorConfiguration): DataflowInformation;
+declare function defaultBuiltInProcessorReadallArgs<OtherInfo>(name: RSymbol<OtherInfo & ParentInformation>, args: readonly PotentiallyEmptyRArgument<OtherInfo & ParentInformation>[], rootId: NodeId, data: DataflowProcessorInformation<OtherInfo & ParentInformation>, { useAsProcessor, forceArgs }: Pick<DefaultBuiltInProcessorConfiguration, 'useAsProcessor' | 'forceArgs'>): DataflowInformation;
 export declare const BuiltInProcessorMapper: {
     readonly "builtin:access": typeof processAccess;
     readonly "builtin:apply": typeof processApply;
@@ -100,6 +101,7 @@ export declare const BuiltInProcessorMapper: {
     readonly "builtin:list": typeof processList;
     readonly "builtin:local": typeof processLocal;
     readonly "builtin:pipe": typeof processPipe;
+    readonly "builtin:purrr-formula": typeof processPurrrFormula;
     readonly "builtin:quote": typeof processQuote;
     readonly "builtin:recall": typeof processRecall;
     readonly "builtin:register-hook": typeof processRegisterHook;

package/dataflow/environments/built-in.js

@@ -41,6 +41,7 @@ const built_in_s_seven_new_generic_1 = require("../internal/process/functions/ca
 const built_in_s_seven_dispatch_1 = require("../internal/process/functions/call/built-in/built-in-s-seven-dispatch");
 const r_string_1 = require("../../r-bridge/lang-4.x/ast/model/nodes/r-string");
 const built_in_proc_name_1 = require("./built-in-proc-name");
+const built_in_purrr_formula_1 = require("../internal/process/functions/call/built-in/built-in-purrr-formula");
 function defaultBuiltInProcessor(name, args, rootId, data, { returnsNthArgument, useAsProcessor = built_in_proc_name_1.BuiltInProcName.Default, forceArgs, readAllArguments, cfg, hasUnknownSideEffects, treatAsFnCall }) {
     const { information: res, processedArguments } = (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, forceArgs, origin: useAsProcessor });
     if (returnsNthArgument !== undefined) {
@@ -127,6 +128,7 @@ exports.BuiltInProcessorMapper = {
     [built_in_proc_name_1.BuiltInProcName.List]: built_in_list_1.processList,
     [built_in_proc_name_1.BuiltInProcName.Local]: built_in_local_1.processLocal,
     [built_in_proc_name_1.BuiltInProcName.Pipe]: built_in_pipe_1.processPipe,
+    [built_in_proc_name_1.BuiltInProcName.PurrrFormula]: built_in_purrr_formula_1.processPurrrFormula,
     [built_in_proc_name_1.BuiltInProcName.Quote]: built_in_quote_1.processQuote,
     [built_in_proc_name_1.BuiltInProcName.Recall]: built_in_recall_1.processRecall,
     [built_in_proc_name_1.BuiltInProcName.RegisterHook]: built_in_register_hook_1.processRegisterHook,