@abaplint/core 2.99.1 → 2.99.3

package/build/abaplint.d.ts

@@ -817,7 +817,11 @@ declare class ChapterOfBookStructure extends AbstractObject {
 declare class CharacterType extends AbstractType {
     private readonly length;
     constructor(length: number, extra?: AbstractTypeData);
-    cloneType(qualifiedName?: string, ddicName?: string): CharacterType;
+    cloneType(input: {
+        qualifiedName?: string;
+        ddicName?: string;
+        derivedFromConstant?: boolean;
+    }): CharacterType;
     getLength(): number;
     toText(): string;
     toABAP(): string;

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

@@ -239,6 +239,9 @@ class CurrentScope {
             return undefined;
         }
         const typePoolName = name.split("_")[0];
+        if (typePoolName.length !== 4) {
+            return undefined;
+        }
         const typePool = this.reg.getObject("TYPE", typePoolName);
         if (typePool === undefined) {
             return undefined;
@@ -253,6 +256,11 @@ class CurrentScope {
             return undefined;
         }
         const typePoolName = name.split("_")[0];
+        if (typePoolName.length !== 4 || new ddic_1.DDIC(this.reg).lookupNoVoid(name) !== undefined) {
+            // this is tricky, it should not do recursion when parsing the type pool itself,
+            // think about DTEL ABAP_ENCOD vs TYPE ABAP
+            return undefined;
+        }
         const typePool = this.reg.getObject("TYPE", typePoolName);
         if (typePool === undefined) {
             return undefined;

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

@@ -208,7 +208,7 @@ class TypeUtils {
         return false;
     }
     isAssignableStrict(source, target) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         /*
             console.dir(source);
             console.dir(target);
@@ -227,6 +227,20 @@ class TypeUtils {
                 return false;
             }
         }
+        else if (source instanceof basic_1.HexType) {
+            if (target instanceof basic_1.HexType) {
+                if (((_c = source.getAbstractTypeData()) === null || _c === void 0 ? void 0 : _c.derivedFromConstant) === true) {
+                    return source.getLength() <= target.getLength();
+                }
+                return source.getLength() === target.getLength();
+            }
+            else if (target instanceof basic_1.IntegerType) {
+                if (((_d = source.getAbstractTypeData()) === null || _d === void 0 ? void 0 : _d.derivedFromConstant) === true) {
+                    return true;
+                }
+                return false;
+            }
+        }
         else if (source instanceof basic_1.StringType && target instanceof basic_1.StructureType) {
             if (this.structureContainsString(target)) {
                 return false;

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

@@ -190,7 +190,7 @@ class BasicTypes {
         if (type instanceof basic_1.CharacterType
             && qualifiedName
             && qualifiedName.includes("-") === false) {
-            type = type.cloneType(qualifiedName);
+            type = type.cloneType({ qualifiedName });
         }
         return type;
     }

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

@@ -94,10 +94,26 @@ class FieldChain {
                 context = new attribute_name_1.AttributeName().runSyntax(context, current, scope, filename, refType);
             }
             else if (current.get() instanceof Expressions.FieldOffset && current instanceof nodes_1.ExpressionNode) {
-                new field_offset_1.FieldOffset().runSyntax(current, scope, filename);
+                const offset = new field_offset_1.FieldOffset().runSyntax(current, scope, filename);
+                if (offset) {
+                    if (context instanceof basic_1.CharacterType) {
+                        context = new basic_1.CharacterType(context.getLength() - offset);
+                    }
+                    else if (context instanceof basic_1.HexType) {
+                        context = new basic_1.HexType(context.getLength() - offset);
+                    }
+                }
             }
             else if (current.get() instanceof Expressions.FieldLength && current instanceof nodes_1.ExpressionNode) {
-                new field_length_1.FieldLength().runSyntax(current, scope, filename);
+                const length = new field_length_1.FieldLength().runSyntax(current, scope, filename);
+                if (length) {
+                    if (context instanceof basic_1.CharacterType) {
+                        context = new basic_1.CharacterType(length);
+                    }
+                    else if (context instanceof basic_1.HexType) {
+                        context = new basic_1.HexType(length);
+                    }
+                }
             }
         }
         return context;

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

@@ -9,6 +9,15 @@ class FieldLength {
         const field = node.findDirectExpression(Expressions.SimpleFieldChain2);
         if (field) {
             new field_chain_1.FieldChain().runSyntax(field, scope, filename, _reference_1.ReferenceType.DataReadReference);
+            return undefined;
+        }
+        else {
+            const children = node.getChildren();
+            const num = children[children.length - 2];
+            if (num.getLastToken().getStr() === "*") {
+                return undefined;
+            }
+            return parseInt(num.getLastToken().getStr(), 10);
         }
     }
 }

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

@@ -9,6 +9,10 @@ class FieldOffset {
         const field = node.findDirectExpression(Expressions.SimpleFieldChain2);
         if (field) {
             new field_chain_1.FieldChain().runSyntax(field, scope, filename, _reference_1.ReferenceType.DataReadReference);
+            return undefined;
+        }
+        else {
+            return parseInt(node.getLastToken().getStr(), 10);
         }
     }
 }

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

@@ -10,13 +10,16 @@ class CharacterType extends _abstract_type_1.AbstractType {
         }
         this.length = length;
     }
-    cloneType(qualifiedName, ddicName) {
+    cloneType(input) {
         const clone = Object.assign({}, this.getAbstractTypeData()) || {};
-        if (qualifiedName) {
-            clone.qualifiedName = qualifiedName;
+        if (input.qualifiedName) {
+            clone.qualifiedName = input.qualifiedName;
         }
-        if (ddicName) {
-            clone.ddicName = ddicName;
+        if (input.ddicName) {
+            clone.ddicName = input.ddicName;
+        }
+        if (input.derivedFromConstant) {
+            clone.derivedFromConstant = input.derivedFromConstant;
         }
         return new CharacterType(this.length, clone);
     }

package/build/src/registry.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.99.1",
+    "version": "2.99.3",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -47,10 +47,10 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.34.5",
-        "@types/chai": "^4.3.4",
+        "@microsoft/api-extractor": "^7.34.7",
+        "@types/chai": "^4.3.5",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^18.16.2",
+        "@types/node": "^18.16.3",
         "chai": "^4.3.7",
         "eslint": "^8.39.0",
         "mocha": "^10.2.0",