@abaplint/core 2.93.63 → 2.93.65

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

@@ -3,11 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Include = void 0;
 const combi_1 = require("../combi");
 const expressions_1 = require("../expressions");
-const version_1 = require("../../../version");
 class Include {
     getMatcher() {
         const ret = (0, combi_1.seq)("INCLUDE", expressions_1.IncludeName, (0, combi_1.opt)("IF FOUND"));
-        return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
+        return ret;
     }
 }
 exports.Include = Include;

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

@@ -509,9 +509,14 @@ class BasicTypes {
             className = split[0];
             rest = split[1];
         }
+        else if (chainText.includes("->")) {
+            const split = chainText.split("->");
+            className = split[0];
+            rest = split[1];
+        }
         const subs = rest.split("-");
         let foundType = undefined;
-        if (className) {
+        if (className && chainText.includes("=>")) {
             const split = chainText.split("=>");
             const className = split[0];
             // the prefix might be itself
@@ -545,11 +550,11 @@ class BasicTypes {
                 this.scope.addReference(expr.getTokens()[2], byName, _reference_1.ReferenceType.TypeReference, this.filename);
             }
         }
-        else if (chainText.includes("->")) {
-            const [varName, typeName] = chainText.split("->");
-            const varVar = this.scope.findVariable(varName);
+        else if (className && chainText.includes("->")) {
+            const varVar = this.scope.findVariable(className);
             const foo = varVar === null || varVar === void 0 ? void 0 : varVar.getType();
             if (foo instanceof basic_1.ObjectReferenceType) {
+                const typeName = subs[0];
                 const id = foo.getIdentifier();
                 const type = id instanceof types_1.ClassDefinition ? "CLAS" : "INTF";
                 this.scope.addReference(expr.getFirstToken(), id, _reference_1.ReferenceType.ObjectOrientedReference, this.filename, { ooType: type, ooName: id.getName() });
@@ -562,10 +567,6 @@ class BasicTypes {
                     this.scope.addReference(expr.getTokens()[2], byName, _reference_1.ReferenceType.TypeReference, this.filename);
                 }
             }
-            // todo, ugh, hmm
-            while (subs.length > 0) {
-                subs.shift();
-            }
         }
         else {
             const found = this.scope.findType(subs[0]);

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

@@ -24,6 +24,10 @@ class ClassImplementation {
         if (sup) {
             scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(new tokens_1.Identifier(new position_1.Position(1, 1), "super"), _builtin_1.BuiltIn.filename, new basic_1.ObjectReferenceType(sup)));
         }
+        else {
+            // todo: instead of the void type, do proper typing, ie. only empty constructor method
+            scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(new tokens_1.Identifier(new position_1.Position(1, 1), "super"), _builtin_1.BuiltIn.filename, new basic_1.VoidType("noSuper")));
+        }
         scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(new tokens_1.Identifier(new position_1.Position(1, 1), "me"), _builtin_1.BuiltIn.filename, new basic_1.ObjectReferenceType(classDefinition)));
         helper.addAliasedAttributes(classDefinition); // todo, this is not correct, take care of instance vs static
         const classAttributes = classDefinition.getAttributes();

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

@@ -10,6 +10,7 @@ const method_def_returning_1 = require("../5_syntax/expressions/method_def_retur
 const method_param_1 = require("../5_syntax/expressions/method_param");
 const _object_oriented_1 = require("../5_syntax/_object_oriented");
 const _reference_1 = require("../5_syntax/_reference");
+const identifier_1 = require("../1_lexer/tokens/identifier");
 // todo:
 // this.exceptions = [];
 // also consider RAISING vs EXCEPTIONS
@@ -147,9 +148,19 @@ class MethodParameters {
             }
         }
         // RAP parameters, temporary fix
-        const rapName = node.findExpressionAfterToken("IMPORTING");
+        let rapName = node.findExpressionAfterToken("IMPORTING");
         if (rapName) {
-            this.importing.push(new _typed_identifier_1.TypedIdentifier(rapName.getFirstToken(), filename, new basic_1.VoidType("RapMethodParameter"), ["importing" /* IdentifierMeta.MethodImporting */]));
+            const token = rapName.getFirstToken();
+            this.importing.push(new _typed_identifier_1.TypedIdentifier(token, filename, new basic_1.VoidType("RapMethodParameter"), ["importing" /* IdentifierMeta.MethodImporting */]));
+            if (node.concatTokens().toUpperCase().includes(" FOR VALIDATE ON SAVE")) {
+                this.exporting.push(new _typed_identifier_1.TypedIdentifier(new identifier_1.Identifier(token.getStart(), "failed"), filename, new basic_1.VoidType("RapMethodParameter"), ["exporting" /* IdentifierMeta.MethodExporting */]));
+                this.exporting.push(new _typed_identifier_1.TypedIdentifier(new identifier_1.Identifier(token.getStart(), "reported"), filename, new basic_1.VoidType("RapMethodParameter"), ["exporting" /* IdentifierMeta.MethodExporting */]));
+            }
+        }
+        rapName = node.findExpressionAfterToken("RESULT");
+        if (rapName) {
+            const token = rapName.getFirstToken();
+            this.importing.push(new _typed_identifier_1.TypedIdentifier(token, filename, new basic_1.VoidType("RapMethodParameter"), ["exporting" /* IdentifierMeta.MethodExporting */]));
         }
         const exporting = node.findFirstExpression(Expressions.MethodDefExporting);
         if (exporting) {

package/build/src/cds/expressions/cds_annotation_object.js

@@ -6,9 +6,9 @@ const combi_1 = require("../../abap/2_statements/combi");
 const cds_annotation_simple_1 = require("./cds_annotation_simple");
 class CDSAnnotationObject extends combi_1.Expression {
     getRunnable() {
-        const value = (0, combi_1.alt)(CDSAnnotationObject, _1.CDSAnnotationArray, cds_annotation_simple_1.CDSAnnotationSimple);
+        const value = (0, combi_1.seq)(":", (0, combi_1.alt)(CDSAnnotationObject, _1.CDSAnnotationArray, cds_annotation_simple_1.CDSAnnotationSimple));
         const namedot = (0, combi_1.seq)(_1.CDSName, (0, combi_1.star)((0, combi_1.seq)(".", _1.CDSName)));
-        const valueNested = (0, combi_1.seq)("{", namedot, ":", value, (0, combi_1.star)((0, combi_1.seq)(",", namedot, ":", value)), "}");
+        const valueNested = (0, combi_1.seq)("{", namedot, (0, combi_1.opt)(value), (0, combi_1.star)((0, combi_1.seq)(",", namedot, (0, combi_1.opt)(value))), "}");
         return valueNested;
     }
 }

package/build/src/cds/expressions/cds_type.js

@@ -5,7 +5,8 @@ const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSType extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", _1.CDSName)), (0, combi_1.opt)((0, combi_1.seq)("(", (0, combi_1.regex)(/\d+/), ")")));
+        const decimals = (0, combi_1.seq)(",", (0, combi_1.regex)(/\d+/));
+        return (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", _1.CDSName)), (0, combi_1.opt)((0, combi_1.seq)("(", (0, combi_1.regex)(/\d+/), (0, combi_1.opt)(decimals), ")")));
     }
 }
 exports.CDSType = CDSType;

package/build/src/registry.js

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

package/package.json

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