@eagleoutice/flowr 2.9.0 → 2.9.1

package/README.md

@@ -24,7 +24,7 @@ It offers a wide variety of features, for example:
     
     ```shell
     $ docker run -it --rm eagleoutice/flowr # or npm run flowr 
-    flowR repl using flowR v2.8.15, R grammar v14 (tree-sitter engine)
+    flowR repl using flowR v2.9.0, R grammar v14 (tree-sitter engine)
     R> :query @linter "read.csv(\"/root/x.txt\")"
     ```
     
@@ -33,13 +33,13 @@ It offers a wide variety of features, for example:
     
     
     ```text
-    Query: linter (3 ms)
+    Query: linter (2 ms)
        ╰ Deprecated Functions (deprecated-functions):
-           ╰ Metadata: totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 1, processTimeMs: 0
+           ╰ Metadata: totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 0, processTimeMs: 0
        ╰ File Path Validity (file-path-validity):
            ╰ certain:
                ╰ Path `/root/x.txt` at 1.1-23
-           ╰ Metadata: totalReads: 1, totalUnknown: 0, totalWritesBeforeAlways: 0, totalValid: 0, searchTimeMs: 0, processTimeMs: 0
+           ╰ Metadata: totalReads: 1, totalUnknown: 0, totalWritesBeforeAlways: 0, totalValid: 0, searchTimeMs: 1, processTimeMs: 0
        ╰ Seeded Randomness (seeded-randomness):
            ╰ Metadata: consumerCalls: 0, callsWithFunctionProducers: 0, callsWithAssignmentProducers: 0, callsWithNonConstantProducers: 0, callsWithOtherBranchProducers: 0, searchTimeMs: 0, processTimeMs: 0
        ╰ Absolute Paths (absolute-file-paths):
@@ -58,7 +58,7 @@ It offers a wide variety of features, for example:
            ╰ Metadata: consideredNodes: 5, searchTimeMs: 0, processTimeMs: 0
        ╰ Useless Loops (useless-loop):
            ╰ Metadata: numOfUselessLoops: 0, searchTimeMs: 0, processTimeMs: 0
-    All queries together required ≈3 ms (1ms accuracy, total 3 ms)
+    All queries together required ≈2 ms (1ms accuracy, total 2 ms)
     ```
     
     
@@ -80,19 +80,19 @@ It offers a wide variety of features, for example:
     
     _Results (prettified and summarized):_
     
-    Query: **linter** (3 ms)\
+    Query: **linter** (2 ms)\
        ╰ **Deprecated Functions** (deprecated-functions):\
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 0, processTimeMs: 0</code>\
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalCalls: 0, totalFunctionDefinitions: 0, searchTimeMs: 0, processTimeMs: 1</code>\
     &nbsp;&nbsp;&nbsp;╰ **File Path Validity** (file-path-validity):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ certain:\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ Path `/root/x.txt` at 1.1-23\
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalReads: 1, totalUnknown: 0, totalWritesBeforeAlways: 0, totalValid: 0, searchTimeMs: 1, processTimeMs: 0</code>\
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalReads: 1, totalUnknown: 0, totalWritesBeforeAlways: 0, totalValid: 0, searchTimeMs: 0, processTimeMs: 0</code>\
     &nbsp;&nbsp;&nbsp;╰ **Seeded Randomness** (seeded-randomness):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>consumerCalls: 0, callsWithFunctionProducers: 0, callsWithAssignmentProducers: 0, callsWithNonConstantProducers: 0, callsWithOtherBranchProducers: 0, searchTimeMs: 0, processTimeMs: 0</code>\
     &nbsp;&nbsp;&nbsp;╰ **Absolute Paths** (absolute-file-paths):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ certain:\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ Path `/root/x.txt` at 1.1-23\
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalConsidered: 1, totalUnknown: 0, searchTimeMs: 1, processTimeMs: 0</code>\
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalConsidered: 1, totalUnknown: 0, searchTimeMs: 0, processTimeMs: 0</code>\
     &nbsp;&nbsp;&nbsp;╰ **Unused Definitions** (unused-definitions):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>totalConsidered: 0, searchTimeMs: 0, processTimeMs: 0</code>\
     &nbsp;&nbsp;&nbsp;╰ **Naming Convention** (naming-convention):\
@@ -102,14 +102,14 @@ It offers a wide variety of features, for example:
     &nbsp;&nbsp;&nbsp;╰ **Dataframe Access Validation** (dataframe-access-validation):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>numOperations: 0, numAccesses: 0, totalAccessed: 0, searchTimeMs: 0, processTimeMs: 0</code>\
     &nbsp;&nbsp;&nbsp;╰ **Dead Code** (dead-code):\
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>consideredNodes: 5, searchTimeMs: 1, processTimeMs: 0</code>\
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>consideredNodes: 5, searchTimeMs: 0, processTimeMs: 0</code>\
     &nbsp;&nbsp;&nbsp;╰ **Useless Loops** (useless-loop):\
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;╰ _Metadata_: <code>numOfUselessLoops: 0, searchTimeMs: 0, processTimeMs: 0</code>\
-    _All queries together required ≈3 ms (1ms accuracy, total 3 ms)_
+    _All queries together required ≈2 ms (1ms accuracy, total 2 ms)_
     
     <details> <summary style="color:gray">Show Detailed Results as Json</summary>
     
-    The analysis required _2.8 ms_ (including parsing and normalization and the query) within the generation environment.
+    The analysis required _2.2 ms_ (including parsing and normalization and the query) within the generation environment.
     
     In general, the JSON contains the Ids of the nodes in question as they are present in the normalized AST or the dataflow graph of flowR.
     Please consult the [Interface](https://github.com/flowr-analysis/flowr/wiki/Interface) wiki page for more information on how to get those.
@@ -127,7 +127,7 @@ It offers a wide variety of features, for example:
               "totalCalls": 0,
               "totalFunctionDefinitions": 0,
               "searchTimeMs": 0,
-              "processTimeMs": 0
+              "processTimeMs": 1
             }
           },
           "file-path-validity": {
@@ -149,7 +149,7 @@ It offers a wide variety of features, for example:
               "totalUnknown": 0,
               "totalWritesBeforeAlways": 0,
               "totalValid": 0,
-              "searchTimeMs": 1,
+              "searchTimeMs": 0,
               "processTimeMs": 0
             }
           },
@@ -181,7 +181,7 @@ It offers a wide variety of features, for example:
             ".meta": {
               "totalConsidered": 1,
               "totalUnknown": 0,
-              "searchTimeMs": 1,
+              "searchTimeMs": 0,
               "processTimeMs": 0
             }
           },
@@ -225,7 +225,7 @@ It offers a wide variety of features, for example:
             "results": [],
             ".meta": {
               "consideredNodes": 5,
-              "searchTimeMs": 1,
+              "searchTimeMs": 0,
               "processTimeMs": 0
             }
           },
@@ -239,11 +239,11 @@ It offers a wide variety of features, for example:
           }
         },
         ".meta": {
-          "timing": 3
+          "timing": 2
         }
       },
       ".meta": {
-        "timing": 3
+        "timing": 2
       }
     }
     ```
@@ -308,7 +308,7 @@ It offers a wide variety of features, for example:
     
     ```shell
     $ docker run -it --rm eagleoutice/flowr # or npm run flowr 
-    flowR repl using flowR v2.8.15, R grammar v14 (tree-sitter engine)
+    flowR repl using flowR v2.9.0, R grammar v14 (tree-sitter engine)
     R> :query @static-slice (11@sum) file://test/testfiles/example.R
     ```
     
@@ -356,7 +356,7 @@ It offers a wide variety of features, for example:
          
 
 * 🚀 **fast call-graph, data-, and control-flow graphs**\
-  Within just [<i><span title="This measurement is automatically fetched from the latest benchmark!">118.7 ms</span></i> (as of Jan 30, 2026)](https://flowr-analysis.github.io/flowr/wiki/stats/benchmark), 
+  Within just [<i><span title="This measurement is automatically fetched from the latest benchmark!">117.5 ms</span></i> (as of Feb 2, 2026)](https://flowr-analysis.github.io/flowr/wiki/stats/benchmark), 
   _flowR_ can analyze the data- and control-flow of the average real-world R script. See the [benchmarks](https://flowr-analysis.github.io/flowr/wiki/stats/benchmark) for more information,
   and consult the [wiki pages](https://github.com/flowr-analysis/flowr/wiki/wiki/dataflow-graph) for more details on the dataflow graphs as well as call graphs.
 
@@ -392,7 +392,7 @@ It offers a wide variety of features, for example:
     
     ```shell
     $ docker run -it --rm eagleoutice/flowr # or npm run flowr 
-    flowR repl using flowR v2.8.15, R grammar v14 (tree-sitter engine)
+    flowR repl using flowR v2.9.0, R grammar v14 (tree-sitter engine)
     R> :dataflow* test/testfiles/example.R
     ```
     
@@ -697,7 +697,7 @@ It offers a wide variety of features, for example:
     ```
     
     	
-    (The analysis required _1.9 ms_ (including parse and normalize, using the [tree-sitter](https://github.com/flowr-analysis/flowr/wiki/Engines) engine) within the generation environment.)
+    (The analysis required _1.7 ms_ (including parse and normalize, using the [tree-sitter](https://github.com/flowr-analysis/flowr/wiki/Engines) engine) within the generation environment.)
     
     
     

package/benchmark/slicer.js

@@ -131,7 +131,7 @@ class BenchmarkSlicer {
         let commentCharsNoWhitespace = 0;
         (0, visitor_1.visitAst)(this.normalizedAst.ast.files.map(f => f.root), t => {
             nodes++;
-            const comments = t.info.additionalTokens?.filter(t => t.type === type_1.RType.Comment);
+            const comments = t.info.adToks?.filter(t => t.type === type_1.RType.Comment);
             if (comments && comments.length > 0) {
                 const content = comments.map(c => c.lexeme ?? '').join('');
                 commentChars += content.length;

package/benchmark/summarizer/first-phase/process.js

@@ -161,7 +161,7 @@ async function summarizeSlicerStats(stats, report = () => {
             let commentCharsNoWhitespace = 0;
             (0, visitor_1.visitAst)(reParsed.ast.files.map(f => f.root), t => {
                 numberOfNormalizedTokens++;
-                const comments = t.info.additionalTokens?.filter(t => t.type === type_1.RType.Comment);
+                const comments = t.info.adToks?.filter(t => t.type === type_1.RType.Comment);
                 if (comments && comments.length > 0) {
                     const content = comments.map(c => c.lexeme ?? '').join('');
                     commentChars += content.length;

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

@@ -496,11 +496,36 @@ export declare class SemanticCfgGuidedVisitor<OtherInfo = NoInfo, ControlFlow ex
      * This event triggers for every call to a function that performs an S3-like dispatch.
      *
      * For example, this triggers for `UseMethod` in `UseMethod("print")`.
+     * @see {@link SemanticCfgGuidedVisitor#onS3DispatchNextCall|`onS3DispatchNextCall`} for `NextMethod` calls.
      * @protected
      */
     protected onS3DispatchCall(_data: {
         call: DataflowGraphVertexFunctionCall;
     }): void;
+    /**
+     * This event triggers for every call to a function that performs an S3-like *next* dispatch.
+     *
+     * For example, this triggers for `NextMethod`.
+     * @see {@link SemanticCfgGuidedVisitor#onS3DispatchCall|`onS3DispatchCall`} for `UseMethod` calls.
+     * @protected
+     */
+    protected onS3DispatchNextCall(_data: {
+        call: DataflowGraphVertexFunctionCall;
+    }): void;
+    /**
+     * This event triggers for every call to a function that creates a new S7 generic, such as `new_generic`.
+     * @protected
+     */
+    protected onS7NewGenericCall(_data: {
+        call: DataflowGraphVertexFunctionCall;
+    }): void;
+    /**
+     * This event triggers for every call to a function that performs an S7 dispatch, such as `S7_dispatch`.
+     * @protected
+     */
+    protected onS7DispatchCall(_data: {
+        call: DataflowGraphVertexFunctionCall;
+    }): void;
     /**
      * This event triggers for every call to a function that registers a hook, such as `on.exit`.
      *

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

@@ -263,6 +263,12 @@ class SemanticCfgGuidedVisitor extends dfg_cfg_guided_visitor_1.DataflowAwareCfg
                 return this.onLocalCall({ call });
             case built_in_1.BuiltInProcName.S3Dispatch:
                 return this.onS3DispatchCall({ call });
+            case built_in_1.BuiltInProcName.S3DispatchNext:
+                return this.onS3DispatchNextCall({ call });
+            case built_in_1.BuiltInProcName.S7NewGeneric:
+                return this.onS7NewGenericCall({ call });
+            case built_in_1.BuiltInProcName.S7Dispatch:
+                return this.onS7DispatchCall({ call });
             case built_in_1.BuiltInProcName.Break:
                 return this.onBreakCall({ call });
             case built_in_1.BuiltInProcName.Return:
@@ -578,9 +584,28 @@ class SemanticCfgGuidedVisitor extends dfg_cfg_guided_visitor_1.DataflowAwareCfg
      * This event triggers for every call to a function that performs an S3-like dispatch.
      *
      * For example, this triggers for `UseMethod` in `UseMethod("print")`.
+     * @see {@link SemanticCfgGuidedVisitor#onS3DispatchNextCall|`onS3DispatchNextCall`} for `NextMethod` calls.
      * @protected
      */
     onS3DispatchCall(_data) { }
+    /**
+     * This event triggers for every call to a function that performs an S3-like *next* dispatch.
+     *
+     * For example, this triggers for `NextMethod`.
+     * @see {@link SemanticCfgGuidedVisitor#onS3DispatchCall|`onS3DispatchCall`} for `UseMethod` calls.
+     * @protected
+     */
+    onS3DispatchNextCall(_data) { }
+    /**
+     * This event triggers for every call to a function that creates a new S7 generic, such as `new_generic`.
+     * @protected
+     */
+    onS7NewGenericCall(_data) { }
+    /**
+     * This event triggers for every call to a function that performs an S7 dispatch, such as `S7_dispatch`.
+     * @protected
+     */
+    onS7DispatchCall(_data) { }
     /**
      * This event triggers for every call to a function that registers a hook, such as `on.exit`.
      *

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

@@ -39,7 +39,7 @@ export interface BuiltInReplacementDefinition extends BaseBuiltInDefinition {
     readonly suffixes: ('<<-' | '<-')[];
     readonly config: {
         readIndices: boolean;
-        libFn?: boolean;
+        constructName?: 's7';
     };
 }
 export type BuiltInDefinition<T extends keyof typeof BuiltInProcessorMapper = keyof typeof BuiltInProcessorMapper> = BuiltInConstantDefinition<unknown> | BuiltInFunctionDefinition<T> | BuiltInReplacementDefinition;

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

@@ -40,6 +40,8 @@ import { processRegisterHook } from '../internal/process/functions/call/built-in
 import { processLocal } from '../internal/process/functions/call/built-in/built-in-local';
 import { processS3Dispatch } from '../internal/process/functions/call/built-in/built-in-s-three-dispatch';
 import { processRecall } from '../internal/process/functions/call/built-in/built-in-recall';
+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';
 export type BuiltIn = `built-in:${string}`;
 /**
  * Generate a built-in id for the given name
@@ -139,6 +141,12 @@ export declare enum BuiltInProcName {
     Rm = "builtin:rm",
     /** for `UseMethod` calls, see {@link processS3Dispatch} */
     S3Dispatch = "builtin:s3-dispatch",
+    /** for `NextMethod` calls, see {@link processS3Dispatch} */
+    S3DispatchNext = "builtin:s3-dispatch-next",
+    /** for `new.generic` calls, see {@link processS7NewGeneric} */
+    S7NewGeneric = "builtin:s7-new-generic",
+    /** for `S7_dispatch` calls (and their implicit creations), see {@link processS7Dispatch} */
+    S7Dispatch = "builtin:s7-dispatch",
     /** for `source` calls, see {@link processSourceCall} */
     Source = "builtin:source",
     /** for special binary operators like `%x%`, see {@link processSpecialBinOp} */
@@ -181,6 +189,8 @@ export declare const BuiltInProcessorMapper: {
     readonly "builtin:replacement": typeof processReplacementFunction;
     readonly "builtin:rm": typeof processRm;
     readonly "builtin:s3-dispatch": typeof processS3Dispatch;
+    readonly "builtin:s7-new-generic": typeof processS7NewGeneric;
+    readonly "builtin:s7-dispatch": typeof processS7Dispatch;
     readonly "builtin:source": typeof processSourceCall;
     readonly "builtin:special-bin-op": typeof processSpecialBinOp;
     readonly "builtin:stopifnot": typeof processStopIfNot;

package/dataflow/environments/built-in.js

@@ -39,6 +39,8 @@ const built_in_register_hook_1 = require("../internal/process/functions/call/bui
 const built_in_local_1 = require("../internal/process/functions/call/built-in/built-in-local");
 const built_in_s_three_dispatch_1 = require("../internal/process/functions/call/built-in/built-in-s-three-dispatch");
 const built_in_recall_1 = require("../internal/process/functions/call/built-in/built-in-recall");
+const built_in_s_seven_new_generic_1 = require("../internal/process/functions/call/built-in/built-in-s-seven-new-generic");
+const built_in_s_seven_dispatch_1 = require("../internal/process/functions/call/built-in/built-in-s-seven-dispatch");
 /**
  * Generate a built-in id for the given name
  */
@@ -175,6 +177,12 @@ var BuiltInProcName;
     BuiltInProcName["Rm"] = "builtin:rm";
     /** for `UseMethod` calls, see {@link processS3Dispatch} */
     BuiltInProcName["S3Dispatch"] = "builtin:s3-dispatch";
+    /** for `NextMethod` calls, see {@link processS3Dispatch} */
+    BuiltInProcName["S3DispatchNext"] = "builtin:s3-dispatch-next";
+    /** for `new.generic` calls, see {@link processS7NewGeneric} */
+    BuiltInProcName["S7NewGeneric"] = "builtin:s7-new-generic";
+    /** for `S7_dispatch` calls (and their implicit creations), see {@link processS7Dispatch} */
+    BuiltInProcName["S7Dispatch"] = "builtin:s7-dispatch";
     /** for `source` calls, see {@link processSourceCall} */
     BuiltInProcName["Source"] = "builtin:source";
     /** for special binary operators like `%x%`, see {@link processSpecialBinOp} */
@@ -217,6 +225,8 @@ exports.BuiltInProcessorMapper = {
     [BuiltInProcName.Replacement]: built_in_replacement_1.processReplacementFunction,
     [BuiltInProcName.Rm]: built_in_rm_1.processRm,
     [BuiltInProcName.S3Dispatch]: built_in_s_three_dispatch_1.processS3Dispatch,
+    [BuiltInProcName.S7NewGeneric]: built_in_s_seven_new_generic_1.processS7NewGeneric,
+    [BuiltInProcName.S7Dispatch]: built_in_s_seven_dispatch_1.processS7Dispatch,
     [BuiltInProcName.Source]: built_in_source_1.processSourceCall,
     [BuiltInProcName.SpecialBinOp]: built_in_special_bin_op_1.processSpecialBinOp,
     [BuiltInProcName.StopIfNot]: built_in_stop_if_not_1.processStopIfNot,

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

@@ -404,7 +404,7 @@ export declare const DefaultBuiltinConfig: [{
     readonly assumePrimitive: true;
 }, {
     readonly type: "function";
-    readonly names: ["assign", "setGeneric", "setValidity"];
+    readonly names: ["assign", "setValidity"];
     readonly processor: BuiltInProcName.Assignment;
     readonly config: {
         readonly targetVariable: true;
@@ -543,23 +543,57 @@ export declare const DefaultBuiltinConfig: [{
     readonly assumePrimitive: true;
 }, {
     readonly type: "function";
-    readonly names: ["NextMethod"];
-    readonly processor: BuiltInProcName.Apply;
+    readonly names: ["UseMethod"];
+    readonly processor: BuiltInProcName.S3Dispatch;
     readonly config: {
-        readonly indexOfFunction: 0;
-        readonly unquoteFunction: true;
-        readonly resolveInEnvironment: "global";
+        readonly args: {
+            readonly generic: "generic";
+            readonly object: "object";
+        };
     };
     readonly assumePrimitive: true;
 }, {
     readonly type: "function";
-    readonly names: ["UseMethod"];
+    readonly names: ["NextMethod"];
     readonly processor: BuiltInProcName.S3Dispatch;
     readonly config: {
         readonly args: {
             readonly generic: "generic";
             readonly object: "object";
         };
+        readonly inferFromClosure: true;
+    };
+    readonly assumePrimitive: true;
+}, {
+    readonly type: "function";
+    readonly names: ["new_generic"];
+    readonly processor: BuiltInProcName.S7NewGeneric;
+    readonly config: {
+        readonly args: {
+            readonly name: "name";
+            readonly dispatchArg: "dispatch_args";
+            readonly fun: "fun";
+        };
+    };
+    readonly assumePrimitive: true;
+}, {
+    readonly type: "function";
+    readonly names: ["setGeneric"];
+    readonly processor: BuiltInProcName.S7NewGeneric;
+    readonly config: {
+        readonly args: {
+            readonly name: "name";
+            readonly dispatchArg: undefined;
+            readonly fun: "fun";
+        };
+    };
+    readonly assumePrimitive: true;
+}, {
+    readonly type: "function";
+    readonly names: ["S7_dispatch"];
+    readonly processor: BuiltInProcName.S7Dispatch;
+    readonly config: {
+        readonly libFn: true;
     };
     readonly assumePrimitive: true;
 }, {
@@ -672,6 +706,14 @@ export declare const DefaultBuiltinConfig: [{
     readonly config: {
         readonly readIndices: true;
     };
+}, {
+    readonly type: "replacement";
+    readonly suffixes: ["<-", "<<-"];
+    readonly names: ["method"];
+    readonly config: {
+        readonly readIndices: true;
+        readonly constructName: "s7";
+    };
 }, {
     readonly type: "replacement";
     readonly suffixes: ["<-", "<<-"];

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

@@ -257,7 +257,7 @@ exports.DefaultBuiltinConfig = [
     { type: 'function', names: [identifier_1.Identifier.make('library', 'base'), identifier_1.Identifier.make('require', 'base')], processor: built_in_1.BuiltInProcName.Library, config: {}, assumePrimitive: false },
     { type: 'function', names: ['<-', '='], processor: built_in_1.BuiltInProcName.Assignment, config: { canBeReplacement: true }, assumePrimitive: true },
     { type: 'function', names: [':='], processor: built_in_1.BuiltInProcName.Assignment, config: {}, assumePrimitive: true },
-    { type: 'function', names: ['assign', 'setGeneric', 'setValidity'], processor: built_in_1.BuiltInProcName.Assignment, config: { targetVariable: true, mayHaveMoreArgs: true }, assumePrimitive: true },
+    { type: 'function', names: ['assign', 'setValidity'], processor: built_in_1.BuiltInProcName.Assignment, config: { targetVariable: true, mayHaveMoreArgs: true }, assumePrimitive: true },
     { type: 'function', names: ['setMethod'], processor: built_in_1.BuiltInProcName.AssignmentLike, config: { targetVariable: true, canBeReplacement: false, target: { idx: 0, name: 'f' }, source: { idx: 2, name: 'definition' } }, assumePrimitive: true },
     { type: 'function', names: ['delayedAssign'], processor: built_in_1.BuiltInProcName.Assignment, config: { quoteSource: true, targetVariable: true }, assumePrimitive: true },
     { type: 'function', names: ['<<-'], processor: built_in_1.BuiltInProcName.Assignment, config: { superAssignment: true, canBeReplacement: true }, assumePrimitive: true },
@@ -273,8 +273,11 @@ exports.DefaultBuiltinConfig = [
     { type: 'function', names: ['repeat'], processor: built_in_1.BuiltInProcName.RepeatLoop, config: {}, assumePrimitive: true },
     { type: 'function', names: ['while'], processor: built_in_1.BuiltInProcName.WhileLoop, config: {}, assumePrimitive: true },
     { type: 'function', names: ['do.call'], processor: built_in_1.BuiltInProcName.Apply, config: { indexOfFunction: 0, unquoteFunction: true }, assumePrimitive: true },
-    { type: 'function', names: ['NextMethod'], processor: built_in_1.BuiltInProcName.Apply, config: { indexOfFunction: 0, unquoteFunction: true, resolveInEnvironment: 'global' }, assumePrimitive: true },
     { type: 'function', names: ['UseMethod'], processor: built_in_1.BuiltInProcName.S3Dispatch, config: { args: { generic: 'generic', object: 'object' } }, assumePrimitive: true },
+    { type: 'function', names: ['NextMethod'], processor: built_in_1.BuiltInProcName.S3Dispatch, config: { args: { generic: 'generic', object: 'object' }, inferFromClosure: true }, assumePrimitive: true },
+    { type: 'function', names: ['new_generic'], processor: built_in_1.BuiltInProcName.S7NewGeneric, config: { args: { name: 'name', dispatchArg: 'dispatch_args', fun: 'fun' } }, assumePrimitive: true },
+    { type: 'function', names: ['setGeneric'], processor: built_in_1.BuiltInProcName.S7NewGeneric, config: { args: { name: 'name', dispatchArg: undefined, fun: 'fun' } }, assumePrimitive: true },
+    { type: 'function', names: ['S7_dispatch'], processor: built_in_1.BuiltInProcName.S7Dispatch, config: { libFn: true }, assumePrimitive: true },
     { type: 'function', names: ['.Primitive', '.Internal'], processor: built_in_1.BuiltInProcName.Apply, config: { indexOfFunction: 0, unquoteFunction: true, resolveInEnvironment: 'global' }, assumePrimitive: true },
     { type: 'function', names: ['interference'], processor: built_in_1.BuiltInProcName.Apply, config: { unquoteFunction: true, nameOfFunctionArgument: 'propensity_integrand', libFn: true }, assumePrimitive: false },
     { type: 'function', names: ['ddply'], processor: built_in_1.BuiltInProcName.Apply, config: { unquoteFunction: true, indexOfFunction: 2, nameOfFunctionArgument: '.fun', libFn: true }, assumePrimitive: false },
@@ -341,6 +344,15 @@ exports.DefaultBuiltinConfig = [
             readIndices: true
         }
     },
+    {
+        type: 'replacement',
+        suffixes: ['<-', '<<-'],
+        names: ['method'],
+        config: {
+            readIndices: true,
+            constructName: 's7'
+        }
+    },
     {
         type: 'replacement',
         suffixes: ['<-', '<<-'],

package/dataflow/environments/identifier.d.ts

@@ -40,7 +40,7 @@ export declare const Identifier: {
     readonly make: (this: void, name: BrandedIdentifier, namespace?: BrandedNamespace, internal?: boolean) => Identifier;
     /**
      * Parse an identifier from its string representation,
-     * Please note, that in R if one writes `"pkg::a"` this refers to a symbol named `pkag::a` and NOT to the namespaced identifier `a` in package `pkg`.
+     * Please note, that in R if one writes `"pkg::a"` this refers to a symbol named `pkg::a` and NOT to the namespaced identifier `a` in package `pkg`.
      * In this scenario, see {@link Identifier.make} instead.
      */
     readonly parse: (this: void, str: string) => Identifier;
@@ -125,7 +125,9 @@ export declare enum ReferenceType {
     /** The identifier is defined by a built-in function */
     BuiltInFunction = 128,
     /** Prefix to identify S3 methods, use this, to for example dispatch a call to `f` which will then link to `f.*` */
-    S3MethodPrefix = 256
+    S3MethodPrefix = 256,
+    /** Prefix to identify S7 methods, use this, to for example dispatch a call to `f` which will then link to `f<7>*` */
+    S7MethodPrefix = 512
 }
 /** Reverse mapping of the reference types so you can get the name from the bitmask (useful for debugging) */
 export declare const ReferenceTypeReverseMapping: Map<ReferenceType, string>;

package/dataflow/environments/identifier.js

@@ -34,7 +34,7 @@ exports.Identifier = {
     },
     /**
      * Parse an identifier from its string representation,
-     * Please note, that in R if one writes `"pkg::a"` this refers to a symbol named `pkag::a` and NOT to the namespaced identifier `a` in package `pkg`.
+     * Please note, that in R if one writes `"pkg::a"` this refers to a symbol named `pkg::a` and NOT to the namespaced identifier `a` in package `pkg`.
      * In this scenario, see {@link Identifier.make} instead.
      */
     parse(str) {
@@ -192,6 +192,8 @@ var ReferenceType;
     ReferenceType[ReferenceType["BuiltInFunction"] = 128] = "BuiltInFunction";
     /** Prefix to identify S3 methods, use this, to for example dispatch a call to `f` which will then link to `f.*` */
     ReferenceType[ReferenceType["S3MethodPrefix"] = 256] = "S3MethodPrefix";
+    /** Prefix to identify S7 methods, use this, to for example dispatch a call to `f` which will then link to `f<7>*` */
+    ReferenceType[ReferenceType["S7MethodPrefix"] = 512] = "S7MethodPrefix";
 })(ReferenceType || (exports.ReferenceType = ReferenceType = {}));
 /** Reverse mapping of the reference types so you can get the name from the bitmask (useful for debugging) */
 exports.ReferenceTypeReverseMapping = new Map(Object.entries(ReferenceType).map(([k, v]) => [v, k]));

package/dataflow/environments/resolve-by-name.js

@@ -6,6 +6,7 @@ exports.resolvesToBuiltInConstant = resolvesToBuiltInConstant;
 const logic_1 = require("../../util/logic");
 const identifier_1 = require("./identifier");
 const info_1 = require("../info");
+const built_in_s_seven_dispatch_1 = require("../internal/process/functions/call/built-in/built-in-s-seven-dispatch");
 const FunctionTargetTypes = identifier_1.ReferenceType.Function | identifier_1.ReferenceType.BuiltInFunction | identifier_1.ReferenceType.Unknown | identifier_1.ReferenceType.Argument | identifier_1.ReferenceType.Parameter;
 const VariableTargetTypes = identifier_1.ReferenceType.Variable | identifier_1.ReferenceType.Parameter | identifier_1.ReferenceType.Argument | identifier_1.ReferenceType.Unknown;
 const ConstantTargetTypes = identifier_1.ReferenceType.Constant | identifier_1.ReferenceType.BuiltInConstant | identifier_1.ReferenceType.Unknown;
@@ -21,6 +22,7 @@ const TargetTypePredicate = {
     [identifier_1.ReferenceType.BuiltInConstant]: ({ type }) => (0, identifier_1.isReferenceType)(type, BuiltInConstantTargetTypes),
     [identifier_1.ReferenceType.BuiltInFunction]: ({ type }) => (0, identifier_1.isReferenceType)(type, BuiltInFunctionTargetTypes),
     [identifier_1.ReferenceType.S3MethodPrefix]: ({ type }) => (0, identifier_1.isReferenceType)(type, FunctionTargetTypes),
+    [identifier_1.ReferenceType.S7MethodPrefix]: ({ type }) => (0, identifier_1.isReferenceType)(type, FunctionTargetTypes),
 };
 /**
  * Resolves a given identifier name to a list of its possible definition location using R scoping and resolving rules.
@@ -45,10 +47,11 @@ function resolveByName(id, environment, target) {
             continue;
         }
         let definition;
-        if (target === identifier_1.ReferenceType.S3MethodPrefix) {
+        if (target === identifier_1.ReferenceType.S3MethodPrefix || target === identifier_1.ReferenceType.S7MethodPrefix) {
             // S3 method prefixes only resolve to functions, S3s must not match the exported criteria!
+            const infix = target === identifier_1.ReferenceType.S3MethodPrefix ? '.' : built_in_s_seven_dispatch_1.S7DispatchSeparator;
             definition = current.memory.entries()
-                .filter(([defName]) => defName.startsWith(name + '.'))
+                .filter(([defName]) => defName.startsWith(name + infix))
                 .flatMap(([, defs]) => defs)
                 .toArray();
         }

package/dataflow/eval/resolve/alias-tracking.js

@@ -87,6 +87,10 @@ function getAliases(sourceIds, dataflow, environment) {
         if (info === undefined) {
             return undefined;
         }
+        else if (info.tag === vertex_1.VertexType.FunctionDefinition) {
+            definitions.add(sourceId);
+            continue;
+        }
         const defs = AliasHandler[info.tag](sourceId, dataflow, environment);
         for (const def of defs ?? []) {
             definitions.add(def);
@@ -351,7 +355,10 @@ function resolveToConstants(name, environment) {
         return r_value_1.Top;
     }
     const values = new Set();
-    definitions.forEach(def => values.add((0, general_1.valueFromTsValue)(def.value ?? r_value_1.Top)));
+    definitions.forEach(def => {
+        const d = def.value;
+        values.add(d === undefined ? r_value_1.Top : (0, general_1.valueFromTsValue)(d));
+    });
     return (0, set_constants_1.setFrom)(...values);
 }
 //# sourceMappingURL=alias-tracking.js.map

package/dataflow/eval/values/general.js

@@ -39,7 +39,7 @@ function valueFromTsValue(a) {
         return r_value_1.Bottom;
     }
     else if (a === null) {
-        return r_value_1.Top;
+        return { type: 'null' };
     }
     else if (typeof a === 'string') {
         return (0, string_constants_1.stringFrom)(a);

package/dataflow/eval/values/r-value.d.ts

@@ -37,6 +37,9 @@ export interface ValueString<Str extends Lift<RStringValue> = Lift<RStringValue>
     type: 'string';
     value: Str;
 }
+export interface ValueNull {
+    type: 'null';
+}
 export interface ValueFunctionDefinition {
     type: 'function-definition';
 }
@@ -48,7 +51,7 @@ export interface ValueLogical {
     type: 'logical';
     value: Lift<TernaryLogical>;
 }
-export type Value = Lift<ValueInterval | ValueVector | ValueSet | ValueNumber | ValueString | ValueLogical | ValueMissing | ValueFunctionDefinition>;
+export type Value = Lift<ValueInterval | ValueVector | ValueSet | ValueNumber | ValueString | ValueLogical | ValueMissing | ValueFunctionDefinition | ValueNull>;
 export type ValueType<V> = V extends {
     type: infer T;
 } ? T : never;

package/dataflow/eval/values/r-value.js

@@ -76,6 +76,8 @@ function stringifyValue(value) {
     return tryStringifyBoTop(value, v => {
         const t = v.type;
         switch (t) {
+            case 'null':
+                return 'NULL';
             case 'interval':
                 return `${v.startInclusive ? '[' : '('}${stringifyValue(v.start)}, ${stringifyValue(v.end)}${v.endInclusive ? ']' : ')'}`;
             case 'vector':

package/dataflow/internal/linker.js

@@ -231,10 +231,16 @@ function linkFunctionCallWithSingleTarget(graph, { subflow: fnSubflow, exitPoint
             if (defs === undefined) {
                 continue;
             }
-            for (const { nodeId } of defs) {
+            for (const { nodeId, type, value } of defs) {
                 if (!(0, built_in_1.isBuiltIn)(nodeId)) {
                     graph.addEdge(ingoing.nodeId, nodeId, edge_1.EdgeType.DefinedByOnCall);
                     graph.addEdge(id, nodeId, edge_1.EdgeType.DefinesOnCall);
+                    if (type === identifier_1.ReferenceType.Function && ingoing.type === identifier_1.ReferenceType.S7MethodPrefix && Array.isArray(value)) {
+                        for (const v of value) {
+                            graph.addEdge(id, v, edge_1.EdgeType.Calls);
+                            graph.addEdge(ingoing.nodeId, v, edge_1.EdgeType.Calls);
+                        }
+                    }
                 }
             }
         }
@@ -325,8 +331,10 @@ 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;
         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, info.origin.includes(built_in_1.BuiltInProcName.S3Dispatch) ? identifier_1.ReferenceType.S3MethodPrefix : identifier_1.ReferenceType.Function)?.map(d => d.nodeId) ?? [];
+            functionCallDefs = (0, resolve_by_name_1.resolveByName)(info.name, environment ?? info.environment, refType)?.map(d => d.nodeId) ?? [];
         }
         for (const [target, outgoingEdge] of outgoingEdges.entries()) {
             if (edge_1.DfEdge.includesType(outgoingEdge, edge_1.EdgeType.Calls)) {