@abaplint/core 2.113.204 → 2.113.206

package/build/abaplint.d.ts

@@ -4239,7 +4239,6 @@ export declare class LanguageServer {
     listDefinitionPositions(textDocument: LServer.TextDocumentIdentifier): LServer.Range[];
     listReadPositions(textDocument: LServer.TextDocumentIdentifier): LServer.Range[];
     listWritePositions(textDocument: LServer.TextDocumentIdentifier): LServer.Range[];
-    dumpStatementFlows(textDocument: LServer.TextDocumentIdentifier): string;
 }
 
 declare namespace LanguageServerTypes {

package/build/src/abap/2_statements/expressions/type.js

@@ -5,10 +5,11 @@ const combi_1 = require("../combi");
 const _1 = require(".");
 class Type extends combi_1.Expression {
     getRunnable() {
+        const indicators = (0, combi_1.seq)("WITH INDICATORS", _1.ComponentName, "TYPE", _1.TypeName);
         const typeType = (0, combi_1.seq)(_1.TypeName, (0, combi_1.optPrio)(_1.Default));
         const like = (0, combi_1.altPrio)((0, combi_1.seq)("LINE OF", _1.FieldChain), (0, combi_1.seq)("REF TO", _1.FieldChain), _1.FieldChain);
         const type = (0, combi_1.altPrio)((0, combi_1.seq)("LINE OF", typeType), (0, combi_1.seq)("REF TO", typeType), (0, combi_1.seq)(typeType, (0, combi_1.optPrio)(_1.LOBHandle)));
-        const ret = (0, combi_1.altPrio)((0, combi_1.seq)("LIKE", like), (0, combi_1.seq)("TYPE", type));
+        const ret = (0, combi_1.seq)((0, combi_1.altPrio)((0, combi_1.seq)("LIKE", like), (0, combi_1.seq)("TYPE", type)), (0, combi_1.optPrio)(indicators));
         return ret;
     }
 }

package/build/src/abap/2_statements/expressions/type_table.js

@@ -19,7 +19,7 @@ class TypeTable extends combi_1.Expression {
         // "WITH" is not allowed as a field name in keys
         const typetable = (0, combi_1.alt)(generic, (0, combi_1.seq)(normal1, (0, combi_1.alt)((0, combi_1.opt)((0, combi_1.per)(header, initial, (0, combi_1.plusPrio)(type_table_key_1.TypeTableKey))), (0, combi_1.seq)((0, combi_1.plus)(type_table_key_1.TypeTableKey), (0, combi_1.optPrio)(initial))), (0, combi_1.optPrio)("VALUE IS INITIAL")));
         const occurs = (0, combi_1.seq)("OCCURS", (0, combi_1.altPrio)(_1.Integer, field_chain_1.FieldChain));
-        const derived = (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)("TABLE FOR", (0, combi_1.altPrio)("ACTION IMPORT", "ACTION RESULT", "CREATE", "EVENT", "REPORTED EARLY", "FAILED EARLY", "FAILED", "LOCK", "DETERMINATION", "READ RESULT", "UPDATE", "DELETE"), (0, combi_1.alt)(_1.TypeName, _1.EntityAssociation)));
+        const derived = (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)("TABLE FOR", (0, combi_1.altPrio)("ACTION IMPORT", "ACTION RESULT", "CREATE", "EVENT", "REPORTED EARLY", "READ IMPORT", "FAILED EARLY", "FAILED", "LOCK", "DETERMINATION", "READ RESULT", "UPDATE", "DELETE"), (0, combi_1.alt)(_1.TypeName, _1.EntityAssociation)));
         const oldType = (0, combi_1.seq)((0, combi_1.opt)("REF TO"), _1.TypeName, (0, combi_1.alt)((0, combi_1.seq)(occurs, (0, combi_1.opt)(header)), header));
         const oldLike = (0, combi_1.seq)((0, combi_1.opt)("REF TO"), field_chain_1.FieldChain, (0, combi_1.alt)((0, combi_1.seq)(occurs, (0, combi_1.opt)(header)), header));
         const typeLine = (0, combi_1.seq)("LINE OF", _1.TypeName, occurs, header);

package/build/src/abap/2_statements/statements/method_def.js

@@ -17,9 +17,9 @@ class MethodDef {
         const forfunction = (0, combi_1.seq)("FOR FUNCTION", expressions_1.TypeName, result);
         const behavior = (0, combi_1.altPrio)("DDL OBJECT OPTIONS CDS SESSION CLIENT REQUIRED", // todo, this is only from version something
         (0, combi_1.seq)("TABLE FUNCTION", expressions_1.NamespaceSimpleName), // todo, this is only from version something
-        (0, combi_1.seq)("VALIDATE ON SAVE IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName), (0, combi_1.seq)("MODIFY IMPORTING", (0, combi_1.plus)((0, combi_1.seq)(expressions_1.MethodParamName, modify))), (0, combi_1.seq)("PRECHECK IMPORTING", expressions_1.MethodParamName, modify), (0, combi_1.seq)("NUMBERING IMPORTING", expressions_1.MethodParamName, modify), (0, combi_1.seq)("READ IMPORTING", expressions_1.MethodParamName, (0, combi_1.altPrio)(forRead, forfunction)), (0, combi_1.seq)("FEATURES IMPORTING", expressions_1.MethodParamName, "REQUEST", expressions_1.NamespaceSimpleName, "FOR", expressions_1.NamespaceSimpleName, result), (0, combi_1.seq)("BEHAVIOR IMPORTING", expressions_1.MethodParamName, "FOR CREATE", expressions_1.TypeName, expressions_1.MethodParamName, "FOR UPDATE", expressions_1.TypeName, expressions_1.MethodParamName, "FOR DELETE", expressions_1.TypeName), (0, combi_1.seq)("BEHAVIOR IMPORTING", expressions_1.MethodParamName, "FOR READ", expressions_1.TypeName, result), (0, combi_1.seq)((0, combi_1.alt)("BEHAVIOR", "LOCK"), "IMPORTING", expressions_1.MethodParamName, "FOR LOCK", expressions_1.TypeName), (0, combi_1.seq)("DETERMINE", (0, combi_1.alt)("ON MODIFY", "ON SAVE"), "IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName), (0, combi_1.seq)("GLOBAL AUTHORIZATION IMPORTING REQUEST", expressions_1.MethodParamName, "FOR", expressions_1.TypeName, result), (0, combi_1.seq)("GLOBAL FEATURES IMPORTING REQUEST", expressions_1.MethodParamName, "FOR", expressions_1.TypeName, result), (0, combi_1.seq)((0, combi_1.seq)((0, combi_1.opt)("INSTANCE"), "AUTHORIZATION IMPORTING"), expressions_1.MethodParamName, "REQUEST", expressions_1.MethodParamName, "FOR", expressions_1.TypeName, result), (0, combi_1.seq)("INSTANCE FEATURES IMPORTING", expressions_1.MethodParamName, "REQUEST", expressions_1.MethodParamName, "FOR", expressions_1.TypeName, result));
+        (0, combi_1.seq)("VALIDATE ON SAVE IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName), (0, combi_1.seq)("MODIFY IMPORTING", (0, combi_1.plus)((0, combi_1.seq)(expressions_1.MethodParamName, modify))), (0, combi_1.seq)("PRECHECK IMPORTING", expressions_1.MethodParamName, modify), (0, combi_1.seq)("DETERMINATION", expressions_1.TypeName, "IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName), (0, combi_1.seq)("VALIDATION", expressions_1.TypeName, "IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName), (0, combi_1.seq)("NUMBERING IMPORTING", expressions_1.MethodParamName, modify), (0, combi_1.seq)("READ IMPORTING", expressions_1.MethodParamName, (0, combi_1.altPrio)(forRead, forfunction)), (0, combi_1.seq)("FEATURES IMPORTING", expressions_1.MethodParamName, "REQUEST", expressions_1.NamespaceSimpleName, "FOR", expressions_1.NamespaceSimpleName, result), (0, combi_1.seq)("BEHAVIOR IMPORTING", expressions_1.MethodParamName, "FOR CREATE", expressions_1.TypeName, expressions_1.MethodParamName, "FOR UPDATE", expressions_1.TypeName, expressions_1.MethodParamName, "FOR DELETE", expressions_1.TypeName), (0, combi_1.seq)("BEHAVIOR IMPORTING", expressions_1.MethodParamName, "FOR READ", expressions_1.TypeName, result), (0, combi_1.seq)("BEHAVIOR IMPORTING", expressions_1.MethodParamName, "FOR UPDATE", expressions_1.TypeName), (0, combi_1.seq)((0, combi_1.alt)("BEHAVIOR", "LOCK"), "IMPORTING", expressions_1.MethodParamName, "FOR LOCK", expressions_1.TypeName), (0, combi_1.seq)("DETERMINE", (0, combi_1.alt)("ON MODIFY", "ON SAVE"), "IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName), (0, combi_1.seq)("GLOBAL AUTHORIZATION IMPORTING REQUEST", expressions_1.MethodParamName, "FOR", expressions_1.TypeName, result), (0, combi_1.seq)("GLOBAL FEATURES IMPORTING REQUEST", expressions_1.MethodParamName, "FOR", expressions_1.TypeName, result), (0, combi_1.seq)((0, combi_1.seq)((0, combi_1.opt)("INSTANCE"), "AUTHORIZATION IMPORTING"), expressions_1.MethodParamName, "REQUEST", expressions_1.MethodParamName, "FOR", expressions_1.TypeName, result), (0, combi_1.seq)("INSTANCE FEATURES IMPORTING", expressions_1.MethodParamName, "REQUEST", expressions_1.MethodParamName, "FOR", expressions_1.TypeName, result));
         // todo, this is only from version something
-        const amdp = (0, combi_1.seq)("AMDP OPTIONS", (0, combi_1.optPrio)("READ-ONLY"), "CDS SESSION CLIENT CURRENT", (0, combi_1.optPrio)(expressions_1.MethodDefImporting), (0, combi_1.optPrio)(expressions_1.MethodDefExporting), (0, combi_1.optPrio)(expressions_1.MethodDefRaising));
+        const amdp = (0, combi_1.seq)("AMDP OPTIONS", (0, combi_1.optPrio)("READ-ONLY"), "CDS SESSION CLIENT", (0, combi_1.alt)("CURRENT", "DEPENDENT"), (0, combi_1.optPrio)(expressions_1.MethodDefImporting), (0, combi_1.optPrio)(expressions_1.MethodDefExporting), (0, combi_1.optPrio)(expressions_1.MethodDefRaising));
         const ret = (0, combi_1.seq)((0, combi_1.altPrio)("CLASS-METHODS", "METHODS"), expressions_1.MethodName, (0, combi_1.alt)((0, combi_1.seq)((0, combi_1.optPrio)(expressions_1.Abstract), (0, combi_1.optPrio)(def), expressions_1.EventHandler), parameters, testing, (0, combi_1.seq)("FOR", behavior), amdp, "NOT AT END OF MODE", (0, combi_1.optPrio)(expressions_1.Redefinition)));
         return ret;
     }

package/build/src/abap/2_statements/statements/modify_entities.js

@@ -10,16 +10,19 @@ class ModifyEntities {
         const fieldsWith = (0, combi_1.seq)("FIELDS (", (0, combi_1.plus)(expressions_1.SimpleName), ")", withh);
         const by = (0, combi_1.seq)("BY", expressions_1.AssociationName);
         const relating = (0, combi_1.seq)("RELATING TO", expressions_1.NamespaceSimpleName, "BY", expressions_1.NamespaceSimpleName);
-        const operation = (0, combi_1.alt)((0, combi_1.seq)("UPDATE SET FIELDS WITH", expressions_1.Source), (0, combi_1.seq)("CREATE SET FIELDS WITH", expressions_1.Source), (0, combi_1.seq)("UPDATE", fieldsWith), (0, combi_1.seq)("DELETE FROM", expressions_1.Source), (0, combi_1.seq)("UPDATE FROM", expressions_1.Source, (0, combi_1.opt)(relating)), (0, combi_1.seq)("CREATE", (0, combi_1.opt)(by), "FROM", expressions_1.Source, (0, combi_1.opt)(relating)), (0, combi_1.seq)("EXECUTE", expressions_1.SimpleName, "FROM", expressions_1.Source), (0, combi_1.seq)("CREATE", (0, combi_1.opt)(by), (0, combi_1.optPrio)("AUTO FILL CID"), (0, combi_1.altPrio)(withh, fieldsWith)));
+        const execute = (0, combi_1.seq)("EXECUTE", expressions_1.NamespaceSimpleName, "FROM", expressions_1.Source);
+        const create = (0, combi_1.seq)("CREATE", (0, combi_1.opt)(by), "FROM", expressions_1.Source, (0, combi_1.opt)(relating));
+        const updateFrom = (0, combi_1.seq)("UPDATE FROM", expressions_1.Source, (0, combi_1.opt)(relating));
+        const deleteFrom = (0, combi_1.seq)("DELETE FROM", expressions_1.Source);
+        const operation = (0, combi_1.alt)((0, combi_1.seq)("UPDATE SET FIELDS WITH", expressions_1.Source), (0, combi_1.seq)("CREATE SET FIELDS WITH", expressions_1.Source), (0, combi_1.seq)("UPDATE", fieldsWith), deleteFrom, updateFrom, create, execute, (0, combi_1.seq)("CREATE", (0, combi_1.opt)(by), (0, combi_1.optPrio)("AUTO FILL CID"), (0, combi_1.altPrio)(withh, fieldsWith)));
         const failed = (0, combi_1.seq)("FAILED", expressions_1.Target);
         const result = (0, combi_1.seq)("RESULT", expressions_1.Target);
         const mapped = (0, combi_1.seq)("MAPPED", expressions_1.Target);
         const reported = (0, combi_1.seq)("REPORTED", expressions_1.Target);
-        const from = (0, combi_1.seq)("FROM", expressions_1.Source);
-        const execute = (0, combi_1.seq)("EXECUTE", expressions_1.NamespaceSimpleName);
-        const entities = (0, combi_1.seq)((0, combi_1.optPrio)("AUGMENTING"), "ENTITIES OF", expressions_1.NamespaceSimpleName, (0, combi_1.opt)("IN LOCAL MODE"), (0, combi_1.plusPrio)((0, combi_1.seq)("ENTITY", expressions_1.SimpleName, (0, combi_1.plus)(operation))), (0, combi_1.optPrio)((0, combi_1.per)(failed, result, mapped, reported)));
-        const entity = (0, combi_1.seq)("ENTITY", expressions_1.NamespaceSimpleName, execute, from, mapped, failed, reported);
-        return (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)("MODIFY", (0, combi_1.alt)(entities, entity)));
+        const end = (0, combi_1.optPrio)((0, combi_1.per)(failed, result, mapped, reported));
+        const entities = (0, combi_1.seq)((0, combi_1.optPrio)("AUGMENTING"), "ENTITIES OF", expressions_1.NamespaceSimpleName, (0, combi_1.opt)("IN LOCAL MODE"), (0, combi_1.plusPrio)((0, combi_1.seq)("ENTITY", expressions_1.SimpleName, (0, combi_1.plus)(operation))));
+        const entity = (0, combi_1.seq)("ENTITY", (0, combi_1.opt)("IN LOCAL MODE"), (0, combi_1.alt)(expressions_1.NamespaceSimpleName, expressions_1.EntityAssociation), (0, combi_1.alt)(execute, create, deleteFrom, updateFrom));
+        return (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)("MODIFY", (0, combi_1.alt)(entities, entity), end));
     }
 }
 exports.ModifyEntities = ModifyEntities;

package/build/src/abap/2_statements/statements/read_entities.js

@@ -10,9 +10,12 @@ class ReadEntities {
         const from = (0, combi_1.seq)("FROM", expressions_1.Source);
         const fields = (0, combi_1.seq)("FIELDS", (0, combi_1.tok)(tokens_1.WParenLeftW), (0, combi_1.plus)(expressions_1.SimpleName), (0, combi_1.tok)(tokens_1.WParenRightW), "WITH", expressions_1.Source);
         const all = (0, combi_1.seq)("ALL FIELDS WITH", expressions_1.Source);
-        const entity = (0, combi_1.seq)("ENTITY", expressions_1.NamespaceSimpleName, (0, combi_1.opt)((0, combi_1.seq)("BY", expressions_1.AssociationName)), (0, combi_1.alt)(fields, from, all), (0, combi_1.optPrio)((0, combi_1.seq)("RESULT", expressions_1.Target)));
-        const s = (0, combi_1.seq)("READ ENTITIES OF", expressions_1.NamespaceSimpleName, (0, combi_1.opt)("IN LOCAL MODE"), (0, combi_1.plus)(entity), (0, combi_1.optPrio)((0, combi_1.seq)("LINK", expressions_1.Target)), (0, combi_1.optPrio)((0, combi_1.seq)("FAILED", expressions_1.Target)), (0, combi_1.optPrio)((0, combi_1.seq)("REPORTED", expressions_1.Target)));
-        return (0, combi_1.ver)(version_1.Version.v754, s);
+        const result = (0, combi_1.seq)("RESULT", expressions_1.Target);
+        const failed = (0, combi_1.seq)("FAILED", expressions_1.Target);
+        const entity = (0, combi_1.seq)("ENTITY", expressions_1.NamespaceSimpleName, (0, combi_1.opt)((0, combi_1.seq)("BY", expressions_1.AssociationName)), (0, combi_1.alt)(fields, from, all), (0, combi_1.optPrio)(result));
+        const s = (0, combi_1.seq)("ENTITIES OF", expressions_1.NamespaceSimpleName, (0, combi_1.opt)("IN LOCAL MODE"), (0, combi_1.plus)(entity), (0, combi_1.optPrio)((0, combi_1.seq)("LINK", expressions_1.Target)), (0, combi_1.optPrio)(failed), (0, combi_1.optPrio)((0, combi_1.seq)("REPORTED", expressions_1.Target)));
+        const single = (0, combi_1.seq)("ENTITY", (0, combi_1.opt)("IN LOCAL MODE"), (0, combi_1.alt)(expressions_1.NamespaceSimpleName, expressions_1.EntityAssociation), (0, combi_1.alt)(all, fields, from), result, (0, combi_1.optPrio)(failed));
+        return (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)("READ", (0, combi_1.alt)(s, single)));
     }
 }
 exports.ReadEntities = ReadEntities;

package/build/src/abap/2_statements/statements/update_database.js

@@ -7,7 +7,8 @@ class UpdateDatabase {
     getMatcher() {
         const parameters = (0, combi_1.seq)(expressions_1.SQLFieldAndValue, (0, combi_1.star)((0, combi_1.seq)((0, combi_1.opt)(","), expressions_1.SQLFieldAndValue)));
         const set = (0, combi_1.seq)("SET", (0, combi_1.alt)(parameters, expressions_1.Dynamic), (0, combi_1.opt)((0, combi_1.seq)("WHERE", expressions_1.SQLCond)));
-        const fromTable = (0, combi_1.seq)("FROM", (0, combi_1.opt)("TABLE"), expressions_1.SQLSource);
+        const indicators = (0, combi_1.seq)("INDICATORS SET STRUCTURE", expressions_1.ComponentName);
+        const fromTable = (0, combi_1.seq)("FROM", (0, combi_1.opt)("TABLE"), expressions_1.SQLSource, (0, combi_1.opt)(indicators));
         const ret = (0, combi_1.seq)("UPDATE", expressions_1.DatabaseTable, (0, combi_1.opt)(expressions_1.SQLClient), (0, combi_1.opt)(expressions_1.DatabaseConnection), (0, combi_1.opt)((0, combi_1.alt)(fromTable, set)));
         return ret;
     }

package/build/src/lsp/language_server.js

@@ -15,7 +15,6 @@ const code_actions_1 = require("./code_actions");
 const references_1 = require("./references");
 const implementation_1 = require("./implementation");
 const semantic_1 = require("./semantic");
-const statement_flow_1 = require("../abap/flow/statement_flow");
 const code_lens_1 = require("./code_lens");
 const inlay_hints_1 = require("./inlay_hints");
 // note Ranges are zero based in LSP,
@@ -127,23 +126,6 @@ class LanguageServer {
     listWritePositions(textDocument) {
         return new highlight_1.Highlight(this.reg).listWritePositions(textDocument);
     }
-    dumpStatementFlows(textDocument) {
-        const file = _lsp_utils_1.LSPUtils.getABAPFile(this.reg, textDocument.uri);
-        if (file === undefined) {
-            return "file not found";
-        }
-        const obj = this.reg.findObjectForFile(file);
-        if (obj === undefined) {
-            return "obj not found";
-        }
-        const stru = file.getStructure();
-        if (stru === undefined) {
-            return "empty structure";
-        }
-        const graphs = new statement_flow_1.StatementFlow().build(stru, obj);
-        const wiz = graphs.map(g => g.toDigraph());
-        return JSON.stringify(wiz);
-    }
 }
 exports.LanguageServer = LanguageServer;
 //# sourceMappingURL=language_server.js.map

package/build/src/registry.js

@@ -67,7 +67,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.204";
+        return "2.113.206";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/build/src/rules/empty_event.js

@@ -7,7 +7,7 @@ const _basic_rule_config_1 = require("./_basic_rule_config");
 const Structures = require("../abap/3_structures/structures");
 const _irule_1 = require("./_irule");
 const objects_1 = require("../objects");
-const selection_events_1 = require("../abap/flow/selection_events");
+const stuff_1 = require("../stuff");
 class EmptyEventConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.EmptyEventConf = EmptyEventConf;
@@ -51,7 +51,7 @@ START-OF-SELECTION.
         let currentEvent = undefined;
         let children = [];
         for (const s of stru.getChildren() || []) {
-            if (selection_events_1.SELECTION_EVENTS.some(f => s.get() instanceof f)) {
+            if (stuff_1.SELECTION_EVENTS.some(f => s.get() instanceof f)) {
                 if (currentEvent !== undefined && children.length === 0) {
                     issues.push(issue_1.Issue.atStatement(file, currentEvent, "Empty event", this.getMetadata().key, this.getConfig().severity));
                 }
@@ -61,7 +61,7 @@ START-OF-SELECTION.
             else if (s.get() instanceof Structures.Normal) {
                 const stru = s;
                 // ignore declaration stuff
-                if (selection_events_1.DECLARATION_STUFF.some(d => { var _a; return ((_a = stru.getFirstStatement()) === null || _a === void 0 ? void 0 : _a.get()) instanceof d; })) {
+                if (stuff_1.DECLARATION_STUFF.some(d => { var _a; return ((_a = stru.getFirstStatement()) === null || _a === void 0 ? void 0 : _a.get()) instanceof d; })) {
                     continue;
                 }
                 children.push(s);

package/build/src/rules/implicit_start_of_selection.js

@@ -8,7 +8,7 @@ const Structures = require("../abap/3_structures/structures");
 const _irule_1 = require("./_irule");
 const objects_1 = require("../objects");
 const nodes_1 = require("../abap/nodes");
-const selection_events_1 = require("../abap/flow/selection_events");
+const stuff_1 = require("../stuff");
 class ImplicitStartOfSelectionConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.ImplicitStartOfSelectionConf = ImplicitStartOfSelectionConf;
@@ -51,7 +51,7 @@ START-OF-SELECTION.
         let inEvent = false;
         let collected = [];
         for (const s of stru.getChildren() || []) {
-            if (selection_events_1.SELECTION_EVENTS.some(f => s.get() instanceof f)) {
+            if (stuff_1.SELECTION_EVENTS.some(f => s.get() instanceof f)) {
                 if (inEvent === false && collected.length > 0) {
                     // implicit START-OF-SELECTION
                     let first = collected[0];
@@ -66,7 +66,7 @@ START-OF-SELECTION.
             else if (s.get() instanceof Structures.Normal) {
                 const stru = s;
                 // ignore declaration stuff
-                if (selection_events_1.DECLARATION_STUFF.some(d => { var _a; return ((_a = stru.getFirstStatement()) === null || _a === void 0 ? void 0 : _a.get()) instanceof d; })) {
+                if (stuff_1.DECLARATION_STUFF.some(d => { var _a; return ((_a = stru.getFirstStatement()) === null || _a === void 0 ? void 0 : _a.get()) instanceof d; })) {
                     continue;
                 }
                 collected.push(s);

package/build/src/{abap/flow/selection_events.js → stuff.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DECLARATION_STUFF = exports.SELECTION_EVENTS = void 0;
-const Statements = require("../2_statements/statements");
+const Statements = require("./abap/2_statements/statements");
 exports.SELECTION_EVENTS = [
     Statements.StartOfSelection,
     Statements.AtSelectionScreen,
@@ -29,4 +29,4 @@ exports.DECLARATION_STUFF = [
     Statements.SelectionScreen,
     Statements.Define,
 ];
-//# sourceMappingURL=selection_events.js.map
+//# sourceMappingURL=stuff.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.113.204",
+    "version": "2.113.206",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",

package/build/src/abap/flow/flow_graph.js

@@ -1,154 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FlowGraph = exports.FLOW_EDGE_TYPE = void 0;
-var FLOW_EDGE_TYPE;
-(function (FLOW_EDGE_TYPE) {
-    FLOW_EDGE_TYPE["true"] = "true";
-    FLOW_EDGE_TYPE["false"] = "false";
-    FLOW_EDGE_TYPE["undefined"] = "undefined";
-})(FLOW_EDGE_TYPE || (exports.FLOW_EDGE_TYPE = FLOW_EDGE_TYPE = {}));
-class FlowGraph {
-    constructor(counter) {
-        this.edges = {};
-        this.label = "undefined";
-        this.startNode = "start#" + counter;
-        this.endNode = "end#" + counter;
-    }
-    getStart() {
-        return this.startNode;
-    }
-    getLabel() {
-        return this.label;
-    }
-    getEnd() {
-        return this.endNode;
-    }
-    addEdge(from, to, type) {
-        if (this.edges[from] === undefined) {
-            this.edges[from] = {};
-        }
-        this.edges[from][to] = type;
-    }
-    removeEdge(from, to) {
-        if (this.edges[from] === undefined) {
-            return;
-        }
-        delete this.edges[from][to];
-        if (Object.keys(this.edges[from]).length === 0) {
-            delete this.edges[from];
-        }
-    }
-    listEdges() {
-        const list = [];
-        for (const from of Object.keys(this.edges)) {
-            for (const to of Object.keys(this.edges[from])) {
-                list.push({ from, to, type: this.edges[from][to] });
-            }
-        }
-        return list;
-    }
-    listNodes() {
-        const set = new Set();
-        for (const l of this.listEdges()) {
-            set.add(l.from);
-            set.add(l.to);
-        }
-        return Array.from(set.values());
-    }
-    hasEdges() {
-        return Object.keys(this.edges).length > 0;
-    }
-    /** return value: end node of to graph */
-    addGraph(from, to, type) {
-        if (to.hasEdges() === false) {
-            return from;
-        }
-        this.addEdge(from, to.getStart(), type);
-        to.listEdges().forEach(e => this.addEdge(e.from, e.to, e.type));
-        return to.getEnd();
-    }
-    toJSON() {
-        return JSON.stringify(this.edges);
-    }
-    toTextEdges() {
-        let graph = "";
-        for (const l of this.listEdges()) {
-            const label = l.type === FLOW_EDGE_TYPE.undefined ? "" : ` [label="${l.type}"]`;
-            graph += `"${l.from}" -> "${l.to}"${label};\n`;
-        }
-        return graph.trim();
-    }
-    setLabel(label) {
-        this.label = label;
-    }
-    toDigraph() {
-        return `digraph G {
-labelloc="t";
-label="${this.label}";
-graph [fontname = "helvetica"];
-node [fontname = "helvetica", shape="box"];
-edge [fontname = "helvetica"];
-${this.toTextEdges()}
-}`;
-    }
-    listSources(node) {
-        const set = [];
-        for (const l of this.listEdges()) {
-            if (node === l.to) {
-                set.push({ name: l.from, type: l.type });
-            }
-        }
-        return set;
-    }
-    listTargets(node) {
-        const set = [];
-        for (const l of this.listEdges()) {
-            if (node === l.from) {
-                set.push({ name: l.to, type: l.type });
-            }
-        }
-        return set;
-    }
-    /** removes all nodes containing "#" that have one in-going and one out-going edge */
-    reduce() {
-        for (const node of this.listNodes()) {
-            if (node.includes("#") === false) {
-                continue;
-            }
-            const sources = this.listSources(node);
-            const targets = this.listTargets(node);
-            if (sources.length > 0 && targets.length > 0) {
-                // hash node in the middle of the graph
-                for (const s of sources) {
-                    this.removeEdge(s.name, node);
-                }
-                for (const t of targets) {
-                    this.removeEdge(node, t.name);
-                }
-                for (const s of sources) {
-                    for (const t of targets) {
-                        let type = FLOW_EDGE_TYPE.undefined;
-                        if (s.type !== FLOW_EDGE_TYPE.undefined) {
-                            type = s.type;
-                        }
-                        if (t.type !== FLOW_EDGE_TYPE.undefined) {
-                            if (type !== FLOW_EDGE_TYPE.undefined) {
-                                throw new Error("reduce: cannot merge, different edge types");
-                            }
-                            type = t.type;
-                        }
-                        this.addEdge(s.name, t.name, type);
-                    }
-                }
-            }
-            if (node.startsWith("end#") && sources.length === 0) {
-                for (const t of targets) {
-                    this.removeEdge(node, t.name);
-                }
-            }
-        }
-        return this;
-    }
-}
-exports.FlowGraph = FlowGraph;
-//# sourceMappingURL=flow_graph.js.map

package/build/src/abap/flow/statement_flow.js

@@ -1,342 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.StatementFlow = void 0;
-const nodes_1 = require("../nodes");
-const Structures = require("../3_structures/structures");
-const Statements = require("../2_statements/statements");
-const Expressions = require("../2_statements/expressions");
-const flow_graph_1 = require("./flow_graph");
-const objects_1 = require("../../objects");
-const selection_events_1 = require("./selection_events");
-const virtual_position_1 = require("../../virtual_position");
-class StatementFlow {
-    constructor() {
-        this.counter = 0;
-    }
-    build(stru, obj) {
-        var _a, _b, _c, _d;
-        const ret = [];
-        let name = "";
-        const structures = stru.findAllStructuresMulti([
-            Structures.Form, Structures.ClassImplementation, Structures.FunctionModule, Structures.Module
-        ]);
-        for (const s of structures) {
-            if (s.get() instanceof Structures.Form) {
-                name = "FORM " + ((_a = s.findFirstExpression(Expressions.FormName)) === null || _a === void 0 ? void 0 : _a.concatTokens());
-                ret.push(this.run(s, name));
-            }
-            else if (s.get() instanceof Structures.ClassImplementation) {
-                const className = (_b = s.findFirstExpression(Expressions.ClassName)) === null || _b === void 0 ? void 0 : _b.concatTokens();
-                for (const method of s.findDirectStructures(Structures.Method)) {
-                    const methodName = (_c = method.findFirstExpression(Expressions.MethodName)) === null || _c === void 0 ? void 0 : _c.concatTokens();
-                    name = "METHOD " + methodName + ", CLASS " + className;
-                    ret.push(this.run(method, name));
-                }
-            }
-            else if (s.get() instanceof Structures.FunctionModule) {
-                name = "FUNCTION " + ((_d = s.findFirstExpression(Expressions.Field)) === null || _d === void 0 ? void 0 : _d.concatTokens());
-                ret.push(this.run(s, name));
-            }
-            else if (s.get() instanceof Structures.Module) {
-                name = s.getFirstStatement().concatTokens().toUpperCase();
-                ret.push(this.run(s, name));
-            }
-            else {
-                throw new Error("StatementFlow, unknown structure");
-            }
-        }
-        if (obj instanceof objects_1.Program || obj instanceof objects_1.FunctionGroup) {
-            // find the top level events
-            let inEvent = false;
-            let collected = [];
-            for (const s of stru.getChildren() || []) {
-                if (selection_events_1.SELECTION_EVENTS.some(f => s.get() instanceof f)) {
-                    if (inEvent === true) {
-                        ret.push(this.runEvent(collected, name));
-                    }
-                    collected = [];
-                    inEvent = true;
-                    name = s.concatTokens();
-                }
-                else if (s.get() instanceof Structures.Normal) {
-                    collected.push(s);
-                }
-                else {
-                    if (inEvent === true) {
-                        ret.push(this.runEvent(collected, name));
-                        inEvent = false;
-                    }
-                    collected = [];
-                }
-            }
-            if (inEvent === true) {
-                ret.push(this.runEvent(collected, name));
-            }
-            else if (collected.length > 0
-                && !(obj instanceof objects_1.FunctionGroup)) {
-                // implicit START-OF-SELECTION
-                ret.push(this.runEvent(collected, "START-OF-SELECTION."));
-            }
-        }
-        return ret.map(f => f.reduce());
-    }
-    ////////////////////
-    runEvent(s, name) {
-        this.counter = 1;
-        const graph = this.traverseBody(s, { procedureEnd: "end#1" });
-        graph.setLabel(name);
-        return graph;
-    }
-    run(s, name) {
-        this.counter = 1;
-        const graph = this.traverseBody(this.findBody(s), { procedureEnd: "end#1" });
-        graph.setLabel(name);
-        return graph;
-    }
-    findBody(f) {
-        var _a;
-        return ((_a = f.findDirectStructure(Structures.Body)) === null || _a === void 0 ? void 0 : _a.getChildren()) || [];
-    }
-    // note: it must handle macros and chained statements
-    static buildName(statement) {
-        let token = undefined;
-        const colon = statement.getColon();
-        if (colon === undefined) {
-            token = statement.getFirstToken();
-        }
-        else {
-            for (const t of statement.getTokens()) {
-                if (t.getStart().isAfter(colon.getEnd())) {
-                    token = t;
-                    break;
-                }
-            }
-        }
-        let extra = "";
-        const tStart = token === null || token === void 0 ? void 0 : token.getStart();
-        if (tStart instanceof virtual_position_1.VirtualPosition) {
-            extra += "$" + tStart.vrow;
-            extra += "," + tStart.vcol;
-        }
-        if (token === undefined) {
-            return "tokenError";
-        }
-        return statement.get().constructor.name +
-            ":" + token.getRow() +
-            "," + token.getCol() + extra;
-    }
-    traverseBody(children, context) {
-        const graph = new flow_graph_1.FlowGraph(this.counter++);
-        if (children.length === 0) {
-            graph.addEdge(graph.getStart(), graph.getEnd(), flow_graph_1.FLOW_EDGE_TYPE.undefined);
-            return graph;
-        }
-        let current = graph.getStart();
-        for (const c of children) {
-            if (c.get() instanceof Structures.Normal) {
-                const firstChild = c.getFirstChild(); // "Normal" only has one child
-                if (firstChild instanceof nodes_1.StatementNode) {
-                    const name = StatementFlow.buildName(firstChild);
-                    graph.addEdge(current, name, flow_graph_1.FLOW_EDGE_TYPE.undefined);
-                    current = name;
-                    if (firstChild.get() instanceof Statements.Check) {
-                        if (context.loopStart) {
-                            graph.addEdge(name, context.loopStart, flow_graph_1.FLOW_EDGE_TYPE.false);
-                        }
-                        else {
-                            graph.addEdge(name, context.procedureEnd, flow_graph_1.FLOW_EDGE_TYPE.false);
-                        }
-                    }
-                    else if (firstChild.get() instanceof Statements.Assert) {
-                        graph.addEdge(name, context.procedureEnd, flow_graph_1.FLOW_EDGE_TYPE.false);
-                    }
-                    else if (firstChild.get() instanceof Statements.Continue && context.loopStart) {
-                        graph.addEdge(name, context.loopStart, flow_graph_1.FLOW_EDGE_TYPE.undefined);
-                        return graph;
-                    }
-                    else if (firstChild.get() instanceof Statements.Exit) {
-                        if (context.loopEnd) {
-                            graph.addEdge(name, context.loopEnd, flow_graph_1.FLOW_EDGE_TYPE.undefined);
-                        }
-                        else {
-                            graph.addEdge(name, context.procedureEnd, flow_graph_1.FLOW_EDGE_TYPE.undefined);
-                        }
-                        return graph;
-                    }
-                    else if (firstChild.get() instanceof Statements.Return) {
-                        graph.addEdge(name, context.procedureEnd, flow_graph_1.FLOW_EDGE_TYPE.undefined);
-                        return graph;
-                    }
-                }
-                else if (firstChild instanceof nodes_1.StructureNode) {
-                    const sub = this.traverseStructure(firstChild, context);
-                    current = graph.addGraph(current, sub, flow_graph_1.FLOW_EDGE_TYPE.undefined);
-                }
-            }
-        }
-        graph.addEdge(current, graph.getEnd(), flow_graph_1.FLOW_EDGE_TYPE.undefined);
-        return graph;
-    }
-    traverseStructure(n, context) {
-        const graph = new flow_graph_1.FlowGraph(this.counter++);
-        if (n === undefined) {
-            return graph;
-        }
-        let current = graph.getStart();
-        const type = n.get();
-        if (type instanceof Structures.If) {
-            const ifName = StatementFlow.buildName(n.findDirectStatement(Statements.If));
-            const sub = this.traverseBody(this.findBody(n), context);
-            graph.addEdge(current, ifName, flow_graph_1.FLOW_EDGE_TYPE.undefined);
-            graph.addGraph(ifName, sub, flow_graph_1.FLOW_EDGE_TYPE.true);
-            graph.addEdge(sub.getEnd(), graph.getEnd(), flow_graph_1.FLOW_EDGE_TYPE.undefined);
-            current = ifName;
-            for (const e of n.findDirectStructures(Structures.ElseIf)) {
-                const elseifst = e.findDirectStatement(Statements.ElseIf);
-                if (elseifst === undefined) {
-                    continue;
-                }
-                const elseIfName = StatementFlow.buildName(elseifst);
-                const sub = this.traverseBody(this.findBody(e), context);
-                graph.addEdge(current, elseIfName, flow_graph_1.FLOW_EDGE_TYPE.false);
-                graph.addGraph(elseIfName, sub, flow_graph_1.FLOW_EDGE_TYPE.true);
-                graph.addEdge(sub.getEnd(), graph.getEnd(), flow_graph_1.FLOW_EDGE_TYPE.undefined);
-                current = elseIfName;
-            }
-            const els = n.findDirectStructure(Structures.Else);
-            const elsest = els === null || els === void 0 ? void 0 : els.findDirectStatement(Statements.Else);
-            if (els && elsest) {
-                const elseName = StatementFlow.buildName(elsest);
-                const sub = this.traverseBody(this.findBody(els), context);
-                graph.addEdge(current, elseName, flow_graph_1.FLOW_EDGE_TYPE.false);
-                graph.addGraph(elseName, sub, flow_graph_1.FLOW_EDGE_TYPE.undefined);
-                graph.addEdge(sub.getEnd(), graph.getEnd(), flow_graph_1.FLOW_EDGE_TYPE.undefined);
-            }
-            else {
-                graph.addEdge(ifName, graph.getEnd(), flow_graph_1.FLOW_EDGE_TYPE.false);
-            }
-        }
-        else if (type instanceof Structures.Loop
-            || type instanceof Structures.While
-            || type instanceof Structures.With
-            || type instanceof Structures.Provide
-            || type instanceof Structures.Select
-            || type instanceof Structures.EnhancementSection
-            || type instanceof Structures.LoopAtScreen
-            || type instanceof Structures.Do) {
-            const loopName = StatementFlow.buildName(n.getFirstStatement());
-            const sub = this.traverseBody(this.findBody(n), Object.assign(Object.assign({}, context), { loopStart: loopName, loopEnd: graph.getEnd() }));
-            graph.addEdge(current, loopName, flow_graph_1.FLOW_EDGE_TYPE.undefined);
-            graph.addGraph(loopName, sub, flow_graph_1.FLOW_EDGE_TYPE.true);
-            graph.addEdge(sub.getEnd(), loopName, flow_graph_1.FLOW_EDGE_TYPE.undefined);
-            graph.addEdge(loopName, graph.getEnd(), flow_graph_1.FLOW_EDGE_TYPE.false);
-        }
-        else if (type instanceof Structures.Data
-            || type instanceof Structures.Constants
-            || type instanceof Structures.Statics
-            || type instanceof Structures.ExecSQL
-            || type instanceof Structures.Types) {
-            // these doesnt affect control flow, so just take the first statement
-            const statement = n.getFirstStatement();
-            const name = StatementFlow.buildName(statement);
-            graph.addEdge(current, name, flow_graph_1.FLOW_EDGE_TYPE.undefined);
-            graph.addEdge(name, graph.getEnd(), flow_graph_1.FLOW_EDGE_TYPE.undefined);
-        }
-        else if (type instanceof Structures.TestSeam) {
-            const name = StatementFlow.buildName(n.getFirstStatement());
-            const sub = this.traverseBody(this.findBody(n), context);
-            graph.addEdge(current, name, flow_graph_1.FLOW_EDGE_TYPE.undefined);
-            graph.addGraph(name, sub, flow_graph_1.FLOW_EDGE_TYPE.undefined);
-            graph.addEdge(sub.getEnd(), graph.getEnd(), flow_graph_1.FLOW_EDGE_TYPE.undefined);
-        }
-        else if (type instanceof Structures.AtFirst
-            || type instanceof Structures.AtLast
-            || type instanceof Structures.At
-            || type instanceof Structures.OnChange) {
-            const name = StatementFlow.buildName(n.getFirstStatement());
-            const body = this.traverseBody(this.findBody(n), context);
-            graph.addEdge(current, name, flow_graph_1.FLOW_EDGE_TYPE.undefined);
-            graph.addGraph(name, body, flow_graph_1.FLOW_EDGE_TYPE.undefined);
-            graph.addEdge(body.getEnd(), graph.getEnd(), flow_graph_1.FLOW_EDGE_TYPE.undefined);
-            graph.addEdge(current, graph.getEnd(), flow_graph_1.FLOW_EDGE_TYPE.undefined);
-        }
-        else if (type instanceof Structures.Try) {
-            const tryName = StatementFlow.buildName(n.getFirstStatement());
-            const body = this.traverseBody(this.findBody(n), context);
-            graph.addEdge(current, tryName, flow_graph_1.FLOW_EDGE_TYPE.undefined);
-            graph.addGraph(tryName, body, flow_graph_1.FLOW_EDGE_TYPE.undefined);
-            graph.addEdge(body.getEnd(), graph.getEnd(), flow_graph_1.FLOW_EDGE_TYPE.undefined);
-            for (const c of n.findDirectStructures(Structures.Catch)) {
-                const catchName = StatementFlow.buildName(c.getFirstStatement());
-                const catchBody = this.traverseBody(this.findBody(c), context);
-                // TODO: this does not take exceptions into account
-                graph.addEdge(body.getEnd(), catchName, flow_graph_1.FLOW_EDGE_TYPE.undefined);
-                graph.addGraph(catchName, catchBody, flow_graph_1.FLOW_EDGE_TYPE.undefined);
-                graph.addEdge(catchBody.getEnd(), graph.getEnd(), flow_graph_1.FLOW_EDGE_TYPE.undefined);
-            }
-            // TODO, handle CLEANUP
-        }
-        else if (type instanceof Structures.CatchSystemExceptions) {
-            // TODO: this is not completely correct
-            const catchName = StatementFlow.buildName(n.getFirstStatement());
-            const body = this.traverseBody(this.findBody(n), context);
-            graph.addEdge(current, catchName, flow_graph_1.FLOW_EDGE_TYPE.undefined);
-            graph.addGraph(catchName, body, flow_graph_1.FLOW_EDGE_TYPE.undefined);
-            graph.addEdge(body.getEnd(), graph.getEnd(), flow_graph_1.FLOW_EDGE_TYPE.undefined);
-        }
-        else if (type instanceof Structures.Case) {
-            const caseName = StatementFlow.buildName(n.getFirstStatement());
-            graph.addEdge(current, caseName, flow_graph_1.FLOW_EDGE_TYPE.undefined);
-            let othersFound = false;
-            for (const w of n.findDirectStructures(Structures.When)) {
-                const first = w.getFirstStatement();
-                if (first === undefined) {
-                    continue;
-                }
-                if (first.get() instanceof Statements.WhenOthers) {
-                    othersFound = true;
-                }
-                const firstName = StatementFlow.buildName(first);
-                const sub = this.traverseBody(this.findBody(w), context);
-                graph.addEdge(caseName, firstName, flow_graph_1.FLOW_EDGE_TYPE.undefined);
-                graph.addGraph(firstName, sub, flow_graph_1.FLOW_EDGE_TYPE.undefined);
-                graph.addEdge(sub.getEnd(), graph.getEnd(), flow_graph_1.FLOW_EDGE_TYPE.undefined);
-            }
-            if (othersFound === false) {
-                graph.addEdge(caseName, graph.getEnd(), flow_graph_1.FLOW_EDGE_TYPE.undefined);
-            }
-        }
-        else if (type instanceof Structures.CaseType) {
-            const caseName = StatementFlow.buildName(n.getFirstStatement());
-            graph.addEdge(current, caseName, flow_graph_1.FLOW_EDGE_TYPE.undefined);
-            let othersFound = false;
-            for (const w of n.findDirectStructures(Structures.WhenType)) {
-                const first = w.getFirstStatement();
-                if (first === undefined) {
-                    continue;
-                }
-                if (first.get() instanceof Statements.WhenOthers) {
-                    othersFound = true;
-                }
-                const firstName = StatementFlow.buildName(first);
-                const sub = this.traverseBody(this.findBody(w), context);
-                graph.addEdge(caseName, firstName, flow_graph_1.FLOW_EDGE_TYPE.undefined);
-                graph.addGraph(firstName, sub, flow_graph_1.FLOW_EDGE_TYPE.undefined);
-                graph.addEdge(sub.getEnd(), graph.getEnd(), flow_graph_1.FLOW_EDGE_TYPE.undefined);
-            }
-            if (othersFound === false) {
-                graph.addEdge(caseName, graph.getEnd(), flow_graph_1.FLOW_EDGE_TYPE.undefined);
-            }
-        }
-        else if (type instanceof Structures.Define
-            || type instanceof Structures.TestInjection) {
-            // do nothing
-        }
-        else {
-            console.dir("StatementFlow,todo, " + n.get().constructor.name);
-        }
-        return graph;
-    }
-}
-exports.StatementFlow = StatementFlow;
-//# sourceMappingURL=statement_flow.js.map