@eagleoutice/flowr 2.0.25 → 2.1.0

package/slicing/criterion/parse.js

@@ -1,9 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertAllSlicingCriteriaToIds = exports.slicingCriterionToId = exports.CriteriaParseError = void 0;
+exports.CriteriaParseError = void 0;
+exports.slicingCriterionToId = slicingCriterionToId;
+exports.convertAllSlicingCriteriaToIds = convertAllSlicingCriteriaToIds;
 const log_1 = require("../../util/log");
 const node_id_1 = require("../../r-bridge/lang-4.x/ast/model/processing/node-id");
 const static_slicer_1 = require("../static/static-slicer");
+const type_1 = require("../../r-bridge/lang-4.x/ast/model/type");
 /**
  * Thrown if the given slicing criteria can not be found
  */
@@ -35,7 +38,6 @@ function slicingCriterionToId(criterion, idMap) {
     }
     return resolved;
 }
-exports.slicingCriterionToId = slicingCriterionToId;
 function locationToId(location, dataflowIdMap) {
     let candidate;
     for (const [id, nodeInfo] of dataflowIdMap.entries()) {
@@ -44,7 +46,7 @@ function locationToId(location, dataflowIdMap) {
         }
         (0, log_1.expensiveTrace)(static_slicer_1.slicerLogger, () => `can resolve id ${id} (${JSON.stringify(nodeInfo.location)}) for location ${JSON.stringify(location)}`);
         // function calls have the same location as the symbol they refer to, so we need to prefer the function call
-        if (candidate !== undefined && nodeInfo.type !== "RFunctionCall" /* RType.FunctionCall */ || nodeInfo.type === "RArgument" /* RType.Argument */ || nodeInfo.type === "RExpressionList" /* RType.ExpressionList */) {
+        if (candidate !== undefined && nodeInfo.type !== type_1.RType.FunctionCall || nodeInfo.type === type_1.RType.Argument || nodeInfo.type === type_1.RType.ExpressionList) {
             continue;
         }
         candidate = nodeInfo;
@@ -63,7 +65,7 @@ function conventionalCriteriaToId(line, name, dataflowIdMap) {
         }
         static_slicer_1.slicerLogger.trace(`can resolve id ${id} (${JSON.stringify(nodeInfo)}) for line ${line} and name ${name}`);
         // function calls have the same location as the symbol they refer to, so we need to prefer the function call
-        if (candidate !== undefined && nodeInfo.type !== "RFunctionCall" /* RType.FunctionCall */ || nodeInfo.type === "RArgument" /* RType.Argument */ || nodeInfo.type === "RExpressionList" /* RType.ExpressionList */) {
+        if (candidate !== undefined && nodeInfo.type !== type_1.RType.FunctionCall || nodeInfo.type === type_1.RType.Argument || nodeInfo.type === type_1.RType.ExpressionList) {
             continue;
         }
         candidate = nodeInfo;
@@ -77,5 +79,4 @@ function conventionalCriteriaToId(line, name, dataflowIdMap) {
 function convertAllSlicingCriteriaToIds(criteria, decorated) {
     return criteria.map(l => ({ criterion: l, id: slicingCriterionToId(l, decorated) }));
 }
-exports.convertAllSlicingCriteriaToIds = convertAllSlicingCriteriaToIds;
 //# sourceMappingURL=parse.js.map

package/slicing/static/fingerprint.js

@@ -3,16 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fingerprint = exports.envFingerprint = void 0;
+exports.envFingerprint = envFingerprint;
+exports.fingerprint = fingerprint;
 const object_hash_1 = __importDefault(require("object-hash"));
 const environment_1 = require("../../dataflow/environments/environment");
 const built_in_1 = require("../../dataflow/environments/built-in");
 function envFingerprint(env) {
     return (0, object_hash_1.default)(env, { excludeKeys: key => key === 'id', replacer: (v) => (v === environment_1.BuiltInEnvironment || v === built_in_1.EmptyBuiltInMemory) ? undefined : v });
 }
-exports.envFingerprint = envFingerprint;
 function fingerprint(id, envFingerprint, onlyForSideEffects) {
     return `${id}-${envFingerprint}-${onlyForSideEffects ? '0' : '1'}`;
 }
-exports.fingerprint = fingerprint;
 //# sourceMappingURL=fingerprint.js.map

package/slicing/static/slice-call.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleReturns = exports.sliceForCall = void 0;
+exports.sliceForCall = sliceForCall;
+exports.handleReturns = handleReturns;
 const assert_1 = require("../../util/assert");
 const fingerprint_1 = require("./fingerprint");
 const linker_1 = require("../../dataflow/internal/linker");
@@ -11,6 +12,7 @@ const graph_1 = require("../../dataflow/graph/graph");
 const built_in_1 = require("../../dataflow/environments/built-in");
 const resolve_by_name_1 = require("../../dataflow/environments/resolve-by-name");
 const edge_1 = require("../../dataflow/graph/edge");
+const identifier_1 = require("../../dataflow/environments/identifier");
 function retrieveActiveEnvironment(callerInfo, baseEnvironment) {
     let callerEnvironment = callerInfo.environment;
     const level = callerEnvironment?.level ?? 0;
@@ -36,7 +38,7 @@ function linkCallTargets(onlyForSideEffects, functionCallTargets, baseEnvironmen
     for (const functionCallTarget of functionCallTargets) {
         // all those linked within the scopes of other functions are already linked when exiting a function definition
         for (const openIn of functionCallTarget.subflow.in) {
-            const defs = openIn.name ? (0, resolve_by_name_1.resolveByName)(openIn.name, activeEnvironment) : undefined;
+            const defs = openIn.name ? (0, resolve_by_name_1.resolveByName)(openIn.name, activeEnvironment, openIn.type) : undefined;
             if (defs === undefined) {
                 continue;
             }
@@ -61,9 +63,9 @@ function sliceForCall(current, callerInfo, dataflowGraph, queue) {
     const activeEnvironmentFingerprint = (0, fingerprint_1.envFingerprint)(activeEnvironment);
     const name = callerInfo.name;
     (0, assert_1.guard)(name !== undefined, () => `name of id: ${callerInfo.id} can not be found in id map`);
-    const functionCallDefs = (0, resolve_by_name_1.resolveByName)(name, activeEnvironment)?.filter(d => d.definedAt !== built_in_1.BuiltIn)?.map(d => d.nodeId) ?? [];
+    const functionCallDefs = (0, resolve_by_name_1.resolveByName)(name, activeEnvironment, identifier_1.ReferenceType.Unknown)?.filter(d => d.definedAt !== built_in_1.BuiltIn)?.map(d => d.nodeId) ?? [];
     for (const [target, outgoingEdge] of outgoingEdges[1].entries()) {
-        if ((0, edge_1.edgeIncludesType)(outgoingEdge.types, 4 /* EdgeType.Calls */)) {
+        if ((0, edge_1.edgeIncludesType)(outgoingEdge.types, edge_1.EdgeType.Calls)) {
             functionCallDefs.push(target);
         }
     }
@@ -80,11 +82,10 @@ function sliceForCall(current, callerInfo, dataflowGraph, queue) {
     }
     linkCallTargets(current.onlyForSideEffects, functionCallTargets, baseEnvironment, baseEnvPrint, activeEnvironment, activeEnvironmentFingerprint, queue);
 }
-exports.sliceForCall = sliceForCall;
 /** Returns true if we found at least one return edge */
 function handleReturns(queue, currentEdges, baseEnvFingerprint, baseEnvironment) {
     const e = [...currentEdges.entries()];
-    const found = e.filter(([_, edge]) => (0, edge_1.edgeIncludesType)(edge.types, 8 /* EdgeType.Returns */));
+    const found = e.filter(([_, edge]) => (0, edge_1.edgeIncludesType)(edge.types, edge_1.EdgeType.Returns));
     if (found.length === 0) {
         return false;
     }
@@ -92,10 +93,10 @@ function handleReturns(queue, currentEdges, baseEnvFingerprint, baseEnvironment)
         queue.add(target, baseEnvironment, baseEnvFingerprint, false);
     }
     for (const [target, edge] of e) {
-        if ((0, edge_1.edgeIncludesType)(edge.types, 1 /* EdgeType.Reads */)) {
+        if ((0, edge_1.edgeIncludesType)(edge.types, edge_1.EdgeType.Reads)) {
             queue.add(target, baseEnvironment, baseEnvFingerprint, false);
         }
-        else if ((0, edge_1.edgeIncludesType)(edge.types, 64 /* EdgeType.Argument */)) {
+        else if ((0, edge_1.edgeIncludesType)(edge.types, edge_1.EdgeType.Argument)) {
             queue.potentialArguments.set(target, {
                 id: target,
                 baseEnvironment,
@@ -105,5 +106,4 @@ function handleReturns(queue, currentEdges, baseEnvFingerprint, baseEnvironment)
     }
     return true;
 }
-exports.handleReturns = handleReturns;
 //# sourceMappingURL=slice-call.js.map

package/slicing/static/static-slicer.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.staticSlicing = exports.slicerLogger = void 0;
+exports.slicerLogger = void 0;
+exports.staticSlicing = staticSlicing;
 const assert_1 = require("../../util/assert");
 const log_1 = require("../../util/log");
 const fingerprint_1 = require("./fingerprint");
@@ -8,6 +9,7 @@ const visiting_queue_1 = require("./visiting-queue");
 const slice_call_1 = require("./slice-call");
 const parse_1 = require("../criterion/parse");
 const environment_1 = require("../../dataflow/environments/environment");
+const vertex_1 = require("../../dataflow/graph/vertex");
 const edge_1 = require("../../dataflow/graph/edge");
 exports.slicerLogger = log_1.log.getSubLogger({ name: 'slicer' });
 /**
@@ -64,7 +66,7 @@ function staticSlicing(graph, { idMap }, criteria, threshold = 75) {
             }
         }
         if (!onlyForSideEffects) {
-            if (currentVertex.tag === "function-call" /* VertexType.FunctionCall */ && !currentVertex.onlyBuiltin) {
+            if (currentVertex.tag === vertex_1.VertexType.FunctionCall && !currentVertex.onlyBuiltin) {
                 (0, slice_call_1.sliceForCall)(current, currentVertex, graph, queue);
             }
             const ret = (0, slice_call_1.handleReturns)(queue, currentEdges, baseEnvFingerprint, baseEnvironment);
@@ -73,7 +75,7 @@ function staticSlicing(graph, { idMap }, criteria, threshold = 75) {
             }
         }
         for (const [target, { types }] of currentEdges) {
-            if ((0, edge_1.edgeIncludesType)(types, 256 /* EdgeType.NonStandardEvaluation */)) {
+            if ((0, edge_1.edgeIncludesType)(types, edge_1.EdgeType.NonStandardEvaluation)) {
                 continue;
             }
             const t = (0, edge_1.shouldTraverseEdge)(types);
@@ -94,5 +96,4 @@ function staticSlicing(graph, { idMap }, criteria, threshold = 75) {
     }
     return { ...queue.status(), decodedCriteria };
 }
-exports.staticSlicing = staticSlicing;
 //# sourceMappingURL=static-slicer.js.map

package/statistics/features/common-syntax-probability.js

@@ -1,12 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.summarizeCommonSyntaxTypeCounter = exports.appendCommonSyntaxTypeCounter = exports.updateCommonSyntaxTypeCounts = exports.emptyCommonSyntaxTypeCounts = void 0;
+exports.emptyCommonSyntaxTypeCounts = emptyCommonSyntaxTypeCounts;
+exports.updateCommonSyntaxTypeCounts = updateCommonSyntaxTypeCounts;
+exports.appendCommonSyntaxTypeCounter = appendCommonSyntaxTypeCounter;
+exports.summarizeCommonSyntaxTypeCounter = summarizeCommonSyntaxTypeCounter;
 /**
  * Defines the type of syntax constructs that we track (e.g., true, false, 0, 1, T, F, conditions...)
  */
 const numbers_1 = require("../../util/numbers");
 const summarizer_1 = require("../../util/summarizer");
 const convert_values_1 = require("../../r-bridge/lang-4.x/convert-values");
+const type_1 = require("../../r-bridge/lang-4.x/ast/model/type");
 function emptyCommonSyntaxTypeCounts(init = () => 0n) {
     return {
         total: init(),
@@ -27,7 +31,6 @@ function emptyCommonSyntaxTypeCounts(init = () => 0n) {
         other: {}
     };
 }
-exports.emptyCommonSyntaxTypeCounts = emptyCommonSyntaxTypeCounts;
 function incrementEntry(map, key) {
     map[key] = (map[key] ?? 0n) + 1n;
 }
@@ -45,7 +48,7 @@ function updateCommonSyntaxTypeCounts(current, ...nodes) {
         return current;
     }
     let node = nodes[0];
-    if (node.type === "RArgument" /* RType.Argument */) {
+    if (node.type === type_1.RType.Argument) {
         if (node.name !== undefined) {
             current.withArgument++;
         }
@@ -58,16 +61,16 @@ function updateCommonSyntaxTypeCounts(current, ...nodes) {
         }
     }
     switch (node.type) {
-        case "RString" /* RType.String */:
+        case type_1.RType.String:
             incrementEntry(current.string, node.content.str);
             break;
-        case "RSymbol" /* RType.Symbol */:
+        case type_1.RType.Symbol:
             incrementEntry(current.singleVar, node.content);
             break;
-        case "RLogical" /* RType.Logical */:
+        case type_1.RType.Logical:
             incrementEntry(current.logical, node.content ? convert_values_1.RTrue : convert_values_1.RFalse);
             break;
-        case "RNumber" /* RType.Number */:
+        case type_1.RType.Number:
             if (node.content.complexNumber) {
                 incrementEntry(current.complex, node.content.num);
             }
@@ -78,7 +81,7 @@ function updateCommonSyntaxTypeCounts(current, ...nodes) {
                 incrementEntry(current.number, node.content.num);
             }
             break;
-        case "RFunctionCall" /* RType.FunctionCall */:
+        case type_1.RType.FunctionCall:
             if (!node.named) {
                 current.unnamedCall++;
             }
@@ -86,10 +89,10 @@ function updateCommonSyntaxTypeCounts(current, ...nodes) {
                 incrementEntry(current.call, node.functionName.content);
             }
             break;
-        case "RBinaryOp" /* RType.BinaryOp */:
+        case type_1.RType.BinaryOp:
             incrementEntry(current.binOp, node.operator);
             break;
-        case "RUnaryOp" /* RType.UnaryOp */:
+        case type_1.RType.UnaryOp:
             incrementEntry(current.unaryOp, node.operator);
             break;
         default:
@@ -101,7 +104,6 @@ function updateCommonSyntaxTypeCounts(current, ...nodes) {
     }
     return current;
 }
-exports.updateCommonSyntaxTypeCounts = updateCommonSyntaxTypeCounts;
 function appendRecord(a, b) {
     for (const [key, val] of Object.entries(b)) {
         const get = a[key];
@@ -131,7 +133,6 @@ function appendCommonSyntaxTypeCounter(a, b) {
     appendRecord(a.unaryOp, b.unaryOp);
     appendRecord(a.other, b.other);
 }
-exports.appendCommonSyntaxTypeCounter = appendCommonSyntaxTypeCounter;
 function summarizeRecord(a) {
     return Object.fromEntries(Object.entries(a).map(([key, val]) => [key, (0, summarizer_1.summarizeMeasurement)(val.flat(), val.length)]));
 }
@@ -155,5 +156,4 @@ function summarizeCommonSyntaxTypeCounter(a) {
         other: summarizeRecord(a.other)
     };
 }
-exports.summarizeCommonSyntaxTypeCounter = summarizeCommonSyntaxTypeCounter;
 //# sourceMappingURL=common-syntax-probability.js.map

package/statistics/features/feature.d.ts

@@ -11,6 +11,7 @@ import type { StatisticsSummarizerConfiguration } from '../summarizer/summarizer
 import type { MergeableRecord } from '../../util/objects';
 import type { DataflowInformation } from '../../dataflow/info';
 import type { NormalizedAst } from '../../r-bridge/lang-4.x/ast/model/processing/decorate';
+import type { Document } from '@xmldom/xmldom';
 /**
  * Maps each sub-feature name to the number of occurrences of that sub-feature.
  * Allows for one nesting level to denote hierarchical features.
@@ -97,17 +98,12 @@ export declare const ALL_FEATURES: {
         lambdasOnly: number;
         assignedFunctions: number;
         nestedFunctions: number;
-        recursive: number; /**
-         * Maps each sub-feature name to the number of occurrences of that sub-feature.
-         * Allows for one nesting level to denote hierarchical features.
-         * <p>
-         * Since we are writing to files {@link process}, we only count feature occurrences (some feature/parts are not written to file)
-         */
+        recursive: number;
         deepestNesting: number;
     }>>;
     readonly usedFunctions: Feature<import("ts-essentials").Writable<{
         allFunctionCalls: number;
-        args: Record<number, bigint | import("./common-syntax-probability").CommonSyntaxTypeCounts<bigint>>;
+        args: Record<number, bigint | import("./common-syntax-probability").CommonSyntaxTypeCounts>;
         nestedFunctionCalls: number;
         deepestNesting: number;
         unnamedCalls: number;
@@ -152,8 +148,8 @@ export declare const ALL_FEATURES: {
         switchCase: import("./common-syntax-probability").CommonSyntaxTypeCounts<bigint>;
     }>>;
     readonly dataAccess: Feature<import("ts-essentials").Writable<{
-        singleBracket: Record<number, bigint | import("./common-syntax-probability").CommonSyntaxTypeCounts<bigint>>;
-        doubleBracket: Record<number, bigint | import("./common-syntax-probability").CommonSyntaxTypeCounts<bigint>>;
+        singleBracket: Record<number, bigint | import("./common-syntax-probability").CommonSyntaxTypeCounts>;
+        doubleBracket: Record<number, bigint | import("./common-syntax-probability").CommonSyntaxTypeCounts>;
         chainedOrNestedAccess: number;
         longestChain: number;
         deepestNesting: number;

package/statistics/features/feature.js

@@ -17,7 +17,7 @@ const assignments_1 = require("./supported/assignments/assignments");
 const loops_1 = require("./supported/loops/loops");
 const control_flow_1 = require("./supported/control-flow/control-flow");
 const data_access_1 = require("./supported/data-access/data-access");
-const expression_list_1 = require("./supported/expression-list/expression-list");
+const statistics_expression_list_1 = require("./supported/expression-list/statistics-expression-list");
 const variables_1 = require("./supported/variables/variables");
 /**
  * The source of truth for all features that are supported by the statistics.
@@ -32,7 +32,7 @@ exports.ALL_FEATURES = {
     loops: loops_1.loops,
     controlflow: control_flow_1.controlflow,
     dataAccess: data_access_1.dataAccess,
-    expressionList: expression_list_1.expressionList,
+    expressionList: statistics_expression_list_1.expressionList,
     variables: variables_1.variables
 };
 exports.allFeatureNames = new Set(Object.keys(exports.ALL_FEATURES));

package/statistics/features/post-processing.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.recordFilePath = exports.emptySummarizedWithProject = void 0;
+exports.emptySummarizedWithProject = emptySummarizedWithProject;
+exports.recordFilePath = recordFilePath;
 const path_1 = __importDefault(require("path"));
 function emptySummarizedWithProject() {
     return {
@@ -12,10 +13,8 @@ function emptySummarizedWithProject() {
         count: []
     };
 }
-exports.emptySummarizedWithProject = emptySummarizedWithProject;
 function recordFilePath(summarize, filepath, config) {
     summarize.uniqueFiles.add(filepath);
     summarize.uniqueProjects.add(filepath.split(path_1.default.sep)[config.projectSkip] ?? '');
 }
-exports.recordFilePath = recordFilePath;
 //# sourceMappingURL=post-processing.js.map

package/statistics/features/supported/assignments/assignments.js

@@ -4,6 +4,7 @@ exports.assignments = exports.AssignmentOperators = void 0;
 const common_syntax_probability_1 = require("../../common-syntax-probability");
 const post_process_1 = require("./post-process");
 const visitor_1 = require("../../../../r-bridge/lang-4.x/ast/model/processing/visitor");
+const type_1 = require("../../../../r-bridge/lang-4.x/ast/model/type");
 const operators_1 = require("../../../../r-bridge/lang-4.x/ast/model/operators");
 const initialAssignmentInfo = {
     // operator to occurrence count
@@ -17,7 +18,7 @@ exports.AssignmentOperators = new Set(operators_1.Operators.filter(op => operato
 function visitAssignment(info, input) {
     const assignmentStack = [];
     (0, visitor_1.visitAst)(input.normalizedRAst.ast, node => {
-        if (node.type !== "RBinaryOp" /* RType.BinaryOp */ || !exports.AssignmentOperators.has(node.operator)) {
+        if (node.type !== type_1.RType.BinaryOp || !exports.AssignmentOperators.has(node.operator)) {
             return;
         }
         if (assignmentStack.length > 0) {
@@ -37,7 +38,7 @@ function visitAssignment(info, input) {
         }
     }, node => {
         // drop again :D
-        if (node.type === "RBinaryOp" /* RType.BinaryOp */ && node.flavor === 'assignment') {
+        if (node.type === type_1.RType.BinaryOp && node.flavor === 'assignment') {
             assignmentStack.pop();
         }
     });

package/statistics/features/supported/assignments/post-process.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.postProcess = void 0;
+exports.postProcess = postProcess;
 const common_syntax_probability_1 = require("../../common-syntax-probability");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -120,5 +120,4 @@ function postProcess(featureRoot, info, outputPath, config) {
     writeAssignmentMetadataToCsv(outputPath, collected);
     writeAssignedTypesToCsv(outputPath, collected);
 }
-exports.postProcess = postProcess;
 //# sourceMappingURL=post-process.js.map

package/statistics/features/supported/comments/post-process.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.postProcess = void 0;
+exports.postProcess = postProcess;
 const comments_1 = require("./comments");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -45,5 +45,4 @@ function postProcess(featureRoot, info, outputPath, config) {
         fnOutStream.write(`${JSON.stringify(key)},${uniqueProjects.size},${uniqueFiles.size},${(0, summarizer_1.summarizedMeasurement2Csv)(counts)},${(0, summarizer_1.summarizedMeasurement2Csv)(lineFrac)}\n`);
     }
 }
-exports.postProcess = postProcess;
 //# sourceMappingURL=post-process.js.map

package/statistics/features/supported/control-flow/control-flow.js

@@ -4,6 +4,7 @@ exports.controlflow = void 0;
 const common_syntax_probability_1 = require("../../common-syntax-probability");
 const post_process_1 = require("./post-process");
 const unpack_argument_1 = require("../../../../dataflow/internal/process/functions/call/argument/unpack-argument");
+const type_1 = require("../../../../r-bridge/lang-4.x/ast/model/type");
 const visitor_1 = require("../../../../r-bridge/lang-4.x/ast/model/processing/visitor");
 const initialControlflowInfo = {
     ifThen: (0, common_syntax_probability_1.emptyCommonSyntaxTypeCounts)(),
@@ -20,8 +21,8 @@ const initialControlflowInfo = {
 function visitIfThenElse(info, input) {
     const ifThenElseStack = [];
     (0, visitor_1.visitAst)(input.normalizedRAst.ast, node => {
-        if (node.type !== "RIfThenElse" /* RType.IfThenElse */) {
-            if (node.type === "RFunctionCall" /* RType.FunctionCall */ && node.named && node.functionName.content === 'switch') {
+        if (node.type !== type_1.RType.IfThenElse) {
+            if (node.type === type_1.RType.FunctionCall && node.named && node.functionName.content === 'switch') {
                 const initialArg = (0, unpack_argument_1.unpackArgument)(node.arguments[0]);
                 if (initialArg) {
                     info.switchCase = (0, common_syntax_probability_1.updateCommonSyntaxTypeCounts)(info.switchCase, initialArg);
@@ -50,7 +51,7 @@ function visitIfThenElse(info, input) {
         }
     }, node => {
         // drop again :D
-        if (node.type === "RIfThenElse" /* RType.IfThenElse */) {
+        if (node.type === type_1.RType.IfThenElse) {
             ifThenElseStack.pop();
         }
     });

package/statistics/features/supported/control-flow/post-process.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.postProcess = void 0;
+exports.postProcess = postProcess;
 const common_syntax_probability_1 = require("../../common-syntax-probability");
 const post_processing_1 = require("../../post-processing");
 const fs_1 = __importDefault(require("fs"));
@@ -60,5 +60,4 @@ function postProcess(featureRoot, info, outputPath, config) {
         }
     }
 }
-exports.postProcess = postProcess;
 //# sourceMappingURL=post-process.js.map

package/statistics/features/supported/data-access/data-access.d.ts

@@ -2,8 +2,8 @@ import type { Feature } from '../../feature';
 import type { Writable } from 'ts-essentials';
 import type { CommonSyntaxTypeCounts } from '../../common-syntax-probability';
 declare const initialDataAccessInfo: {
-    singleBracket: Record<number, bigint | CommonSyntaxTypeCounts<bigint>>;
-    doubleBracket: Record<number, bigint | CommonSyntaxTypeCounts<bigint>>;
+    singleBracket: Record<number, bigint | CommonSyntaxTypeCounts>;
+    doubleBracket: Record<number, bigint | CommonSyntaxTypeCounts>;
     chainedOrNestedAccess: number;
     longestChain: number;
     deepestNesting: number;

package/statistics/features/supported/data-access/data-access.js

@@ -4,6 +4,7 @@ exports.dataAccess = void 0;
 const common_syntax_probability_1 = require("../../common-syntax-probability");
 const post_process_1 = require("./post-process");
 const assert_1 = require("../../../../util/assert");
+const type_1 = require("../../../../r-bridge/lang-4.x/ast/model/type");
 const visitor_1 = require("../../../../r-bridge/lang-4.x/ast/model/processing/visitor");
 const role_1 = require("../../../../r-bridge/lang-4.x/ast/model/processing/role");
 const statistics_file_1 = require("../../../output/statistics-file");
@@ -46,7 +47,7 @@ function visitAccess(info, input) {
     const accessChain = [];
     const parentRoleCache = new Map();
     (0, visitor_1.visitAst)(input.normalizedRAst.ast, node => {
-        if (node.type !== "RAccess" /* RType.Access */) {
+        if (node.type !== type_1.RType.Access) {
             return;
         }
         const roles = (0, role_1.rolesOfParents)(node, input.normalizedRAst.idMap);
@@ -96,7 +97,7 @@ function visitAccess(info, input) {
         (0, assert_1.guard)(Array.isArray(node.access), '[ and [[ must provide access as array');
     }, node => {
         // drop again :D
-        if (node.type === "RAccess" /* RType.Access */) {
+        if (node.type === type_1.RType.Access) {
             const ctx = parentRoleCache.get(node.info.id);
             if (ctx?.acc) {
                 accessChain.pop();

package/statistics/features/supported/data-access/post-process.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.postProcess = void 0;
+exports.postProcess = postProcess;
 const common_syntax_probability_1 = require("../../common-syntax-probability");
 const post_processing_1 = require("../../post-processing");
 const fs_1 = __importDefault(require("fs"));
@@ -102,5 +102,4 @@ function postProcess(featureRoot, info, outputPath, config) {
     }
     metaOut.close();
 }
-exports.postProcess = postProcess;
 //# sourceMappingURL=post-process.js.map

package/statistics/features/supported/defined-functions/defined-functions.js

@@ -5,8 +5,10 @@ const post_process_1 = require("./post-process");
 const range_1 = require("../../../../util/range");
 const assert_1 = require("../../../../util/assert");
 const edge_1 = require("../../../../dataflow/graph/edge");
+const type_1 = require("../../../../r-bridge/lang-4.x/ast/model/type");
 const visitor_1 = require("../../../../r-bridge/lang-4.x/ast/model/processing/visitor");
 const statistics_file_1 = require("../../../output/statistics-file");
+const vertex_1 = require("../../../../dataflow/graph/vertex");
 const initialFunctionDefinitionInfo = {
     /** all, anonymous, assigned, non-assigned, ... */
     total: 0,
@@ -24,7 +26,7 @@ function retrieveAllCallsites(input, node, recursiveCalls) {
     const dfStart = input.dataflow.graph.outgoingEdges(node.info.id);
     const callsites = [];
     for (const [target, edge] of dfStart ?? []) {
-        if (!(0, edge_1.edgeIncludesType)(edge.types, 4 /* EdgeType.Calls */)) {
+        if (!(0, edge_1.edgeIncludesType)(edge.types, edge_1.EdgeType.Calls)) {
             continue;
         }
         const loc = input.normalizedRAst.idMap.get(target)?.location;
@@ -44,7 +46,7 @@ function visitDefinitions(info, input) {
     const definitionStack = [];
     const allDefinitions = [];
     (0, visitor_1.visitAst)(input.normalizedRAst.ast, node => {
-        if (node.type !== "RFunctionDefinition" /* RType.FunctionDefinition */) {
+        if (node.type !== type_1.RType.FunctionDefinition) {
             return;
         }
         const graph = input.dataflow.graph;
@@ -54,7 +56,7 @@ function visitDefinitions(info, input) {
             return;
         }
         const [fnDefinition] = dfNode;
-        (0, assert_1.guard)(fnDefinition.tag === "function-definition" /* VertexType.FunctionDefinition */, () => `Dataflow node is not a function definition (${JSON.stringify(fnDefinition)}))})`);
+        (0, assert_1.guard)(fnDefinition.tag === vertex_1.VertexType.FunctionDefinition, () => `Dataflow node is not a function definition (${JSON.stringify(fnDefinition)}))})`);
         const returnTypes = fnDefinition.exitPoints.map(ep => graph.get(ep, true)).filter(assert_1.isNotUndefined)
             .map(([vertex]) => {
             const l = graph.idMap?.get(vertex.id)?.location;
@@ -81,7 +83,7 @@ function visitDefinitions(info, input) {
         const edges = input.dataflow.graph.ingoingEdges(node.info.id);
         if (edges !== undefined) {
             for (const [targetId, edge] of edges) {
-                if ((0, edge_1.edgeIncludesType)(edge.types, 2 /* EdgeType.DefinedBy */)) {
+                if ((0, edge_1.edgeIncludesType)(edge.types, edge_1.EdgeType.DefinedBy)) {
                     const target = input.normalizedRAst.idMap.get(targetId);
                     (0, assert_1.guard)(target !== undefined, 'Dataflow edge points to unknown node');
                     const name = target.info.fullLexeme ?? target.lexeme;
@@ -91,7 +93,7 @@ function visitDefinitions(info, input) {
                     info.assignedFunctions++;
                     (0, statistics_file_1.appendStatisticsFile)(exports.definedFunctions.name, 'assignedFunctions', [name ?? '<unknown>'], input.filepath);
                 }
-                if ((0, edge_1.edgeIncludesType)(edge.types, 4 /* EdgeType.Calls */)) {
+                if ((0, edge_1.edgeIncludesType)(edge.types, edge_1.EdgeType.Calls)) {
                     const target = input.normalizedRAst.idMap.get(targetId);
                     (0, assert_1.guard)(target !== undefined, 'Dataflow edge points to unknown node');
                 }
@@ -100,7 +102,7 @@ function visitDefinitions(info, input) {
         // track all calls with the same name that do not already have a bound calls edge, superfluous if recursive tracking is explicit
         const recursiveCalls = [];
         (0, visitor_1.visitAst)(node.body, n => {
-            if (n.type === "RFunctionCall" /* RType.FunctionCall */ && n.named && assigned.has(n.functionName.lexeme)) {
+            if (n.type === type_1.RType.FunctionCall && n.named && assigned.has(n.functionName.lexeme)) {
                 recursiveCalls.push(n);
             }
         });
@@ -122,7 +124,7 @@ function visitDefinitions(info, input) {
         });
     }, node => {
         // drop again :D
-        if (node.type === "RFunctionDefinition" /* RType.FunctionDefinition */) {
+        if (node.type === type_1.RType.FunctionDefinition) {
             definitionStack.pop();
         }
     });

package/statistics/features/supported/defined-functions/post-process.d.ts

@@ -1,6 +1,6 @@
 import type { FeatureStatisticsWithMeta } from '../../feature';
 import type { StatisticsSummarizerConfiguration } from '../../../summarizer/summarizer';
 /**
- * Note: the summary does not contain a 0 for each function that is _not_ called by a file. Hence, the minimum can not be 0 (division for mean etc. will still be performed on total file count)
+ * Note: the summary does not contain a 0, for each function that `is _not_ called` by a file. Hence, the minimum can not be 0 (division for mean etc. will still be performed on total file count)
  */
 export declare function postProcess(featureRoot: string, info: Map<string, FeatureStatisticsWithMeta>, outputPath: string, config: StatisticsSummarizerConfiguration): void;

package/statistics/features/supported/defined-functions/post-process.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.postProcess = void 0;
+exports.postProcess = postProcess;
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const defined_functions_1 = require("./defined-functions");
@@ -112,7 +112,7 @@ function retrieveAssignedFunctionNames(featureRoot, config, outputPath) {
     varNamesOut.close();
 }
 /**
- * Note: the summary does not contain a 0 for each function that is _not_ called by a file. Hence, the minimum can not be 0 (division for mean etc. will still be performed on total file count)
+ * Note: the summary does not contain a 0, for each function that `is _not_ called` by a file. Hence, the minimum can not be 0 (division for mean etc. will still be performed on total file count)
  */
 function postProcess(featureRoot, info, outputPath, config) {
     // each number[][] contains a 'number[]' per file
@@ -121,7 +121,6 @@ function postProcess(featureRoot, info, outputPath, config) {
     retrieveMetaInformation(info, config, outputPath);
     retrieveAssignedFunctionNames(featureRoot, config, outputPath);
 }
-exports.postProcess = postProcess;
 function emptyFunctionDefinitionSummary() {
     return {
         total: [],

package/statistics/features/supported/expression-list/post-process.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.postProcess = void 0;
+exports.postProcess = postProcess;
 const post_processing_1 = require("../../post-processing");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -39,5 +39,4 @@ function postProcess(featureRoot, info, outputPath, config) {
     }
     variablesOutStream.close();
 }
-exports.postProcess = postProcess;
 //# sourceMappingURL=post-process.js.map