@abaplint/cli 2.103.3 → 2.103.4

package/build/cli.js

@@ -4730,7 +4730,7 @@ class DataDefinition extends combi_1.Expression {
     getRunnable() {
         const simple = (0, combi_1.opt)((0, combi_1.per)("READ-ONLY", Expressions.Type, Expressions.Length, Expressions.Decimals, Expressions.Value));
         const table = (0, combi_1.seq)(Expressions.TypeTable, (0, combi_1.optPrio)("READ-ONLY"));
-        return (0, combi_1.seq)(Expressions.DefinitionName, (0, combi_1.optPrio)(Expressions.ConstantFieldLength), (0, combi_1.alt)(simple, table, Expressions.TypeHierarchy));
+        return (0, combi_1.seq)(Expressions.DefinitionName, (0, combi_1.optPrio)(Expressions.ConstantFieldLength), (0, combi_1.alt)(simple, table, Expressions.TypeStructure));
     }
 }
 exports.DataDefinition = DataDefinition;
@@ -5859,7 +5859,7 @@ __exportStar(__webpack_require__(/*! ./string_template_formatting */ "./node_mod
 __exportStar(__webpack_require__(/*! ./string_template_source */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/string_template_source.js"), exports);
 __exportStar(__webpack_require__(/*! ./string_template */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/string_template.js"), exports);
 __exportStar(__webpack_require__(/*! ./super_class_name */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/super_class_name.js"), exports);
-__exportStar(__webpack_require__(/*! ./type_hierarchy */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/type_hierarchy.js"), exports);
+__exportStar(__webpack_require__(/*! ./type_structure */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/type_structure.js"), exports);
 __exportStar(__webpack_require__(/*! ./switch_body */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/switch_body.js"), exports);
 __exportStar(__webpack_require__(/*! ./table_body */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/table_body.js"), exports);
 __exportStar(__webpack_require__(/*! ./table_expression */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/table_expression.js"), exports);
@@ -9068,30 +9068,6 @@ exports.Type = Type;
 
 /***/ }),
 
-/***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/type_hierarchy.js":
-/*!***********************************************************************************************!*\
-  !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/type_hierarchy.js ***!
-  \***********************************************************************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.TypeHierarchy = void 0;
-const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
-const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
-class TypeHierarchy extends combi_1.Expression {
-    getRunnable() {
-        // todo, add version,
-        const hier = (0, combi_1.seq)("TYPE STRUCTURE FOR HIERARCHY", _1.NamespaceSimpleName);
-        return hier;
-    }
-}
-exports.TypeHierarchy = TypeHierarchy;
-//# sourceMappingURL=type_hierarchy.js.map
-
-/***/ }),
-
 /***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/type_name.js":
 /*!******************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/type_name.js ***!
@@ -9167,6 +9143,31 @@ exports.TypeParam = TypeParam;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/type_structure.js":
+/*!***********************************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/type_structure.js ***!
+  \***********************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.TypeStructure = void 0;
+const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
+class TypeStructure extends combi_1.Expression {
+    getRunnable() {
+        // todo, add version,
+        const hier = (0, combi_1.seq)("HIERARCHY", _1.NamespaceSimpleName);
+        const evt = (0, combi_1.seq)("EVENT", _1.EventName);
+        return (0, combi_1.seq)("TYPE STRUCTURE FOR", (0, combi_1.altPrio)(hier, evt));
+    }
+}
+exports.TypeStructure = TypeStructure;
+//# sourceMappingURL=type_structure.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/type_table.js":
 /*!*******************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/type_table.js ***!
@@ -17225,7 +17226,7 @@ const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@a
 class Type {
     getMatcher() {
         const simple = (0, combi_1.per)(Expressions.Type, Expressions.Decimals, Expressions.Length);
-        const def = (0, combi_1.seq)(Expressions.NamespaceSimpleName, (0, combi_1.opt)(Expressions.ConstantFieldLength), (0, combi_1.opt)((0, combi_1.alt)(simple, Expressions.TypeTable, Expressions.TypeHierarchy)));
+        const def = (0, combi_1.seq)(Expressions.NamespaceSimpleName, (0, combi_1.opt)(Expressions.ConstantFieldLength), (0, combi_1.opt)((0, combi_1.alt)(simple, Expressions.TypeTable, Expressions.TypeStructure)));
         // todo, BOXED is only allowed with structures inside structures?
         const boxed = (0, combi_1.ver)(version_1.Version.v702, "BOXED");
         const ret = (0, combi_1.seq)("TYPES", def, (0, combi_1.opt)(boxed));
@@ -24316,6 +24317,11 @@ class DataDefinition {
         if (valueNode) {
             value = new basic_types_1.BasicTypes(filename, scope).findValue(node);
         }
+        const name = node.findFirstExpression(Expressions.DefinitionName);
+        const typeStructure = node.findFirstExpression(Expressions.TypeStructure);
+        if (typeStructure && name) {
+            return new _typed_identifier_1.TypedIdentifier(name.getFirstToken(), filename, new basic_1.VoidType("DataDefinition, TypeStructure"));
+        }
         const bfound = new basic_types_1.BasicTypes(filename, scope).simpleType(node);
         if (bfound) {
             if (value) {
@@ -24325,8 +24331,8 @@ class DataDefinition {
                 return bfound;
             }
         }
-        const name = node.findFirstExpression(Expressions.DefinitionName);
         if (name) {
+            console.dir("undef");
             return new _typed_identifier_1.TypedIdentifier(name.getFirstToken(), filename, new basic_1.UnknownType("DataDefinition, fallback"));
         }
         return undefined;
@@ -50880,7 +50886,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.103.2";
+        return "2.103.4";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.103.3",
+    "version": "2.103.4",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,7 +38,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.103.2",
+        "@abaplint/core": "^2.103.4",
         "@types/chai": "^4.3.9",
         "@types/glob": "^7.2.0",
         "@types/minimist": "^1.2.5",