@abaplint/core 2.97.7 → 2.97.8

package/build/abaplint.d.ts

@@ -111,6 +111,7 @@ export declare abstract class AbstractType {
 declare type AbstractTypeData = {
     qualifiedName?: string;
     conversionExit?: string;
+    derivedFromConstant?: boolean;
     ddicName?: string;
 };
 
@@ -379,6 +380,7 @@ declare class Back implements IStatement {
 declare namespace BasicTypes {
     export {
         AnyType,
+        CGenericType,
         CharacterType,
         CLikeType,
         CSequenceType,
@@ -784,6 +786,14 @@ declare class CDSWithParameters extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class CGenericType extends AbstractType {
+    toText(): string;
+    isGeneric(): boolean;
+    toABAP(): string;
+    containsVoid(): boolean;
+    toCDS(): string;
+}
+
 declare class ChangeDocument extends AbstractObject {
     getType(): string;
     getAllowedNaming(): {

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

@@ -17,7 +17,8 @@ class Message {
         const mwith = (0, combi_1.seq)("WITH", s, (0, combi_1.opt)(sourc));
         const foo = (0, combi_1.seq)(expressions_1.MessageSource, (0, combi_1.opt)(options), (0, combi_1.opt)(mwith));
         const text = (0, combi_1.seq)(s, type, (0, combi_1.optPrio)(like), (0, combi_1.optPrio)(raising));
-        const ret = (0, combi_1.seq)("MESSAGE", (0, combi_1.altPrio)(foo, text));
+        const cloud = (0, combi_1.seq)(expressions_1.MessageSource, (0, combi_1.opt)((0, combi_1.seq)("WITH", expressions_1.Source, (0, combi_1.opt)(expressions_1.Source), (0, combi_1.opt)(expressions_1.Source), (0, combi_1.opt)(expressions_1.Source))), into);
+        const ret = (0, combi_1.seq)("MESSAGE", (0, combi_1.altPrio)((0, combi_1.verNot)(version_1.Version.Cloud, foo), (0, combi_1.verNot)(version_1.Version.Cloud, text), (0, combi_1.ver)(version_1.Version.Cloud, cloud)));
         return ret;
     }
 }

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

@@ -147,7 +147,7 @@ class BuiltIn {
         ret.push(this.buildConstant("col_normal", new basic_1.IntegerType(), "2"));
         ret.push(this.buildConstant("col_positive", new basic_1.IntegerType(), "5"));
         ret.push(this.buildConstant("col_total", new basic_1.IntegerType(), "3"));
-        ret.push(this.buildConstant("space", new basic_1.CharacterType(1), "' '"));
+        ret.push(this.buildConstant("space", new basic_1.CharacterType(1, { derivedFromConstant: true }), "' '"));
         for (const e of extras) {
             const id = new tokens_1.Identifier(new position_1.Position(this.row++, 1), e);
             ret.push(new _typed_identifier_1.TypedIdentifier(id, BuiltIn.filename, new basic_1.VoidType(e), ["read_only" /* IdentifierMeta.ReadOnly */, "built-in" /* IdentifierMeta.BuiltIn */], "'?'"));

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypeUtils = void 0;
 const types_1 = require("../types");
 const basic_1 = require("../types/basic");
+const cgeneric_type_1 = require("../types/basic/cgeneric_type");
 class TypeUtils {
     constructor(scope) {
         this.scope = scope;
@@ -23,6 +24,7 @@ class TypeUtils {
             || type instanceof basic_1.AnyType
             || type instanceof basic_1.CharacterType
             || type instanceof basic_1.SimpleType
+            || type instanceof cgeneric_type_1.CGenericType
             || type instanceof basic_1.CLikeType
             || type instanceof basic_1.DateType
             || type instanceof basic_1.CSequenceType
@@ -51,6 +53,7 @@ class TypeUtils {
             return true;
         }
         else if (type instanceof basic_1.StringType
+            || type instanceof basic_1.CharacterType
             || type instanceof basic_1.VoidType
             || type instanceof basic_1.AnyType
             || type instanceof basic_1.UnknownType
@@ -64,11 +67,11 @@ class TypeUtils {
             || type instanceof basic_1.DecFloat34Type
             || type instanceof basic_1.NumericGenericType
             || type instanceof basic_1.CSequenceType
+            || type instanceof cgeneric_type_1.CGenericType
             || type instanceof basic_1.DateType
             || type instanceof basic_1.CLikeType
             || type instanceof basic_1.PackedType
-            || type instanceof basic_1.TimeType
-            || type instanceof basic_1.CharacterType) {
+            || type instanceof basic_1.TimeType) {
             return true;
         }
         return false;
@@ -187,6 +190,16 @@ class TypeUtils {
         // todo
         return true;
     }
+    isAssignableStrict(source, target) {
+        var _a;
+        if (source instanceof basic_1.CharacterType && target instanceof basic_1.CharacterType) {
+            if (((_a = source.getAbstractTypeData()) === null || _a === void 0 ? void 0 : _a.derivedFromConstant) === true) {
+                return source.getLength() <= target.getLength();
+            }
+            return source.getLength() === target.getLength();
+        }
+        return this.isAssignable(source, target);
+    }
     isAssignable(source, target) {
         /*
             console.dir(source);

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

@@ -13,7 +13,7 @@ class Constant {
             if (len <= 0) {
                 len = 1;
             }
-            return new basic_1.CharacterType(len);
+            return new basic_1.CharacterType(len, { derivedFromConstant: true });
         }
         else {
             return new basic_1.StringType({ qualifiedName: "STRING" });

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

@@ -15,6 +15,7 @@ class MethodCallBody {
         if (param) {
             new method_call_param_1.MethodCallParam().runSyntax(param, scope, method, filename);
         }
+        // for PARAMETER-TABLE and EXCEPTION-TABLE
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename);
         }

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

@@ -55,7 +55,7 @@ class MethodCallParam {
             if (sourceType === undefined) {
                 throw new Error("No source type determined, method source");
             }
-            else if (new _type_utils_1.TypeUtils(scope).isAssignable(sourceType, targetType) === false) {
+            else if (new _type_utils_1.TypeUtils(scope).isAssignableStrict(sourceType, targetType) === false) {
                 throw new Error("Method parameter type not compatible");
             }
         }

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

@@ -6,6 +6,7 @@ const basic_1 = require("../../types/basic");
 const basic_types_1 = require("../basic_types");
 const Expressions = require("../../2_statements/expressions");
 const default_1 = require("./default");
+const cgeneric_type_1 = require("../../types/basic/cgeneric_type");
 class MethodParam {
     runSyntax(node, scope, filename, meta) {
         const name = node.findDirectExpression(Expressions.MethodParamName);
@@ -25,6 +26,10 @@ class MethodParam {
                 return new _typed_identifier_1.TypedIdentifier(name.getFirstToken(), filename, new basic_1.UnknownType(e.toString()), meta);
             }
         }
+        const concat = type.concatTokens().toUpperCase();
+        if (concat === "TYPE C" || concat.startsWith("TYPE C ")) {
+            return new _typed_identifier_1.TypedIdentifier(name.getFirstToken(), filename, new cgeneric_type_1.CGenericType(), meta);
+        }
         const found = new basic_types_1.BasicTypes(filename, scope).parseType(type);
         if (found) {
             return new _typed_identifier_1.TypedIdentifier(name.getFirstToken(), filename, found, meta);

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

@@ -129,7 +129,7 @@ class MethodParameters {
             if (parameter === undefined) {
                 throw new Error("Method importing parameter \"" + item.name + "\" does not exist");
             }
-            else if (new _type_utils_1.TypeUtils(scope).isAssignable(item.sourceType, parameter.getType()) === false) {
+            else if (new _type_utils_1.TypeUtils(scope).isAssignableStrict(item.sourceType, parameter.getType()) === false) {
                 throw new Error("Method parameter type not compatible, " + item.name);
             }
             this.requiredParameters.delete(item.name);

package/build/src/abap/types/basic/cgeneric_type.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CGenericType = void 0;
+const _abstract_type_1 = require("./_abstract_type");
+class CGenericType extends _abstract_type_1.AbstractType {
+    toText() {
+        return "```c```";
+    }
+    isGeneric() {
+        return true;
+    }
+    toABAP() {
+        throw new Error("c, generic");
+    }
+    containsVoid() {
+        return false;
+    }
+    toCDS() {
+        return "abap.TODO_CGENERIC";
+    }
+}
+exports.CGenericType = CGenericType;
+//# sourceMappingURL=cgeneric_type.js.map

package/build/src/abap/types/basic/index.js

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./any_type"), exports);
+__exportStar(require("./cgeneric_type"), exports);
 __exportStar(require("./character_type"), exports);
 __exportStar(require("./clike_type"), exports);
 __exportStar(require("./csequence_type"), exports);

package/build/src/registry.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.97.7",
+    "version": "2.97.8",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -60,7 +60,7 @@
         "typescript": "^5.0.4"
     },
     "dependencies": {
-        "fast-xml-parser": "^4.1.4",
+        "fast-xml-parser": "^4.2.0",
         "json5": "^2.2.3",
         "vscode-languageserver-types": "^3.17.3"
     }