@abaplint/core 2.85.0 → 2.85.4

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

@@ -319,7 +319,12 @@ class Lexer {
                 && ahead !== "`") {
                 // end of ping
                 this.add();
-                this.m = Mode.Normal;
+                if (ahead === `"`) {
+                    this.m = Mode.Comment;
+                }
+                else {
+                    this.m = Mode.Normal;
+                }
             }
             else if (this.m === Mode.Template
                 && buf.length > 1

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

@@ -5,7 +5,7 @@ const combi_1 = require("../combi");
 const _1 = require(".");
 class FormParam extends combi_1.Expression {
     getRunnable() {
-        const stru = (0, combi_1.seq)("STRUCTURE", _1.NamespaceSimpleName);
+        const stru = (0, combi_1.seq)("STRUCTURE", _1.SimpleFieldChain);
         const ret = (0, combi_1.seq)((0, combi_1.altPrio)(_1.PassByValue, _1.FormParamName), (0, combi_1.optPrio)((0, combi_1.altPrio)(_1.FormParamType, stru)));
         return ret;
     }

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

@@ -4,7 +4,7 @@ exports.SQLAliasField = void 0;
 const combi_1 = require("../combi");
 class SQLAliasField extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.regex)(/^\w+~\w+$/);
+        return (0, combi_1.regex)(/^(\/\w+\/)?\w+~\w+$/);
     }
 }
 exports.SQLAliasField = SQLAliasField;

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

@@ -10,7 +10,7 @@ class SQLSource extends combi_1.Expression {
         const paren = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.ParenLeftW), _1.Source, (0, combi_1.tok)(tokens_1.WParenRightW));
         // todo, this Source must be a simple field?
         const at = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), (0, combi_1.altPrio)(_1.Source, paren)));
-        return (0, combi_1.altPrio)(_1.SQLAliasField, _1.Source, at);
+        return (0, combi_1.alt)(_1.SQLAliasField, _1.Source, at);
     }
 }
 exports.SQLSource = SQLSource;

package/build/src/abap/5_syntax/_object_oriented.js

@@ -195,13 +195,14 @@ class ObjectOriented {
         if (def === undefined || name === undefined) {
             return undefined;
         }
+        const upper = name.toUpperCase();
         for (const a of def.getAttributes().getConstants()) {
-            if (a.getName().toUpperCase() === name.toUpperCase()) {
+            if (a.getName().toUpperCase() === upper) {
                 return a;
             }
         }
         for (const a of def.getAliases().getAll()) {
-            if (a.getName().toUpperCase() === name.toUpperCase()) {
+            if (a.getName().toUpperCase() === upper) {
                 const comp = a.getComponent();
                 const res = this.searchConstantName(this.scope.findObjectDefinition(comp.split("~")[0]), comp.split("~")[1]);
                 if (res) {
@@ -209,6 +210,12 @@ class ObjectOriented {
                 }
             }
         }
+        if (name.includes("~")) {
+            const interfaceName = upper.split("~")[0];
+            if (def.getImplementing().some((a) => a.name.toUpperCase() === interfaceName)) {
+                return this.searchConstantName(this.scope.findInterfaceDefinition(interfaceName), name.split("~")[1]);
+            }
+        }
         const sup = def.getSuperClass();
         if (sup) {
             return this.searchConstantName(this.findSuperDefinition(sup), name);

package/build/src/abap/5_syntax/basic_types.js

@@ -65,6 +65,9 @@ class BasicTypes {
         if (chain === undefined) {
             chain = node.findFirstExpression(Expressions.FieldSub);
         }
+        if (chain === undefined) {
+            chain = node.findFirstExpression(Expressions.SimpleFieldChain);
+        }
         if (chain === undefined) {
             throw new Error("resolveLikeName, chain undefined");
         }

package/build/src/abap/5_syntax/expressions/form_param.js

@@ -11,7 +11,7 @@ class FormParam {
         const nameToken = (_a = node.findFirstExpression(expressions_1.FormParamName)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
         if (node.findDirectTokenByText("STRUCTURE") && nameToken) {
             // STRUCTURES typing
-            const typeName = (_b = node.findDirectExpression(expressions_1.NamespaceSimpleName)) === null || _b === void 0 ? void 0 : _b.getFirstToken().getStr();
+            const typeName = (_b = node.findDirectExpression(expressions_1.SimpleFieldChain)) === null || _b === void 0 ? void 0 : _b.getFirstToken().getStr();
             let type = undefined;
             if (typeName) {
                 type = (_c = scope.findType(typeName)) === null || _c === void 0 ? void 0 : _c.getType();

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

@@ -35,11 +35,11 @@ class ClassDefinition extends _identifier_1.Identifier {
         helper.addAliasedTypes(this.aliases);
         this.attributes = new class_attributes_1.Attributes(this.node, this.filename, scope);
         this.types = this.attributes.getTypes();
-        this.methodDefs = new method_definitions_1.MethodDefinitions(this.node, this.filename, scope);
         const events = this.node.findAllStatements(Statements.Events);
         for (const e of events) {
             this.events.push(new event_definition_1.EventDefinition(e, visibility_1.Visibility.Public, this.filename, scope)); // todo, all these are not Public
         }
+        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();
         this.testing = concat.includes(" FOR TESTING");

package/build/src/objects/table.js

@@ -93,10 +93,8 @@ class Table extends _abstract_object_1.AbstractObject {
                     if (field.GROUPNAME !== undefined) {
                         components.push({ name: field.GROUPNAME, type: found });
                     }
-                    else {
-                        for (const c of found.getComponents()) {
-                            components.push({ name: c.name, type: c.type });
-                        }
+                    for (const c of found.getComponents()) {
+                        components.push({ name: c.name, type: c.type });
                     }
                 }
                 else if ((((_a = field.PRECFIELD) === null || _a === void 0 ? void 0 : _a.startsWith("CI_")) || ((_b = field.PRECFIELD) === null || _b === void 0 ? void 0 : _b.startsWith("SI_")))

package/build/src/registry.js

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

package/package.json

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