@abaplint/core 2.93.96 → 2.93.97

package/build/abaplint.d.ts

@@ -1812,6 +1812,10 @@ declare class EventHandler extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class EventName extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class Events implements IStatement {
     getMatcher(): IStatementRunnable;
 }
@@ -1927,6 +1931,7 @@ declare namespace Expressions {
         Dynamic,
         EntityAssociation,
         EventHandler,
+        EventName,
         ExceptionName,
         FieldAll,
         FieldAssignment,

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

@@ -5,7 +5,7 @@ const combi_1 = require("../combi");
 const _1 = require(".");
 class EventHandler extends combi_1.Expression {
     getRunnable() {
-        const event = (0, combi_1.seq)("FOR EVENT", _1.Field, "OF", _1.ClassName, (0, combi_1.optPrio)((0, combi_1.seq)("IMPORTING", (0, combi_1.plusPrio)(_1.MethodParamName))));
+        const event = (0, combi_1.seq)("FOR EVENT", _1.EventName, "OF", _1.ClassName, (0, combi_1.optPrio)((0, combi_1.seq)("IMPORTING", (0, combi_1.plusPrio)(_1.MethodParamName))));
         return event;
     }
 }

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

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EventName = void 0;
+const combi_1 = require("../combi");
+class EventName extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.regex)(/^[&_!]?\*?\w*(\/\w+\/)?\d*[a-zA-Z_%\$][\w\*%\$\?#]*(~\w+)?$/);
+    }
+}
+exports.EventName = EventName;
+//# sourceMappingURL=event_name.js.map

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

@@ -64,6 +64,7 @@ __exportStar(require("./dynamic"), exports);
 __exportStar(require("./entity_association"), exports);
 __exportStar(require("./entity_association"), exports);
 __exportStar(require("./event_handler"), exports);
+__exportStar(require("./event_name"), exports);
 __exportStar(require("./exception_name"), exports);
 __exportStar(require("./field_all"), exports);
 __exportStar(require("./field_assignment"), exports);

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

@@ -6,7 +6,7 @@ const _1 = require(".");
 class SQLJoin extends combi_1.Expression {
     getRunnable() {
         const joinType = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.altPrio)("INNER", "LEFT OUTER", "LEFT")), "JOIN");
-        const join = (0, combi_1.seq)(joinType, _1.SQLFromSource, "ON", (0, combi_1.plusPrio)(_1.SQLCond));
+        const join = (0, combi_1.seq)(joinType, _1.SQLFromSource, "ON", _1.SQLCond);
         return join;
     }
 }

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

@@ -6,7 +6,7 @@ const expressions_1 = require("../expressions");
 class Events {
     getMatcher() {
         const exporting = (0, combi_1.seq)("EXPORTING", (0, combi_1.plus)(expressions_1.MethodParamOptional));
-        return (0, combi_1.seq)((0, combi_1.alt)("CLASS-EVENTS", "EVENTS"), expressions_1.Field, (0, combi_1.opt)(exporting));
+        return (0, combi_1.seq)((0, combi_1.alt)("CLASS-EVENTS", "EVENTS"), expressions_1.EventName, (0, combi_1.opt)(exporting));
     }
 }
 exports.Events = Events;

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

@@ -6,7 +6,7 @@ const expressions_1 = require("../expressions");
 class RaiseEvent {
     getMatcher() {
         const exporting = (0, combi_1.seq)("EXPORTING", expressions_1.ParameterListS);
-        return (0, combi_1.seq)("RAISE EVENT", expressions_1.Field, (0, combi_1.opt)(exporting));
+        return (0, combi_1.seq)("RAISE EVENT", expressions_1.EventName, (0, combi_1.opt)(exporting));
     }
 }
 exports.RaiseEvent = RaiseEvent;

package/build/src/abap/5_syntax/statements/raise_event.js

@@ -7,7 +7,7 @@ const _reference_1 = require("../_reference");
 class RaiseEvent {
     runSyntax(node, scope, filename) {
         // todo: only possible in classes
-        const f = node.findDirectExpression(Expressions.Field);
+        const f = node.findDirectExpression(Expressions.EventName);
         if (f === null || f === void 0 ? void 0 : f.concatTokens().includes("~")) {
             const name = f.concatTokens().split("~")[0];
             const idef = scope.findInterfaceDefinition(name);

package/build/src/abap/types/event_definition.js

@@ -11,7 +11,7 @@ class EventDefinition extends _identifier_1.Identifier {
         if (!(node.get() instanceof events_1.Events)) {
             throw new Error("MethodDefinition, expected MethodDef as part of input node");
         }
-        const found = node.findFirstExpression(Expressions.Field);
+        const found = node.findFirstExpression(Expressions.EventName);
         if (found === undefined) {
             throw new Error("MethodDefinition, expected MethodDef as part of input node");
         }

package/build/src/abap/types/method_parameters.js

@@ -113,7 +113,7 @@ class MethodParameters {
             else if (doVoid && ooName) {
                 scope.addReference(nameToken, undefined, _reference_1.ReferenceType.ObjectOrientedVoidReference, this.filename, { ooName: ooName.toUpperCase() });
             }
-            const eventName = (_b = node.findFirstExpression(Expressions.Field)) === null || _b === void 0 ? void 0 : _b.getFirstToken().getStr();
+            const eventName = (_b = node.findFirstExpression(Expressions.EventName)) === null || _b === void 0 ? void 0 : _b.getFirstToken().getStr();
             const event = new _object_oriented_1.ObjectOriented(scope).searchEvent(def, eventName);
             for (const p of handler.findAllExpressions(Expressions.MethodParamName)) {
                 const token = p.getFirstToken();

package/build/src/registry.js

@@ -63,7 +63,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.93.96";
+        return "2.93.97";
     }
     getDDICReferences() {
         return this.references;

package/package.json

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