@abaplint/core 2.93.96 → 2.93.98

package/adhoc/lexer_performance.ts

@@ -8,7 +8,7 @@ const file = new MemoryFile("abapgit.abap", fs.readFileSync("./lexer_performance
 let total = 0;
 for (let i = 0; i < 10; i++) {
   const before = Date.now();
-  const result = Lexer.run(file);
+  const result = new Lexer().run(file);
   const runtime = Date.now() - before;
   console.log("Runtime: " + runtime + "ms");
   total += runtime;

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,
@@ -5597,9 +5602,6 @@ declare class Stop implements IStatement {
     getMatcher(): IStatementRunnable;
 }
 
-declare class String_2 extends Token {
-}
-
 declare class StringTemplate extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -5624,6 +5626,9 @@ declare class StringTemplateSource extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class StringToken extends Token {
+}
+
 declare class StringType extends AbstractType {
     toText(): string;
     isGeneric(): boolean;
@@ -6012,7 +6017,7 @@ declare namespace Tokens {
         WStaticArrow,
         StaticArrowW,
         WStaticArrowW,
-        String_2 as String,
+        StringToken,
         StringTemplate_2 as StringTemplate,
         StringTemplateBegin,
         StringTemplateEnd,

package/build/adhoc/lexer_performance.js

@@ -8,7 +8,7 @@ const file = new src_1.MemoryFile("abapgit.abap", fs.readFileSync("./lexer_perfo
 let total = 0;
 for (let i = 0; i < 10; i++) {
     const before = Date.now();
-    const result = lexer_1.Lexer.run(file);
+    const result = new lexer_1.Lexer().run(file);
     const runtime = Date.now() - before;
     console.log("Runtime: " + runtime + "ms");
     total += runtime;

package/build/src/abap/1_lexer/lexer.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Lexer = void 0;
-const Tokens = require("./tokens");
 const position_1 = require("../../position");
+const tokens_1 = require("./tokens");
 var Mode;
 (function (Mode) {
     Mode[Mode["Normal"] = 0] = "Normal";
@@ -25,6 +25,15 @@ class Buffer {
     clear() {
         this.buf = "";
     }
+    countIsEven(char) {
+        let count = 0;
+        for (let i = 0; i < this.buf.length; i += 1) {
+            if (this.buf.charAt(i) === char) {
+                count += 1;
+            }
+        }
+        return count % 2 === 0;
+    }
 }
 class Stream {
     constructor(raw) {
@@ -77,14 +86,14 @@ class Stream {
     }
 }
 class Lexer {
-    static run(file, virtual) {
+    run(file, virtual) {
         this.virtual = virtual;
         this.tokens = [];
         this.m = Mode.Normal;
         this.process(file.getRaw());
         return { file, tokens: this.tokens };
     }
-    static add() {
+    add() {
         const s = this.buffer.get().trim();
         if (s.length > 0) {
             const col = this.stream.getCol();
@@ -105,174 +114,174 @@ class Lexer {
             }
             let tok = undefined;
             if (this.m === Mode.Comment) {
-                tok = new Tokens.Comment(pos, s);
+                tok = new tokens_1.Comment(pos, s);
             }
             else if (this.m === Mode.Ping || this.m === Mode.Str) {
-                tok = new Tokens.String(pos, s);
+                tok = new tokens_1.StringToken(pos, s);
             }
             else if (this.m === Mode.Template) {
                 const first = s.charAt(0);
                 const last = s.charAt(s.length - 1);
                 if (first === "|" && last === "|") {
-                    tok = new Tokens.StringTemplate(pos, s);
+                    tok = new tokens_1.StringTemplate(pos, s);
                 }
                 else if (first === "|" && last === "{" && whiteAfter === true) {
-                    tok = new Tokens.StringTemplateBegin(pos, s);
+                    tok = new tokens_1.StringTemplateBegin(pos, s);
                 }
                 else if (first === "}" && last === "|" && whiteBefore === true) {
-                    tok = new Tokens.StringTemplateEnd(pos, s);
+                    tok = new tokens_1.StringTemplateEnd(pos, s);
                 }
                 else if (first === "}" && last === "{" && whiteAfter === true && whiteBefore === true) {
-                    tok = new Tokens.StringTemplateMiddle(pos, s);
+                    tok = new tokens_1.StringTemplateMiddle(pos, s);
                 }
                 else {
-                    tok = new Tokens.Identifier(pos, s);
+                    tok = new tokens_1.Identifier(pos, s);
                 }
             }
             else if (s.substr(0, 2) === "##") {
-                tok = new Tokens.Pragma(pos, s);
+                tok = new tokens_1.Pragma(pos, s);
             }
             else if (s.length === 1) {
                 if (s === "." || s === ",") {
-                    tok = new Tokens.Punctuation(pos, s);
+                    tok = new tokens_1.Punctuation(pos, s);
                 }
                 else if (s === "[") {
-                    if (whiteBefore && whiteAfter) {
-                        tok = new Tokens.WBracketLeftW(pos, s);
+                    if (whiteBefore === true && whiteAfter === true) {
+                        tok = new tokens_1.WBracketLeftW(pos, s);
                     }
-                    else if (whiteBefore) {
-                        tok = new Tokens.WBracketLeft(pos, s);
+                    else if (whiteBefore === true) {
+                        tok = new tokens_1.WBracketLeft(pos, s);
                     }
-                    else if (whiteAfter) {
-                        tok = new Tokens.BracketLeftW(pos, s);
+                    else if (whiteAfter === true) {
+                        tok = new tokens_1.BracketLeftW(pos, s);
                     }
                     else {
-                        tok = new Tokens.BracketLeft(pos, s);
+                        tok = new tokens_1.BracketLeft(pos, s);
                     }
                 }
                 else if (s === "(") {
-                    if (whiteBefore && whiteAfter) {
-                        tok = new Tokens.WParenLeftW(pos, s);
+                    if (whiteBefore === true && whiteAfter === true) {
+                        tok = new tokens_1.WParenLeftW(pos, s);
                     }
-                    else if (whiteBefore) {
-                        tok = new Tokens.WParenLeft(pos, s);
+                    else if (whiteBefore === true) {
+                        tok = new tokens_1.WParenLeft(pos, s);
                     }
-                    else if (whiteAfter) {
-                        tok = new Tokens.ParenLeftW(pos, s);
+                    else if (whiteAfter === true) {
+                        tok = new tokens_1.ParenLeftW(pos, s);
                     }
                     else {
-                        tok = new Tokens.ParenLeft(pos, s);
+                        tok = new tokens_1.ParenLeft(pos, s);
                     }
                 }
                 else if (s === "]") {
-                    if (whiteBefore && whiteAfter) {
-                        tok = new Tokens.WBracketRightW(pos, s);
+                    if (whiteBefore === true && whiteAfter === true) {
+                        tok = new tokens_1.WBracketRightW(pos, s);
                     }
-                    else if (whiteBefore) {
-                        tok = new Tokens.WBracketRight(pos, s);
+                    else if (whiteBefore === true) {
+                        tok = new tokens_1.WBracketRight(pos, s);
                     }
-                    else if (whiteAfter) {
-                        tok = new Tokens.BracketRightW(pos, s);
+                    else if (whiteAfter === true) {
+                        tok = new tokens_1.BracketRightW(pos, s);
                     }
                     else {
-                        tok = new Tokens.BracketRight(pos, s);
+                        tok = new tokens_1.BracketRight(pos, s);
                     }
                 }
                 else if (s === ")") {
-                    if (whiteBefore && whiteAfter) {
-                        tok = new Tokens.WParenRightW(pos, s);
+                    if (whiteBefore === true && whiteAfter === true) {
+                        tok = new tokens_1.WParenRightW(pos, s);
                     }
-                    else if (whiteBefore) {
-                        tok = new Tokens.WParenRight(pos, s);
+                    else if (whiteBefore === true) {
+                        tok = new tokens_1.WParenRight(pos, s);
                     }
-                    else if (whiteAfter) {
-                        tok = new Tokens.ParenRightW(pos, s);
+                    else if (whiteAfter === true) {
+                        tok = new tokens_1.ParenRightW(pos, s);
                     }
                     else {
-                        tok = new Tokens.ParenRight(pos, s);
+                        tok = new tokens_1.ParenRight(pos, s);
                     }
                 }
                 else if (s === "-") {
-                    if (whiteBefore && whiteAfter) {
-                        tok = new Tokens.WDashW(pos, s);
+                    if (whiteBefore === true && whiteAfter === true) {
+                        tok = new tokens_1.WDashW(pos, s);
                     }
-                    else if (whiteBefore) {
-                        tok = new Tokens.WDash(pos, s);
+                    else if (whiteBefore === true) {
+                        tok = new tokens_1.WDash(pos, s);
                     }
-                    else if (whiteAfter) {
-                        tok = new Tokens.DashW(pos, s);
+                    else if (whiteAfter === true) {
+                        tok = new tokens_1.DashW(pos, s);
                     }
                     else {
-                        tok = new Tokens.Dash(pos, s);
+                        tok = new tokens_1.Dash(pos, s);
                     }
                 }
                 else if (s === "+") {
-                    if (whiteBefore && whiteAfter) {
-                        tok = new Tokens.WPlusW(pos, s);
+                    if (whiteBefore === true && whiteAfter === true) {
+                        tok = new tokens_1.WPlusW(pos, s);
                     }
-                    else if (whiteBefore) {
-                        tok = new Tokens.WPlus(pos, s);
+                    else if (whiteBefore === true) {
+                        tok = new tokens_1.WPlus(pos, s);
                     }
-                    else if (whiteAfter) {
-                        tok = new Tokens.PlusW(pos, s);
+                    else if (whiteAfter === true) {
+                        tok = new tokens_1.PlusW(pos, s);
                     }
                     else {
-                        tok = new Tokens.Plus(pos, s);
+                        tok = new tokens_1.Plus(pos, s);
                     }
                 }
                 else if (s === "@") {
-                    if (whiteBefore && whiteAfter) {
-                        tok = new Tokens.WAtW(pos, s);
+                    if (whiteBefore === true && whiteAfter === true) {
+                        tok = new tokens_1.WAtW(pos, s);
                     }
-                    else if (whiteBefore) {
-                        tok = new Tokens.WAt(pos, s);
+                    else if (whiteBefore === true) {
+                        tok = new tokens_1.WAt(pos, s);
                     }
-                    else if (whiteAfter) {
-                        tok = new Tokens.AtW(pos, s);
+                    else if (whiteAfter === true) {
+                        tok = new tokens_1.AtW(pos, s);
                     }
                     else {
-                        tok = new Tokens.At(pos, s);
+                        tok = new tokens_1.At(pos, s);
                     }
                 }
             }
             else if (s.length === 2) {
                 if (s === "->") {
-                    if (whiteBefore && whiteAfter) {
-                        tok = new Tokens.WInstanceArrowW(pos, s);
+                    if (whiteBefore === true && whiteAfter === true) {
+                        tok = new tokens_1.WInstanceArrowW(pos, s);
                     }
-                    else if (whiteBefore) {
-                        tok = new Tokens.WInstanceArrow(pos, s);
+                    else if (whiteBefore === true) {
+                        tok = new tokens_1.WInstanceArrow(pos, s);
                     }
-                    else if (whiteAfter) {
-                        tok = new Tokens.InstanceArrowW(pos, s);
+                    else if (whiteAfter === true) {
+                        tok = new tokens_1.InstanceArrowW(pos, s);
                     }
                     else {
-                        tok = new Tokens.InstanceArrow(pos, s);
+                        tok = new tokens_1.InstanceArrow(pos, s);
                     }
                 }
                 else if (s === "=>") {
-                    if (whiteBefore && whiteAfter) {
-                        tok = new Tokens.WStaticArrowW(pos, s);
+                    if (whiteBefore === true && whiteAfter === true) {
+                        tok = new tokens_1.WStaticArrowW(pos, s);
                     }
-                    else if (whiteBefore) {
-                        tok = new Tokens.WStaticArrow(pos, s);
+                    else if (whiteBefore === true) {
+                        tok = new tokens_1.WStaticArrow(pos, s);
                     }
-                    else if (whiteAfter) {
-                        tok = new Tokens.StaticArrowW(pos, s);
+                    else if (whiteAfter === true) {
+                        tok = new tokens_1.StaticArrowW(pos, s);
                     }
                     else {
-                        tok = new Tokens.StaticArrow(pos, s);
+                        tok = new tokens_1.StaticArrow(pos, s);
                     }
                 }
             }
             if (tok === undefined) {
-                tok = new Tokens.Identifier(pos, s);
+                tok = new tokens_1.Identifier(pos, s);
             }
             this.tokens.push(tok);
         }
         this.buffer.clear();
     }
-    static process(raw) {
+    process(raw) {
         this.stream = new Stream(raw.replace(/\r/g, ""));
         this.buffer = new Buffer();
         for (;;) {
@@ -318,8 +327,8 @@ class Lexer {
                 && buf.length > 1
                 && current === "`"
                 && aahead !== "``"
-                && (buf.split("`").length - 1) % 2 === 0
-                && ahead !== "`") {
+                && ahead !== "`"
+                && this.buffer.countIsEven("`")) {
                 // end of ping
                 this.add();
                 if (ahead === `"`) {
@@ -341,8 +350,8 @@ class Lexer {
                 && current === "'"
                 && buf.length > 1
                 && aahead !== "''"
-                && (buf.split("'").length - 1) % 2 === 0
-                && ahead !== "'") {
+                && ahead !== "'"
+                && this.buffer.countIsEven("'")) {
                 // end of string
                 this.add();
                 if (ahead === "\"") {

package/build/src/abap/1_lexer/tokens/string.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StringTemplateMiddle = exports.StringTemplateEnd = exports.StringTemplateBegin = exports.StringTemplate = exports.String = void 0;
+exports.StringTemplateMiddle = exports.StringTemplateEnd = exports.StringTemplateBegin = exports.StringTemplate = exports.StringToken = void 0;
 const _token_1 = require("./_token");
-class String extends _token_1.Token {
+class StringToken extends _token_1.Token {
 }
-exports.String = String;
+exports.StringToken = StringToken;
 class StringTemplate extends _token_1.Token {
 }
 exports.StringTemplate = StringTemplate;

package/build/src/abap/2_statements/expand_macros.js

@@ -133,7 +133,7 @@ class ExpandMacros {
             i++;
         }
         const file = new memory_file_1.MemoryFile("expand_macros.abap.prog", str);
-        const lexerResult = lexer_1.Lexer.run(file, statement.getFirstToken().getStart());
+        const lexerResult = new lexer_1.Lexer().run(file, statement.getFirstToken().getStart());
         const result = new statement_parser_1.StatementParser(this.version, this.reg).run([lexerResult], this.macros.listMacroNames());
         return result[0].statements;
     }

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_in.js

@@ -10,7 +10,7 @@ class SQLIn extends combi_1.Expression {
         const val = new _1.SQLSource();
         const short = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.At), _1.SimpleSource3);
         const listOld = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeft), (0, combi_1.alt)((0, combi_1.ver)(version_1.Version.v740sp05, short), val), (0, combi_1.starPrio)((0, combi_1.seq)(",", val)), (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.ParenRight), (0, combi_1.tok)(tokens_1.ParenRightW), (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const listNew = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), val, (0, combi_1.starPrio)((0, combi_1.seq)(",", val)), (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WParenRight), (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const listNew = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), val, (0, combi_1.starPrio)((0, combi_1.seq)(",", (0, combi_1.altPrio)(short, val))), (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WParenRight), (0, combi_1.tok)(tokens_1.WParenRightW)));
         const list = (0, combi_1.alt)(listOld, (0, combi_1.ver)(version_1.Version.v740sp02, listNew)); // version is a guess, https://github.com/abaplint/abaplint/issues/2530
         const subSelect = (0, combi_1.seq)("(", _1.Select, ")");
         const inn = (0, combi_1.seq)("IN", (0, combi_1.altPrio)(_1.SQLSource, list, subSelect));

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/4_file_information/abap_file_information.js

@@ -133,7 +133,8 @@ class ABAPFileInformation {
             constants.push(...this.parseConstants(found.findFirstStructure(Structures.PrivateSection), visibility_1.Visibility.Private));
             const superClassName = (_a = found.findFirstExpression(Expressions.SuperClassName)) === null || _a === void 0 ? void 0 : _a.getFirstToken().getStr();
             const containsGlobal = found.findFirstExpression(Expressions.ClassGlobal);
-            const concat = found.findFirstStatement(Statements.ClassDefinition).concatTokens().toUpperCase();
+            const cdef = found.findFirstStatement(Statements.ClassDefinition);
+            const concat = (cdef === null || cdef === void 0 ? void 0 : cdef.concatTokens().toUpperCase()) || "";
             this.classes.push({
                 name: className.getStr(),
                 identifier: new _identifier_1.Identifier(className, this.filename),
@@ -143,7 +144,7 @@ class ABAPFileInformation {
                 superClassName,
                 interfaces: this.getImplementing(found),
                 isForTesting: concat.includes(" FOR TESTING"),
-                isAbstract: concat.includes(" ABSTRACT"),
+                isAbstract: (cdef === null || cdef === void 0 ? void 0 : cdef.findDirectTokenByText("ABSTRACT")) !== undefined,
                 isSharedMemory: concat.includes(" SHARED MEMORY ENABLED"),
                 isFinal: found.findFirstExpression(Expressions.ClassFinal) !== undefined,
                 aliases,

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/abap_parser.js

@@ -20,7 +20,7 @@ class ABAPParser {
         const start = Date.now();
         // 1: lexing
         const b1 = Date.now();
-        const lexerResult = files.map(f => lexer_1.Lexer.run(f));
+        const lexerResult = files.map(f => new lexer_1.Lexer().run(f));
         const lexingRuntime = Date.now() - b1;
         // 2: statements
         const b2 = Date.now();

package/build/src/abap/nodes/expression_node.js

@@ -51,7 +51,7 @@ class ExpressionNode extends _abstract_node_1.AbstractNode {
         let prev;
         for (const token of this.getTokens()) {
             if (token instanceof tokens_1.Comment
-                || token instanceof tokens_1.String
+                || token instanceof tokens_1.StringToken
                 || token instanceof tokens_1.StringTemplate
                 || token instanceof tokens_1.StringTemplateBegin
                 || token instanceof tokens_1.StringTemplateMiddle

package/build/src/abap/nodes/statement_node.js

@@ -90,7 +90,7 @@ class StatementNode extends _abstract_node_1.AbstractNode {
         let prev;
         for (const token of this.getTokens()) {
             if (token instanceof comment_1.Comment
-                || token instanceof string_1.String
+                || token instanceof string_1.StringToken
                 || token instanceof string_1.StringTemplate
                 || token instanceof string_1.StringTemplateBegin
                 || token instanceof string_1.StringTemplateMiddle
@@ -226,7 +226,7 @@ class StatementNode extends _abstract_node_1.AbstractNode {
         let prev;
         for (const token of this.getTokens()) {
             if (token instanceof comment_1.Comment
-                || token instanceof string_1.String
+                || token instanceof string_1.StringToken
                 || token instanceof string_1.StringTemplate
                 || token instanceof string_1.StringTemplateBegin
                 || token instanceof string_1.StringTemplateMiddle

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

@@ -41,10 +41,11 @@ class ClassDefinition extends _identifier_1.Identifier {
         }
         this.methodDefs = new method_definitions_1.MethodDefinitions(this.node, this.filename, scope);
         scope.pop(node.getLastToken().getEnd());
-        const concat = this.node.findFirstStatement(Statements.ClassDefinition).concatTokens().toUpperCase();
+        const cdef = this.node.findFirstStatement(Statements.ClassDefinition);
+        const concat = cdef.concatTokens().toUpperCase();
         this.testing = concat.includes(" FOR TESTING");
         this.sharedMemory = concat.includes(" SHARED MEMORY ENABLED");
-        this.abstract = concat.includes(" ABSTRACT");
+        this.abstract = (cdef === null || cdef === void 0 ? void 0 : cdef.findDirectTokenByText("ABSTRACT")) !== undefined;
     }
     getFriends() {
         return this.friends;

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/files/_abstract_file.js

@@ -9,9 +9,10 @@ class AbstractFile {
         return this.filename;
     }
     baseName() {
-        const base1 = this.getFilename().split("\\").reverse()[0];
-        const base2 = base1.split("/").reverse()[0];
-        return base2;
+        const first = this.getFilename().split("\\");
+        const base1 = first[first.length - 1];
+        const base2 = base1.split("/");
+        return base2[base2.length - 1];
     }
     getObjectType() {
         var _a;

package/build/src/lsp/hover.js

@@ -36,7 +36,7 @@ class Hover {
         if (lookup === null || lookup === void 0 ? void 0 : lookup.hover) {
             return { kind: LServer.MarkupKind.Markdown, value: lookup.hover };
         }
-        if (found.token instanceof Tokens.String) {
+        if (found.token instanceof Tokens.StringToken) {
             return { kind: LServer.MarkupKind.Markdown, value: "String" };
         }
         return undefined;

package/build/src/lsp/semantic.js

@@ -76,7 +76,7 @@ class SemanticHighlighting {
                     || statementInstance instanceof Statements.EndForm) {
                     tokenType = BLOCK_ABAP;
                 }
-                else if (tokenInstance instanceof tokens_1.String
+                else if (tokenInstance instanceof tokens_1.StringToken
                     || tokenInstance instanceof tokens_1.StringTemplate
                     || tokenInstance instanceof tokens_1.StringTemplateBegin
                     || tokenInstance instanceof tokens_1.StringTemplateEnd

package/build/src/position.js

@@ -39,7 +39,8 @@ class VirtualPosition extends Position {
         if (!(p instanceof VirtualPosition)) {
             return false;
         }
-        return super.equals(this.virtual) && this.vrow === p.vrow && this.vcol === p.vcol;
+        const bar = p; // widening cast for ABAP translation
+        return super.equals(this.virtual) && this.vrow === bar.vrow && this.vcol === bar.vcol;
     }
 }
 exports.VirtualPosition = VirtualPosition;

package/build/src/pretty_printer/fix_keyword_case.js

@@ -16,7 +16,7 @@ class FixCase {
         for (const child of statement.getChildren()) {
             if (child instanceof nodes_1.TokenNodeRegex) {
                 const token = child.get();
-                if (token instanceof Tokens.String) {
+                if (token instanceof Tokens.StringToken) {
                     continue;
                 }
                 this.replaceString(token.getStart(), this.formatNonKeyword(token.getStr()));

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.98";
     }
     getDDICReferences() {
         return this.references;

package/build/src/rules/if_in_if.js

@@ -18,16 +18,35 @@ class IfInIf extends _abap_rule_1.ABAPRule {
         return {
             key: "if_in_if",
             title: "IF in IF",
-            shortDescription: `Detects nested ifs which can be refactored to a single condition using AND.`,
-            extendedInformation: `https://docs.abapopenchecks.org/checks/01/
+            shortDescription: `Detects nested ifs which can be refactored.`,
+            extendedInformation: `
+Directly nested IFs without ELSE can be refactored to a single condition using AND.
+
+ELSE condtions with directly nested IF refactored to ELSEIF.
+
+https://docs.abapopenchecks.org/checks/01/
 https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#keep-the-nesting-depth-low`,
             badExample: `IF condition1.
   IF condition2.
     ...
   ENDIF.
+ENDIF.
+
+IF condition1.
+  ...
+ELSE.
+  IF condition2.
+    ...
+  ENDIF.
 ENDIF.`,
             goodExample: `IF ( condition1 ) AND ( condition2 ).
   ...
+ENDIF.
+
+IF condition1.
+  ...
+ELSEIF condition2.
+  ...
 ENDIF.`,
             tags: [_irule_1.RuleTag.Styleguide, _irule_1.RuleTag.SingleFile],
         };

package/build/src/rules/line_length.js

@@ -42,7 +42,7 @@ https://docs.abapopenchecks.org/checks/04/`,
         for (let rowIndex = 0; rowIndex < array.length; rowIndex++) {
             const row = array[rowIndex].replace("\r", "");
             if (row.length > maxLineLength) {
-                const message = `Maximum allowed line length of ${maxLineLength} exceeded, currently  ${row.length}`;
+                const message = `Maximum allowed line length of ${maxLineLength} exceeded, currently ${row.length}`;
                 issues.push(issue_1.Issue.atRow(file, rowIndex + 1, message, this.getMetadata().key, this.conf.severity));
             }
             else if (row.length > this.conf.length) {

package/package.json

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