@eagleoutice/flowr 2.4.7 → 2.5.0

package/control-flow/useless-loop.js

@@ -58,6 +58,8 @@ function onlyLoopsOnce(loop, dataflow, controlflow, ast, config) {
     return visitor.loopsOnlyOnce();
 }
 class CfgSingleIterationLoopDetector extends semantic_cfg_guided_visitor_1.SemanticCfgGuidedVisitor {
+    loopCds = undefined;
+    encounteredLoopBreaker = false;
     onlyLoopyOnce = false;
     loopToCheck;
     constructor(loop, config) {
@@ -76,7 +78,7 @@ class CfgSingleIterationLoopDetector extends semantic_cfg_guided_visitor_1.Seman
     }
     startVisitor(_) {
         const g = this.config.controlFlow.graph;
-        const n = (i) => g.ingoingEdges(i);
+        const ingoing = (i) => g.ingoingEdges(i);
         const exits = new Set(g.getVertex(this.loopToCheck)?.end ?? []);
         (0, assert_1.guard)(exits.size !== 0, "Can't find end of loop");
         const stack = [this.loopToCheck];
@@ -86,38 +88,45 @@ class CfgSingleIterationLoopDetector extends semantic_cfg_guided_visitor_1.Seman
                 continue;
             }
             if (!exits.has(current)) {
-                const next = n(current) ?? [];
+                const next = ingoing(current) ?? [];
                 for (const [to] of next) {
                     stack.unshift(to);
                 }
             }
+            this.onlyLoopyOnce ||= this.encounteredLoopBreaker && (0, info_1.happensInEveryBranch)(this.loopCds);
+        }
+        this.onlyLoopyOnce ||= this.encounteredLoopBreaker && (0, info_1.happensInEveryBranch)(this.loopCds);
+    }
+    app(cds) {
+        if (cds === undefined) {
+            return;
+        }
+        const filtered = cds.filter(c => c.id !== this.loopToCheck);
+        if (filtered.length > 0) {
+            if (this.loopCds === undefined) {
+                this.loopCds = filtered;
+            }
+            else {
+                this.loopCds = this.loopCds.concat(filtered);
+            }
         }
     }
     onDefaultFunctionCall(data) {
-        let stopsLoop = false;
-        const alwaysHappens = () => {
-            if (!data.call.cds ||
-                (data.call.cds.length === 1 && data.call.cds[0].id === this.loopToCheck)) {
-                return true;
+        for (const origin of data.call.origin) {
+            if (origin === 'builtin:stop' || origin === 'builtin:return' || origin === 'builtin:break') {
+                this.encounteredLoopBreaker = true;
+                this.app(data.call.cds);
+                return;
             }
-            const cds = data.call.cds.filter(d => d.id !== this.loopToCheck);
-            return (0, info_1.happensInEveryBranch)(cds);
-        };
-        switch (data.call.origin[0]) {
-            case 'builtin:return':
-            case 'builtin:stop':
-            case 'builtin:break':
-                stopsLoop = alwaysHappens();
-                break;
-            case 'builtin:stopifnot': {
+            else if (origin === 'builtin:stopifnot') {
                 const arg = this.getBoolArgValue(data);
-                if (arg !== undefined) {
-                    stopsLoop = !arg && alwaysHappens();
+                if (arg === false) {
+                    this.encounteredLoopBreaker = true;
+                    this.app(data.call.cds);
+                    return;
                 }
-                break;
             }
         }
-        this.onlyLoopyOnce = this.onlyLoopyOnce || stopsLoop;
     }
     loopsOnlyOnce() {
         this.startVisitor([]);

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

@@ -55,7 +55,7 @@ export interface DefaultBuiltInProcessorConfiguration extends ForceArguments {
     readonly returnsNthArgument?: number | 'last';
     readonly cfg?: ExitPointType;
     readonly readAllArguments?: boolean;
-    readonly hasUnknownSideEffects?: boolean | LinkTo;
+    readonly hasUnknownSideEffects?: boolean | LinkTo<RegExp | string>;
     /** record mapping the actual function name called to the arguments that should be treated as function calls */
     readonly treatAsFnCall?: Record<string, readonly string[]>;
     /** Name that should be used for the origin (useful when needing to differentiate between

package/dataflow/environments/default-builtin-config.d.ts

@@ -1,5 +1,14 @@
 import type { BuiltInDefinitions } from './built-in-config';
 import type { BuiltInMappingName } from './built-in';
+export declare const GgPlotCreate: readonly ["ggplot", "ggplotly", "ggMarginal", "ggcorrplot", "ggseasonplot", "ggdendrogram", "qmap", "qplot", "quickplot", "autoplot", "grid.arrange", "fviz_pca_biplot", "fviz_pca", "fviz_pca_ind", "fviz_pca_var", "fviz_screeplot", "fviz_mca_biplot", "fviz_mca", "fviz_mca_ind", "fviz_mca_var", "fviz_cluster", "fviz_dend", "ggsurvplot"];
+export declare const TinyPlotCrate: readonly ["tinyplot", "plt"];
+export declare const GraphicsPlotCreate: string[];
+export declare const PlotCreate: string[];
+export declare const TinyPlotAddons: string[];
+export declare const GgPlotImplicitAddons: readonly ["geom_count", "geom_bin_2d", "geom_spoke", "geom_tile", "geom_rect", "geom_function", "geom_crossbar", "geom_density2d", "geom_abline", "geom_errorbar", "geom_errorbarh", "geom_jitter", "geom_line", "geom_density", "geom_quantile", "geom_qq", "geom_qq_line", "geom_segment", "geom_label", "geom_density_2d", "geom_violin", "geom_contour", "geom_boxplot", "geom_col", "geom_blank", "geom_histogram", "geom_hline", "geom_area", "geom_sf_text", "geom_smooth", "geom_text", "geom_density2d_filled", "geom_ribbon", "geom_sf", "geom_dotplot", "geom_freqpoly", "geom_step", "geom_map", "geom_bin2d", "geom_rug", "geom_raster", "geom_pointrange", "geom_point", "geom_hex", "geom_contour_filled", "geom_bar", "geom_vline", "geom_linerange", "geom_curve", "geom_path", "geom_polygon", "geom_sf_label", "geom_density_2d_filled", "geom_dumbbell", "geom_encircle", "stat_count", "stat_density", "stat_bin_hex", "stat_bin_2d", "stat_summary_bin", "stat_identity", "stat_qq", "stat_binhex", "stat_boxplot", "stat_function", "stat_align", "stat_contour_filled", "stat_summary_2d", "stat_qq_line", "stat_contour", "stat_ydensity", "stat_summary_hex", "stat_summary2d", "stat_sf_coordinates", "stat_density_2d_filled", "stat_smooth", "stat_density2d", "stat_ecdf", "stat_sf", "stat_quantile", "stat_unique", "stat_density_2d", "stat_ellipse", "stat_summary", "stat_density2d_filled", "stat_bin", "stat_sum", "stat_spoke", "stat_bin2d", "labs", "theme_void", "theme_test", "theme_minimal", "theme_light", "theme", "theme_get", "theme_gray", "theme_dark", "theme_classic", "theme_linedraw", "theme_update", "theme_replace", "theme_grey", "theme_bw", "theme_tufte", "theme_survminer", "facet_null", "facet_grid", "facet_wrap", "xlab", "xlim", "ylab", "ylim", "scale_linewidth_ordinal", "scale_fill_steps", "scale_color_gradient2", "scale_size_manual", "scale_colour_discrete", "scale_color_identity", "scale_fill_fermenter", "scale_alpha_manual", "scale_fill_gradient", "scale_size_date", "scale_fill_viridis_b", "scale_x_time", "scale_linetype_manual", "scale_alpha_binned", "scale_color_grey", "scale_colour_gradient", "scale_linewidth_date", "scale_color_steps2", "scale_color_viridis_b", "scale_size_binned", "scale_colour_gradientn", "scale_linewidth_manual", "scale_fill_viridis_c", "scale_fill_manual", "scale_color_viridis_c", "scale_fill_discrete", "scale_size_discrete", "scale_fill_binned", "scale_fill_viridis_d", "scale_colour_fermenter", "scale_color_viridis_d", "scale_x_datetime", "scale_size_identity", "scale_linewidth_identity", "scale_shape_ordinal", "scale_linewidth_discrete", "scale_fill_ordinal", "scale_y_time", "scale_color_ordinal", "scale_size_ordinal", "scale_colour_distiller", "scale_linewidth_datetime", "scale_alpha_identity", "scale_color_steps", "scale_alpha_discrete", "scale_fill_date", "scale_x_reverse", "scale_fill_gradientn", "scale_size_datetime", "scale_y_continuous", "scale_colour_steps", "scale_color_distiller", "scale_colour_ordinal", "scale_y_datetime", "scale_linetype_discrete", "scale_colour_viridis_b", "scale_alpha_datetime", "scale_continuous_identity", "scale_fill_brewer", "scale_shape_identity", "scale_color_discrete", "scale_colour_viridis_c", "scale_linetype_identity", "scale_colour_hue", "scale_linewidth_binned", "scale_color_hue", "scale_shape_continuous", "scale_colour_viridis_d", "scale_size_continuous", "scale_color_manual", "scale_alpha_date", "scale_y_sqrt", "scale_shape_binned", "scale_size", "scale_color_fermenter", "scale_color_stepsn", "scale_size_area", "scale_y_binned", "scale_y_discrete", "scale_alpha_continuous", "scale_fill_continuous", "scale_linetype_continuous", "scale_colour_steps2", "scale_colour_datetime", "scale_colour_grey", "scale_x_log10", "scale_x_discrete", "scale_color_continuous", "scale_type", "scale_y_reverse", "scale_colour_gradient2", "scale_color_datetime", "scale_color_date", "scale_x_continuous", "scale_colour_manual", "scale_fill_gradient2", "scale_fill_grey", "scale_colour_stepsn", "scale_colour_binned", "scale_color_binned", "scale_color_gradientn", "scale_colour_date", "scale_fill_distiller", "scale_color_gradient", "scale_linewidth_continuous", "scale_shape", "scale_fill_hue", "scale_linetype", "scale_colour_identity", "scale_discrete_manual", "scale_fill_identity", "scale_y_log10", "scale_linetype_binned", "scale_size_binned_area", "scale_y_date", "scale_x_binned", "scale_shape_discrete", "scale_colour_brewer", "scale_x_date", "scale_discrete_identity", "scale_alpha", "scale_fill_steps2", "scale_color_brewer", "scale_fill_datetime", "scale_shape_manual", "scale_colour_continuous", "scale_alpha_ordinal", "scale_linewidth", "scale_x_sqrt", "scale_fill_stepsn", "scale_radius", "rotateTextX", "removeGridX", "removeGridY", "removeGrid", "coord_trans", "coord_sf", "coord_cartesian", "coord_fixed", "coord_flip", "coord_quickmap", "coord_equal", "coord_map", "coord_polar", "coord_munch", "coord_radial", "annotate", "annotation_custom", "annotation_raster", "annotation_map", "annotation_logticks", "borders", "ggtitle", "expansion", "expand_limits", "expand_scale", "guides", "wrap_by", "theme_solid", "theme_hc", "theme_excel_new", "theme_few", "theme_clean", "theme_wsj", "theme_calc", "theme_par", "theme_tufte", "theme_igray", "theme_solarized_2", "theme_excel", "theme_economist", "theme_stata", "theme_map", "theme_fivethirtyeight", "theme_economist_white", "theme_base", "theme_foundation", "theme_gdocs", "theme_pander", "theme_solarized", "scale_shape_tableau", "scale_fill_pander", "scale_shape_few", "scale_colour_excel_new", "scale_colour_hc", "scale_fill_ptol", "scale_fill_gradient2_tableau", "scale_shape_calc", "scale_fill_stata", "scale_colour_tableau", "scale_colour_colorblind", "scale_color_stata", "scale_colour_economist", "scale_fill_calc", "scale_fill_gradient_tableau", "scale_shape_cleveland", "scale_color_pander", "scale_colour_pander", "scale_color_fivethirtyeight", "scale_color_wsj", "scale_shape_stata", "scale_colour_gdocs", "scale_color_continuous_tableau", "scale_fill_excel", "scale_color_few", "scale_linetype_stata", "scale_shape_tremmel", "scale_color_tableau", "scale_color_colorblind", "scale_fill_colorblind", "scale_colour_stata", "scale_fill_wsj", "scale_colour_calc", "scale_colour_fivethirtyeight", "scale_fill_hc", "scale_shape_circlefill", "scale_fill_excel_new", "scale_color_solarized", "scale_color_excel", "scale_colour_excel", "scale_fill_tableau", "scale_colour_ptol", "scale_colour_canva", "scale_color_gradient2_tableau", "scale_colour_solarized", "scale_colour_gradient2_tableau", "scale_fill_canva", "scale_color_ptol", "scale_color_excel_new", "scale_color_economist", "scale_fill_economist", "scale_fill_fivethirtyeight", "scale_colour_gradient_tableau", "scale_colour_few", "scale_color_calc", "scale_fill_few", "scale_fill_gdocs", "scale_color_hc", "scale_color_gdocs", "scale_color_canva", "scale_color_gradient_tableau", "scale_fill_solarized", "scale_fill_continuous_tableau", "scale_colour_wsj", "gradient_color", "ggsurvplot_add_all"];
+export declare const PlotFunctionsWithAddParam: Set<string>;
+export declare const GraphicsPlotAddons: string[];
+export declare const GgPlotAddons: string[];
 /**
  * Contains the built-in definitions recognized by flowR
  */

package/dataflow/environments/default-builtin-config.js

@@ -1,36 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultBuiltinConfig = void 0;
+exports.DefaultBuiltinConfig = exports.GgPlotAddons = exports.GraphicsPlotAddons = exports.PlotFunctionsWithAddParam = exports.GgPlotImplicitAddons = exports.TinyPlotAddons = exports.PlotCreate = exports.GraphicsPlotCreate = exports.TinyPlotCrate = exports.GgPlotCreate = void 0;
 exports.getDefaultProcessor = getDefaultProcessor;
 const identify_link_to_last_call_relation_1 = require("../../queries/catalog/call-context-query/identify-link-to-last-call-relation");
 const type_1 = require("../../r-bridge/lang-4.x/ast/model/type");
 const cascade_action_1 = require("../../queries/catalog/call-context-query/cascade-action");
 const unnamed_call_handling_1 = require("../internal/process/functions/call/unnamed-call-handling");
-const GgPlotCreate = [
+exports.GgPlotCreate = [
     'ggplot', 'ggplotly', 'ggMarginal', 'ggcorrplot', 'ggseasonplot', 'ggdendrogram', 'qmap', 'qplot', 'quickplot', 'autoplot', 'grid.arrange',
     'fviz_pca_biplot', 'fviz_pca', 'fviz_pca_ind', 'fviz_pca_var', 'fviz_screeplot', 'fviz_mca_biplot', 'fviz_mca', 'fviz_mca_ind', 'fviz_mca_var', 'fviz_cluster', 'fviz_dend',
     'ggsurvplot',
 ];
-const TinyPlotCrate = [
+exports.TinyPlotCrate = [
     'tinyplot', 'plt'
 ];
-const PlotCreate = [
+exports.GraphicsPlotCreate = [
     'plot', 'plot.new', 'xspline', 'map', 'curve', 'image', 'boxplot', 'dotchart', 'sunflowerplot', 'barplot', 'matplot', 'hist', 'stem',
     'density', 'smoothScatter', 'contour', 'persp', 'XYPlot', 'xyplot', 'stripplot', 'bwplot', 'dotPlot', 'dotplot', 'histPlot', 'densityPlot', 'qPlot', 'qqplot', 'qqPlot', 'boxPlot',
     'bxp', 'assocplot', 'mosaicplot', 'stripchart', 'fourfoldplot', 'plot.xy', 'plot.formula', 'plot.default', 'plot.design', 'stars', 'cotabplot', 'pheatmap',
     'spineplot', 'Plotranges', 'regressogram', 'bootcurve', 'meanplot', 'vioplot', 'pairs', 'copolot', 'histogram', 'splom', 'leaflet', 'tm_shape', 'plot_ly', 'plotProfLik', 'plotSimulatedResiduals', 'plotmeans',
     'overplot', 'residplot', 'heatmap.2', 'lmplot2', 'sinkplot', 'textplot', 'boxplot2', 'profLikCI',
-    ...TinyPlotCrate,
-    ...GgPlotCreate
 ];
+exports.PlotCreate = exports.GraphicsPlotCreate.concat(exports.TinyPlotCrate, exports.GgPlotCreate);
 const GraphicDeviceOpen = [
     'pdf', 'jpeg', 'png', 'windows', 'postscript', 'xfig', 'bitmap', 'pictex', 'cairo_pdf', 'svg', 'bmp', 'tiff', 'X11', 'quartz', 'image_graph',
     'image_draw', 'dev.new', 'trellis.device', 'raster_pdf', 'agg_pdf'
 ];
-const TinyPlotAddons = [
+exports.TinyPlotAddons = [
     'tinyplot_add', 'plt_add'
 ];
-const GgPlotImplicitAddons = [
+exports.GgPlotImplicitAddons = [
     'geom_count', 'geom_bin_2d', 'geom_spoke', 'geom_tile', 'geom_rect',
     'geom_function', 'geom_crossbar', 'geom_density2d', 'geom_abline', 'geom_errorbar', 'geom_errorbarh',
     'geom_jitter', 'geom_line', 'geom_density', 'geom_quantile', 'geom_qq', 'geom_qq_line', 'geom_segment', 'geom_label', 'geom_density_2d',
@@ -75,17 +74,18 @@ const GgPlotImplicitAddons = [
     'scale_colour_gradient_tableau', 'scale_colour_few', 'scale_color_calc', 'scale_fill_few', 'scale_fill_gdocs', 'scale_color_hc', 'scale_color_gdocs', 'scale_color_canva', 'scale_color_gradient_tableau',
     'scale_fill_solarized', 'scale_fill_continuous_tableau', 'scale_colour_wsj', 'gradient_color', 'ggsurvplot_add_all'
 ];
-const PlotFunctionsWithAddParam = new Set([
+exports.PlotFunctionsWithAddParam = new Set([
     'map', 'matplot', 'barplot', 'boxplot', 'curve', 'image', 'plotCI', 'bandplot', 'barplot2', 'bubbleplot'
 ]);
-const PlotAddons = [
+exports.GraphicsPlotAddons = [
     'points', 'abline', 'mtext', 'lines', 'text', 'legend', 'title', 'axis', 'polygon', 'polypath', 'pie', 'rect', 'segments', 'arrows', 'symbols',
     'qqline', 'qqnorm', 'rasterImage',
-    'tiplabels', 'rug', 'grid', 'box', 'clip', 'matpoints', 'matlines', ...GgPlotImplicitAddons, ...PlotFunctionsWithAddParam
+    'tiplabels', 'rug', 'grid', 'box', 'clip', 'matpoints', 'matlines',
 ];
-const GgPlotAddons = [
+exports.GgPlotAddons = [
     'ggdraw', 'last_plot'
 ];
+const PlotAddons = exports.GraphicsPlotAddons.concat(exports.GgPlotImplicitAddons, ...exports.PlotFunctionsWithAddParam);
 function toRegex(n) {
     return new RegExp(`^(${[...new Set(n)].map(s => s.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&')).filter(s => s.length > 0).join('|')})$`);
 }
@@ -129,7 +129,7 @@ exports.DefaultBuiltinConfig = [
     { type: 'function', names: ['apply', 'tapply', 'Tapply'], processor: 'builtin:apply', config: { indexOfFunction: 2, nameOfFunctionArgument: 'FUN' }, assumePrimitive: false },
     { type: 'function', names: ['print', 'message', 'warning'], processor: 'builtin:default', config: { returnsNthArgument: 0, forceArgs: 'all', hasUnknownSideEffects: { type: 'link-to-last-call', callName: /^sink$/ } }, assumePrimitive: false },
     // graphics base
-    { type: 'function', names: PlotCreate,
+    { type: 'function', names: exports.PlotCreate,
         processor: 'builtin:default',
         config: {
             forceArgs: 'all',
@@ -137,7 +137,7 @@ exports.DefaultBuiltinConfig = [
                 type: 'link-to-last-call',
                 ignoreIf: (source, graph) => {
                     /* map with add = true appends to an existing plot */
-                    return (PlotFunctionsWithAddParam.has(source.name) && (0, identify_link_to_last_call_relation_1.getValueOfArgument)(graph, source, {
+                    return (exports.PlotFunctionsWithAddParam.has(source.name) && (0, identify_link_to_last_call_relation_1.getValueOfArgument)(graph, source, {
                         index: -1,
                         name: 'add'
                     }, [type_1.RType.Logical])?.content === true);
@@ -154,11 +154,11 @@ exports.DefaultBuiltinConfig = [
             },
             hasUnknownSideEffects: {
                 type: 'link-to-last-call',
-                callName: toRegex([...PlotCreate, ...PlotAddons]),
+                callName: toRegex([...exports.PlotCreate, ...PlotAddons]),
                 ignoreIf: (source, graph) => {
                     const sourceVertex = graph.getVertex(source);
                     /* map with add = true appends to an existing plot */
-                    return (PlotFunctionsWithAddParam.has(sourceVertex.name ?? '') && (0, identify_link_to_last_call_relation_1.getValueOfArgument)(graph, sourceVertex, {
+                    return (exports.PlotFunctionsWithAddParam.has(sourceVertex.name ?? '') && (0, identify_link_to_last_call_relation_1.getValueOfArgument)(graph, sourceVertex, {
                         index: -1,
                         name: 'add'
                     }, [type_1.RType.Logical])?.content !== true);
@@ -175,25 +175,25 @@ exports.DefaultBuiltinConfig = [
     // plot tags
     {
         type: 'function',
-        names: GgPlotAddons,
+        names: exports.GgPlotAddons,
         processor: 'builtin:default',
         config: {
             forceArgs: 'all',
             hasUnknownSideEffects: {
                 type: 'link-to-last-call',
-                callName: toRegex([...GgPlotCreate, ...GgPlotAddons])
+                callName: toRegex([...exports.GgPlotCreate, ...exports.GgPlotAddons])
             }
         }, assumePrimitive: true
     },
     {
         type: 'function',
-        names: TinyPlotAddons,
+        names: exports.TinyPlotAddons,
         processor: 'builtin:default',
         config: {
             forceArgs: 'all',
             hasUnknownSideEffects: {
                 type: 'link-to-last-call',
-                callName: toRegex([...TinyPlotCrate, ...TinyPlotAddons])
+                callName: toRegex([...exports.TinyPlotCrate, ...exports.TinyPlotAddons])
             }
         }, assumePrimitive: true
     },
@@ -205,7 +205,7 @@ exports.DefaultBuiltinConfig = [
             forceArgs: 'all',
             hasUnknownSideEffects: {
                 type: 'link-to-last-call',
-                callName: toRegex([...GraphicDeviceOpen, ...PlotCreate, ...PlotAddons, ...GgPlotAddons, ...TinyPlotAddons])
+                callName: toRegex([...GraphicDeviceOpen, ...exports.PlotCreate, ...PlotAddons, ...exports.GgPlotAddons, ...exports.TinyPlotAddons])
             }
         }, assumePrimitive: true
     },

package/dataflow/environments/environment.js

@@ -18,8 +18,10 @@ function makeReferenceMaybe(ref, graph, environments, includeDefs, defaultCd = u
         const definitions = ref.name ? (0, resolve_by_name_1.resolveByName)(ref.name, environments, ref.type) : undefined;
         for (const definition of definitions ?? []) {
             if (definition.type !== identifier_1.ReferenceType.BuiltInFunction && definition.type !== identifier_1.ReferenceType.BuiltInConstant) {
-                if (definition.controlDependencies && defaultCd && !definition.controlDependencies.find(c => c.id === defaultCd.id)) {
-                    definition.controlDependencies.push(defaultCd);
+                if (definition.controlDependencies) {
+                    if (defaultCd && !definition.controlDependencies.find(c => c.id === defaultCd.id && c.when === defaultCd.when)) {
+                        definition.controlDependencies.push(defaultCd);
+                    }
                 }
                 else {
                     definition.controlDependencies = defaultCd ? [defaultCd] : [];
@@ -30,20 +32,27 @@ function makeReferenceMaybe(ref, graph, environments, includeDefs, defaultCd = u
     const node = graph.get(ref.nodeId, true);
     if (node) {
         const [fst] = node;
-        if (fst.cds && defaultCd && !fst.cds.includes(defaultCd)) {
-            fst.cds.push(defaultCd);
+        if (fst.cds) {
+            if (defaultCd && !fst.cds.find(c => c.id === defaultCd.id && c.when === defaultCd.when)) {
+                fst.cds.push(defaultCd);
+            }
         }
         else {
             fst.cds = defaultCd ? [defaultCd] : [];
         }
     }
-    return { ...ref, controlDependencies: [...ref.controlDependencies ?? [], ...(defaultCd ? [defaultCd] : [])] };
+    if (ref.controlDependencies) {
+        if (defaultCd && !ref.controlDependencies.find(c => c.id === defaultCd.id && c.when === defaultCd.when)) {
+            return { ...ref, controlDependencies: (ref.controlDependencies ?? []).concat(defaultCd ? [defaultCd] : []) };
+        }
+    }
+    else {
+        return { ...ref, controlDependencies: ref.controlDependencies ?? (defaultCd ? [defaultCd] : []) };
+    }
+    return ref;
 }
 function makeAllMaybe(references, graph, environments, includeDefs, defaultCd = undefined) {
-    if (references === undefined) {
-        return [];
-    }
-    return references.map(ref => makeReferenceMaybe(ref, graph, environments, includeDefs, defaultCd));
+    return references?.map(ref => makeReferenceMaybe(ref, graph, environments, includeDefs, defaultCd)) ?? [];
 }
 /**
  * Please use this function only if you do not know the object type.

package/dataflow/environments/overwrite.js

@@ -27,7 +27,7 @@ function overwriteIEnvironmentWith(base, next, includeParent = true, applyCds) {
         if (hasMaybe) {
             const old = map.get(key);
             // we need to make a copy to avoid side effects for old reference in other environments
-            const updatedOld = old ?? [];
+            const updatedOld = [...old ?? []];
             for (const v of values) {
                 const index = updatedOld.findIndex(o => o.nodeId === v.nodeId && o.definedAt === v.definedAt);
                 if (index < 0) {
@@ -42,7 +42,7 @@ function overwriteIEnvironmentWith(base, next, includeParent = true, applyCds) {
                     }
                 }
             }
-            map.set(key, [...updatedOld]);
+            map.set(key, updatedOld);
         }
         else {
             map.set(key, values);

package/dataflow/extractor.js

@@ -64,7 +64,7 @@ function resolveLinkToSideEffects(ast, graph) {
         if (typeof s !== 'object') {
             continue;
         }
-        cfg ??= (0, extract_cfg_1.extractSimpleCfg)(ast).graph;
+        cfg ??= (0, extract_cfg_1.extractCfgQuick)(ast).graph;
         /* this has to change whenever we add a new link to relations because we currently offer no abstraction for the type */
         const potentials = (0, identify_link_to_last_call_relation_1.identifyLinkToLastCallRelation)(s.id, cfg, graph, s.linkTo);
         for (const pot of potentials) {

package/dataflow/graph/diff-dataflow-graph.js

@@ -36,8 +36,8 @@ function diffDataflowGraph(ctx) {
     diffOutgoingEdges(ctx);
 }
 function diffOutgoingEdges(ctx) {
-    const lEdges = new Map([...ctx.left.edges()]);
-    const rEdges = new Map([...ctx.right.edges()]);
+    const lEdges = new Map(ctx.left.edges());
+    const rEdges = new Map(ctx.right.edges());
     if (lEdges.size < rEdges.size && !ctx.config.leftIsSubgraph || lEdges.size > rEdges.size && !ctx.config.rightIsSubgraph) {
         ctx.report.addComment(`Detected different number of edges! ${ctx.leftname} has ${lEdges.size} (${JSON.stringify(lEdges, json_1.jsonReplacer)}). ${ctx.rightname} has ${rEdges.size} ${JSON.stringify(rEdges, json_1.jsonReplacer)}`);
     }
@@ -131,8 +131,8 @@ function diffFunctionArguments(fn, a, b, ctx) {
 }
 function diffVertices(ctx) {
     // collect vertices from both sides
-    const lVert = [...ctx.left.vertices(true)].map(([id, info]) => [id, info]);
-    const rVert = [...ctx.right.vertices(true)].map(([id, info]) => [id, info]);
+    const lVert = ctx.left.vertices(true).map(([id, info]) => [id, info]).toArray();
+    const rVert = ctx.right.vertices(true).map(([id, info]) => [id, info]).toArray();
     if (lVert.length < rVert.length && !ctx.config.leftIsSubgraph
         || lVert.length > rVert.length && !ctx.config.rightIsSubgraph) {
         ctx.report.addComment(`Detected different number of vertices! ${ctx.leftname} has ${lVert.length}, ${ctx.rightname} has ${rVert.length}`);

package/dataflow/graph/graph.d.ts

@@ -160,13 +160,13 @@ export declare class DataflowGraph<Vertex extends DataflowGraphVertexInfo = Data
      *
      * @see #edges
      */
-    vertices(includeDefinedFunctions: boolean): IterableIterator<[NodeId, Vertex]>;
+    vertices(includeDefinedFunctions: boolean): MapIterator<[NodeId, Vertex]>;
     /**
      * @returns the ids of all edges in the graph together with their edge information
      *
      * @see #vertices
      */
-    edges(): IterableIterator<[NodeId, OutgoingEdges]>;
+    edges(): MapIterator<[NodeId, OutgoingEdges]>;
     /**
      * Returns true if the graph contains a node with the given id.
      *
@@ -219,7 +219,7 @@ export declare class DataflowGraph<Vertex extends DataflowGraphVertexInfo = Data
     /** If you do not pass the `to` node, this will just mark the node as maybe */
     addControlDependency(from: NodeId, to?: NodeId, when?: boolean): this;
     /** Marks the given node as having unknown side effects */
-    markIdForUnknownSideEffects(id: NodeId, target?: LinkTo): this;
+    markIdForUnknownSideEffects(id: NodeId, target?: LinkTo<RegExp | string>): this;
     /**
      * Constructs a dataflow graph instance from the given JSON data and returns the result.
      * This can be useful for data sent by the flowR server when analyzing it further.

package/dataflow/graph/graph.js

@@ -335,7 +335,10 @@ class DataflowGraph {
     /** Marks the given node as having unknown side effects */
     markIdForUnknownSideEffects(id, target) {
         if (target) {
-            this._unknownSideEffects.add({ id: (0, node_id_1.normalizeIdToNumberIfPossible)(id), linkTo: typeof target.callName === 'string' ? { ...target, callName: new RegExp(target.callName) } : target });
+            this._unknownSideEffects.add({
+                id: (0, node_id_1.normalizeIdToNumberIfPossible)(id),
+                linkTo: typeof target.callName === 'string' ? { ...target, callName: new RegExp(target.callName) } : target
+            });
             return this;
         }
         this._unknownSideEffects.add((0, node_id_1.normalizeIdToNumberIfPossible)(id));

package/dataflow/graph/quads.js

@@ -11,16 +11,16 @@ const edge_1 = require("./edge");
 function df2quads(graph, config) {
     return (0, quads_1.graph2quads)({
         rootIds: [...graph.rootIds()],
-        vertices: [...graph.vertices(true)]
+        vertices: graph.vertices(true)
             .map(([id, v]) => ({
             ...v,
             id
-        })),
-        edges: [...graph.edges()].flatMap(([fromId, targets]) => [...targets].map(([toId, info]) => ({
+        })).toArray(),
+        edges: graph.edges().flatMap(([fromId, targets]) => [...targets].map(([toId, info]) => ({
             from: fromId,
             to: toId,
             type: [...(0, edge_1.edgeTypesToNames)(info.types)],
-        })))
+        }))).toArray()
     }, config);
 }
 //# sourceMappingURL=quads.js.map

package/dataflow/info.js

@@ -91,7 +91,7 @@ function diffControlDependencies(a, b, info) {
         return;
     }
     if (a.length !== b.length) {
-        info.report.addComment(`${info.position}Different control dependency lengths: ${a.length} vs. ${b.length}`);
+        info.report.addComment(`${info.position}Different control dependency lengths: ${a.length} (${JSON.stringify(a)}) vs. ${b.length} (${JSON.stringify(b)})`);
     }
     for (let i = 0; i < a.length; ++i) {
         diffControlDependency(a[i], b[i], { ...info, position: `${info.position}Control dependency at index: ${i}: ` });

package/dataflow/internal/linker.d.ts

@@ -7,6 +7,7 @@ import type { AstIdMap, ParentInformation } from '../../r-bridge/lang-4.x/ast/mo
 import type { DataflowGraphVertexFunctionCall, DataflowGraphVertexFunctionDefinition, DataflowGraphVertexInfo } from '../graph/vertex';
 import type { BuiltIn } from '../environments/built-in';
 import type { REnvironmentInformation } from '../environments/environment';
+import type { ExitPoint } from '../info';
 export type NameIdMap = DefaultMap<string, IdentifierReference[]>;
 export declare function findNonLocalReads(graph: DataflowGraph, ignore: readonly IdentifierReference[]): IdentifierReference[];
 export declare function produceNameSharedIdMap(references: IdentifierReference[]): NameIdMap;
@@ -51,3 +52,4 @@ export declare function linkInputs(referencesToLinkAgainstEnvironment: readonly
  * `x_2` must get a read marker to `x_1` as `x_1` is the active redefinition in the second loop iteration.
  */
 export declare function linkCircularRedefinitionsWithinALoop(graph: DataflowGraph, openIns: NameIdMap, outgoing: readonly IdentifierReference[]): void;
+export declare function reapplyLoopExitPoints(exits: readonly ExitPoint[], references: readonly IdentifierReference[]): void;

package/dataflow/internal/linker.js

@@ -9,6 +9,7 @@ exports.getAllFunctionCallTargets = getAllFunctionCallTargets;
 exports.getAllLinkedFunctionDefinitions = getAllLinkedFunctionDefinitions;
 exports.linkInputs = linkInputs;
 exports.linkCircularRedefinitionsWithinALoop = linkCircularRedefinitionsWithinALoop;
+exports.reapplyLoopExitPoints = reapplyLoopExitPoints;
 const defaultmap_1 = require("../../util/collections/defaultmap");
 const assert_1 = require("../../util/assert");
 const log_1 = require("../../util/log");
@@ -25,7 +26,7 @@ const built_in_1 = require("../environments/built-in");
 const prefix_1 = require("../../util/prefix");
 function findNonLocalReads(graph, ignore) {
     const ignores = new Set(ignore.map(i => i.nodeId));
-    const ids = new Set([...graph.vertices(true)]
+    const ids = new Set(graph.vertices(true)
         .filter(([_, info]) => info.tag === vertex_1.VertexType.Use || info.tag === vertex_1.VertexType.FunctionCall)
         .map(([id, _]) => id));
     /* find all variable use ids which do not link to a given id */
@@ -325,4 +326,20 @@ function linkCircularRedefinitionsWithinALoop(graph, openIns, outgoing) {
         }
     }
 }
+function reapplyLoopExitPoints(exits, references) {
+    // just apply the cds of all exit points not already present
+    const exitCds = new Set(exits.flatMap(e => e.controlDependencies).filter(assert_1.isNotUndefined));
+    for (const ref of references) {
+        for (const cd of exitCds) {
+            if (ref.controlDependencies) {
+                if (!ref.controlDependencies?.find(c => c.id === cd.id && c.when === cd.when)) {
+                    ref.controlDependencies.push(cd);
+                }
+            }
+            else {
+                ref.controlDependencies = [cd];
+            }
+        }
+    }
+}
 //# sourceMappingURL=linker.js.map

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

@@ -32,7 +32,9 @@ export interface AssignmentToSymbolParameters<OtherInfo> extends AssignmentConfi
     readonly nameOfAssignmentFunction: string;
     readonly source: RNode<OtherInfo & ParentInformation>;
     readonly args: [DataflowInformation, DataflowInformation];
-    readonly target: RSymbol<OtherInfo & ParentInformation>;
+    readonly targetId: NodeId;
+    /** pass only if the assignment target differs from normal R assignments (i.e., if the symbol is to be resolved) */
+    readonly targetName?: string;
     readonly rootId: NodeId;
     readonly data: DataflowProcessorInformation<OtherInfo>;
     readonly information: DataflowInformation;