@abaplint/cli 2.120.15 → 2.120.17

package/build/cli.js

@@ -4766,7 +4766,7 @@ class FieldChain extends combi_1.Expression {
     getRunnable() {
         const attr = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.InstanceArrow), _1.AttributeName);
         const comp = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.Dash), (0, combi_1.optPrio)(_1.ComponentName));
-        const chain = (0, combi_1.star)((0, combi_1.altPrio)(_1.Dereference, (0, _dynamic_access_1.dynAttr)(), attr, (0, _dynamic_access_1.dynComp)((0, combi_1.optPrio)(_1.FieldOffset), (0, combi_1.optPrio)(_1.FieldLength)), comp, _1.TableExpression));
+        const chain = (0, combi_1.star)((0, combi_1.altPrio)(_1.Dereference, (0, _dynamic_access_1.dynAttr)(), attr, (0, _dynamic_access_1.dynComp)((0, combi_1.optPrio)(_1.FieldOffset), (0, combi_1.optPrio)(_1.FieldLength)), comp, (0, combi_1.tok)(tokens_1.AssociationName), _1.TableExpression));
         const clas = (0, combi_1.seq)(_1.ClassName, (0, combi_1.tok)(tokens_1.StaticArrow), _1.AttributeName);
         const start = (0, combi_1.altPrio)(clas, _1.SourceField, _1.SourceFieldSymbol);
         const after = (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.DashW), (0, combi_1.seq)((0, combi_1.optPrio)(_1.TableBody), (0, combi_1.optPrio)(_1.FieldOffset), (0, combi_1.optPrio)(_1.FieldLength)));
@@ -10486,7 +10486,7 @@ class TableExpression extends combi_1.Expression {
         const fields = (0, combi_1.plus)((0, combi_1.seq)((0, combi_1.altPrio)(_1.ComponentChainSimple, _1.Dynamic), "=", _1.Source));
         const key = (0, combi_1.seq)("KEY", _1.SimpleName);
         const index = (0, combi_1.seq)("INDEX", _1.Source);
-        const ret = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.BracketLeftW), (0, combi_1.alt)(_1.Source, (0, combi_1.seq)((0, combi_1.optPrio)(key), (0, combi_1.opt)("COMPONENTS"), (0, combi_1.altPrio)(fields, index))), (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WBracketRight), (0, combi_1.tok)(tokens_1.WBracketRightW)));
+        const ret = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.BracketLeftW), (0, combi_1.alt)((0, combi_1.seq)(_1.Source, fields), _1.Source, (0, combi_1.seq)((0, combi_1.optPrio)(key), (0, combi_1.opt)("COMPONENTS"), (0, combi_1.altPrio)(fields, index))), (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WBracketRight), (0, combi_1.tok)(tokens_1.WBracketRightW)));
         return (0, combi_1.ver)(version_1.Release.v740sp02, ret, { also: combi_1.AlsoIn.OpenABAP });
     }
 }
@@ -25402,7 +25402,7 @@ BuiltIn.methods = {
         counter: BuiltIn.counter++,
         mandatory: {
             "val": basic_1.CLikeType.get(),
-            "format": basic_1.CLikeType.get(),
+            "format": basic_1.SimpleType.get(),
         },
         return: basic_1.StringType.get(),
         release: version_1.Release.v702,
@@ -25594,17 +25594,17 @@ BuiltIn.methods = {
     "NMAX": {
         counter: BuiltIn.counter++,
         mandatory: {
-            "val1": basic_1.CLikeType.get(),
-            "val2": basic_1.CLikeType.get(),
+            "val1": basic_1.SimpleType.get(),
+            "val2": basic_1.SimpleType.get(),
         },
         optional: {
-            "val3": basic_1.CLikeType.get(),
-            "val4": basic_1.CLikeType.get(),
-            "val5": basic_1.CLikeType.get(),
-            "val6": basic_1.CLikeType.get(),
-            "val7": basic_1.CLikeType.get(),
-            "val8": basic_1.CLikeType.get(),
-            "val9": basic_1.CLikeType.get(),
+            "val3": basic_1.SimpleType.get(),
+            "val4": basic_1.SimpleType.get(),
+            "val5": basic_1.SimpleType.get(),
+            "val6": basic_1.SimpleType.get(),
+            "val7": basic_1.SimpleType.get(),
+            "val8": basic_1.SimpleType.get(),
+            "val9": basic_1.SimpleType.get(),
         },
         return: basic_1.IntegerType.get(),
         release: version_1.Release.v702,
@@ -25612,17 +25612,17 @@ BuiltIn.methods = {
     "NMIN": {
         counter: BuiltIn.counter++,
         mandatory: {
-            "val1": basic_1.CLikeType.get(),
-            "val2": basic_1.CLikeType.get(),
+            "val1": basic_1.SimpleType.get(),
+            "val2": basic_1.SimpleType.get(),
         },
         optional: {
-            "val3": basic_1.CLikeType.get(),
-            "val4": basic_1.CLikeType.get(),
-            "val5": basic_1.CLikeType.get(),
-            "val6": basic_1.CLikeType.get(),
-            "val7": basic_1.CLikeType.get(),
-            "val8": basic_1.CLikeType.get(),
-            "val9": basic_1.CLikeType.get(),
+            "val3": basic_1.SimpleType.get(),
+            "val4": basic_1.SimpleType.get(),
+            "val5": basic_1.SimpleType.get(),
+            "val6": basic_1.SimpleType.get(),
+            "val7": basic_1.SimpleType.get(),
+            "val8": basic_1.SimpleType.get(),
+            "val9": basic_1.SimpleType.get(),
         },
         return: basic_1.IntegerType.get(),
         release: version_1.Release.v702,
@@ -25638,7 +25638,7 @@ BuiltIn.methods = {
         counter: BuiltIn.counter++,
         mandatory: {
             "val": basic_1.CLikeType.get(),
-            "occ": basic_1.CLikeType.get(),
+            "occ": basic_1.SimpleType.get(),
         },
         return: basic_1.StringType.get(),
         release: version_1.Release.v702,
@@ -27365,6 +27365,7 @@ class TypeUtils {
             || type instanceof basic_1.NumericType
             || type instanceof basic_1.DateType
             || type instanceof basic_1.TimeType
+            || type instanceof cgeneric_type_1.CGenericType
             || type instanceof basic_1.CLikeType
             || type instanceof basic_1.AnyType
             || type instanceof basic_1.UnknownType
@@ -27622,6 +27623,9 @@ class TypeUtils {
         if (calculated) {
             return this.isAssignable(source, target);
         }
+        if (target instanceof basic_1.CLikeType) {
+            return this.isCharLikeStrict(source);
+        }
         if (target instanceof basic_1.PGenericType) {
             return source instanceof basic_1.PackedType
                 || source instanceof basic_1.PGenericType
@@ -41537,9 +41541,13 @@ class InsertInternal {
             && node.findDirectTokenByText("LINES") === undefined) {
             targetType = targetType.getRowType();
         }
-        let source = node.findDirectExpression(Expressions.SimpleSource4);
-        if (source === undefined) {
-            source = node.findDirectExpression(Expressions.Source);
+        const initial = node.findDirectTokenByText("INITIAL") !== undefined;
+        let source;
+        if (initial === false) {
+            source = node.findDirectExpression(Expressions.SimpleSource4);
+            if (source === undefined) {
+                source = node.findDirectExpression(Expressions.Source);
+            }
         }
         const sourceType = source ? source_1.Source.runSyntax(source, input, targetType) : targetType;
         if (targetType === undefined
@@ -41561,7 +41569,7 @@ class InsertInternal {
                 fstarget_1.FSTarget.runSyntax(afterAssigning, input, sourceType);
             }
         }
-        if (node.findDirectTokenByText("INITIAL") === undefined) {
+        if (initial === false) {
             let error = false;
             if (sourceType instanceof basic_1.IntegerType && targetType instanceof basic_1.Integer8Type) {
                 error = true;
@@ -46714,6 +46722,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ClassData = void 0;
 const Expressions = __importStar(__webpack_require__(/*! ../../2_statements/expressions */ "../core/build/src/abap/2_statements/expressions/index.js"));
 const Statements = __importStar(__webpack_require__(/*! ../../2_statements/statements */ "../core/build/src/abap/2_statements/statements/index.js"));
+const Structures = __importStar(__webpack_require__(/*! ../../3_structures/structures */ "../core/build/src/abap/3_structures/structures/index.js"));
 const nodes_1 = __webpack_require__(/*! ../../nodes */ "../core/build/src/abap/nodes/index.js");
 const _typed_identifier_1 = __webpack_require__(/*! ../../types/_typed_identifier */ "../core/build/src/abap/types/_typed_identifier.js");
 const Basic = __importStar(__webpack_require__(/*! ../../types/basic */ "../core/build/src/abap/types/basic/index.js"));
@@ -46732,7 +46741,14 @@ class ClassData {
                     values[found.getName()] = found.getValue();
                 }
             }
-            // todo, nested structures and INCLUDES
+            else if (c instanceof nodes_1.StructureNode && ctyp instanceof Structures.ClassData) {
+                const found = new ClassData().runSyntax(c, input);
+                if (found) {
+                    components.push({ name: found.getName(), type: found.getType() });
+                    values[found.getName()] = found.getValue();
+                }
+            }
+            // todo, INCLUDES
         }
         return new _typed_identifier_1.TypedIdentifier(name, input.filename, new Basic.StructureType(components), ["static" /* IdentifierMeta.Static */], values);
     }
@@ -50571,6 +50587,12 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.SimpleType = void 0;
 const _abstract_type_1 = __webpack_require__(/*! ./_abstract_type */ "../core/build/src/abap/types/basic/_abstract_type.js");
 class SimpleType extends _abstract_type_1.AbstractType {
+    static get() {
+        return this.singleton;
+    }
+    constructor() {
+        super();
+    }
     toText() {
         return "```simple```";
     }
@@ -50588,6 +50610,7 @@ class SimpleType extends _abstract_type_1.AbstractType {
     }
 }
 exports.SimpleType = SimpleType;
+SimpleType.singleton = new SimpleType();
 //# sourceMappingURL=simple_type.js.map
 
 /***/ },
@@ -55417,7 +55440,7 @@ class DDIC {
             case "ANY":
                 return Types.AnyType.get({ qualifiedName: qualifiedName });
             case "SIMPLE":
-                return new Types.SimpleType({ qualifiedName: qualifiedName });
+                return Types.SimpleType.get();
             case "%_C_POINTER":
                 return new Types.HexType(8, qualifiedName);
             case "TABLE":
@@ -69437,7 +69460,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.120.15";
+        return "2.120.17";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.120.15",
+    "version": "2.120.17",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -39,7 +39,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.120.15",
+        "@abaplint/core": "^2.120.17",
         "@types/chai": "^4.3.20",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",