@abaplint/cli 2.113.224 → 2.113.226

package/build/cli.js

@@ -6032,6 +6032,7 @@ __exportStar(__webpack_require__(/*! ./sql_arithmetic_operator */ "./node_module
 __exportStar(__webpack_require__(/*! ./sql_arithmetics */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_arithmetics.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_as_name */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_as_name.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_case */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_case.js"), exports);
+__exportStar(__webpack_require__(/*! ./sql_cast */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_cast.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_cds_parameters */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_cds_parameters.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_client */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_client.js"), exports);
 __exportStar(__webpack_require__(/*! ./sql_compare_operator */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_compare_operator.js"), exports);
@@ -8169,7 +8170,7 @@ class SQLCase extends combi_1.Expression {
         const abap = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), _1.SimpleFieldChain2);
         const field = (0, combi_1.altPrio)(_1.SQLAggregation, SQLCase, _1.SQLFunction, _1.SQLPath, sql_field_name_1.SQLFieldName, constant_1.Constant);
         const sub = (0, combi_1.seq)((0, combi_1.altPrio)("+", "-", "*", "/", "&&"), (0, combi_1.optPrio)((0, combi_1.tok)(tokens_1.WParenLeftW)), field, (0, combi_1.optPrio)((0, combi_1.tok)(tokens_1.WParenRightW)));
-        const sourc = (0, combi_1.altPrio)(SQLCase, _1.SQLAggregation, _1.SQLFunction, sql_source_1.SQLSource, constant_1.Constant);
+        const sourc = (0, combi_1.altPrio)(SQLCase, _1.SQLAggregation, _1.SQLFunction, sql_field_name_1.SQLFieldName, sql_source_1.SQLSource, constant_1.Constant);
         const val = (0, combi_1.altPrio)(sql_cond_1.SQLCond, constant_1.Constant, abap);
         const when = (0, combi_1.seq)("WHEN", val, "THEN", sourc, (0, combi_1.starPrio)(sub));
         const els = (0, combi_1.seq)("ELSE", sourc);
@@ -8181,6 +8182,33 @@ exports.SQLCase = SQLCase;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_cast.js":
+/*!*****************************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_cast.js ***!
+  \*****************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.SQLCast = void 0;
+const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
+const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
+const tokens_1 = __webpack_require__(/*! ../../1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
+const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+const sql_field_name_1 = __webpack_require__(/*! ./sql_field_name */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_field_name.js");
+class SQLCast extends combi_1.Expression {
+    getRunnable() {
+        const abap = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), _1.SimpleFieldChain2), version_1.Version.OpenABAP);
+        // todo: from version something
+        return (0, combi_1.seq)("CAST", "(", (0, combi_1.opt)((0, combi_1.altPrio)(sql_field_name_1.SQLFieldName, abap)), "AS", sql_field_name_1.SQLFieldName, ")");
+    }
+}
+exports.SQLCast = SQLCast;
+//# sourceMappingURL=sql_cast.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_cds_parameters.js":
 /*!***************************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/sql_cds_parameters.js ***!
@@ -8335,7 +8363,8 @@ class SQLField extends combi_1.Expression {
     getRunnable() {
         const abap = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), _1.SimpleFieldChain2), version_1.Version.OpenABAP);
         const as = (0, combi_1.seq)("AS", _1.SQLAsName);
-        const field = (0, combi_1.altPrio)(_1.SQLAggregation, _1.SQLCase, sql_function_1.SQLFunction, sql_path_1.SQLPath, _1.SQLFieldName, abap, _1.Constant);
+        const paren = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), _1.SQLFieldName, (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WParenRightW), (0, combi_1.tok)(tokens_1.WParenRight)));
+        const field = (0, combi_1.altPrio)(_1.SQLAggregation, _1.SQLCase, _1.SQLCast, sql_function_1.SQLFunction, sql_path_1.SQLPath, _1.SQLFieldName, abap, _1.Constant, paren);
         const sub = (0, combi_1.plusPrio)((0, combi_1.seq)((0, combi_1.altPrio)("+", "-", "*", "/", "&&"), (0, combi_1.optPrio)((0, combi_1.tok)(tokens_1.WParenLeftW)), field, (0, combi_1.optPrio)((0, combi_1.tok)(tokens_1.WParenRightW))));
         const arith = (0, combi_1.ver)(version_1.Version.v740sp05, sub);
         return (0, combi_1.seq)(field, (0, combi_1.optPrio)(arith), (0, combi_1.optPrio)(as));
@@ -8386,13 +8415,11 @@ exports.SQLFieldList = 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");
 const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
-const tokens_1 = __webpack_require__(/*! ../../1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
 class SQLFieldList extends combi_1.Expression {
     getRunnable() {
-        const paren = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), _1.SQLFieldName, (0, combi_1.tok)(tokens_1.WParenRightW));
         const nev = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.starPrio)((0, combi_1.seq)(",", _1.SQLField)), version_1.Version.OpenABAP);
         const old = (0, combi_1.starPrio)(_1.SQLField);
-        return (0, combi_1.altPrio)("*", _1.Dynamic, (0, combi_1.seq)(_1.SQLField, (0, combi_1.alt)(nev, old)), paren);
+        return (0, combi_1.altPrio)("*", _1.Dynamic, (0, combi_1.seq)(_1.SQLField, (0, combi_1.alt)(nev, old)));
     }
 }
 exports.SQLFieldList = SQLFieldList;
@@ -13325,7 +13352,10 @@ class Field {
         const module = (0, combi_1.seq)("MODULE", expressions_1.FormName, (0, combi_1.opt)((0, combi_1.alt)("ON INPUT", "ON REQUEST", "ON CHAIN-REQUEST")));
         const values = (0, combi_1.seq)("VALUES", (0, combi_1.tok)(tokens_1.WParenLeft), "BETWEEN", expressions_1.Constant, "AND", expressions_1.Constant, (0, combi_1.tok)(tokens_1.ParenRightW));
         const wit = (0, combi_1.seq)("WITH", expressions_1.FieldChain);
-        const ret = (0, combi_1.seq)("FIELD", expressions_1.FieldChain, (0, combi_1.opt)((0, combi_1.altPrio)(module, values, wit)));
+        const cond = (0, combi_1.seq)(expressions_1.FieldChain, "=", expressions_1.FieldChain);
+        const where = (0, combi_1.seq)(cond, (0, combi_1.starPrio)((0, combi_1.seq)("AND", cond)));
+        const select = (0, combi_1.seq)("SELECT * FROM", expressions_1.FieldChain, "WHERE", where, "INTO RESULT WHENEVER NOT FOUND SEND ERRORMESSAGE");
+        const ret = (0, combi_1.seq)("FIELD", expressions_1.FieldChain, (0, combi_1.opt)((0, combi_1.altPrio)(module, values, wit, select)));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }
@@ -24486,10 +24516,10 @@ class BasicTypes {
                 sub = node.findFirstExpression(Expressions.TypeParam);
             }
             if (sub === undefined) {
-                sub = node.findFirstExpression(Expressions.FieldChain);
+                sub = node.findFirstExpression(Expressions.TypeName);
             }
             if (sub === undefined) {
-                sub = node.findFirstExpression(Expressions.TypeName);
+                sub = node.findFirstExpression(Expressions.FieldChain);
             }
             found = this.resolveLikeName(sub);
             if (found && this.isOccurs(node)) {
@@ -29381,14 +29411,17 @@ class ValueBody {
         const fields = new Set();
         for (const s of node.findDirectExpressions(Expressions.FieldAssignment)) {
             field_assignment_1.FieldAssignment.runSyntax(s, input, targetType);
-            const fieldname = (_a = s.findDirectExpression(Expressions.FieldSub)) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase();
-            if (fieldname) {
-                if (fields.has(fieldname)) {
-                    const message = "Duplicate field assignment";
-                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, s.getFirstToken(), message));
-                    return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+            if (node.findDirectExpression(Expressions.ValueBodyLine) === undefined) {
+                // todo: refine, still needs to be checked when there are table lines
+                const fieldname = (_a = s.findDirectExpression(Expressions.FieldSub)) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase();
+                if (fieldname) {
+                    if (fields.has(fieldname)) {
+                        const message = "Duplicate field assignment";
+                        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, s.getFirstToken(), message));
+                        return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+                    }
+                    fields.add(fieldname);
                 }
-                fields.add(fieldname);
             }
         }
         let type = undefined; // todo, this is only correct if there is a single source in the body
@@ -31820,6 +31853,38 @@ exports.FetchNextCursor = FetchNextCursor;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/field_group.js":
+/*!***************************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/field_group.js ***!
+  \***************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.FieldGroup = void 0;
+const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
+const _typed_identifier_1 = __webpack_require__(/*! ../../types/_typed_identifier */ "./node_modules/@abaplint/core/build/src/abap/types/_typed_identifier.js");
+const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
+class FieldGroup {
+    runSyntax(node, input) {
+        const nameExpression = node.findFirstExpression(Expressions.Field);
+        if (nameExpression === undefined) {
+            return;
+        }
+        const name = nameExpression === null || nameExpression === void 0 ? void 0 : nameExpression.concatTokens();
+        if (name === undefined) {
+            return;
+        }
+        const id = new _typed_identifier_1.TypedIdentifier(nameExpression === null || nameExpression === void 0 ? void 0 : nameExpression.getFirstToken(), input.filename, basic_1.VoidType.get("FIELD-GROUP"));
+        input.scope.addIdentifier(id);
+    }
+}
+exports.FieldGroup = FieldGroup;
+//# sourceMappingURL=field_group.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/fieldsymbol.js":
 /*!***************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/fieldsymbol.js ***!
@@ -32401,7 +32466,7 @@ class IncludeType {
         else if (ityp instanceof basic_1.TableType && isStructure) {
             ityp = ityp.getRowType();
         }
-        else if (ityp instanceof basic_1.VoidType) {
+        if (ityp instanceof basic_1.VoidType) {
             return ityp;
         }
         if (!(ityp instanceof basic_1.StructureType)) {
@@ -33448,7 +33513,7 @@ class Parameter {
         }
         const magicName = "%_" + nameToken.getStr() + "_%_app_%";
         const magicToken = new tokens_1.Identifier(nameToken.getStart(), magicName);
-        input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(magicToken, input.filename, basic_1.VoidType.get("PARAMETER magic")));
+        input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(magicToken, input.filename, basic_1.VoidType.get("PARAMETER-MAGIC")));
     }
 }
 exports.Parameter = Parameter;
@@ -35408,6 +35473,8 @@ const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ ".
 const Statements = __webpack_require__(/*! ../../2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
 const Structures = __webpack_require__(/*! ../../3_structures/structures */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/index.js");
 const include_type_1 = __webpack_require__(/*! ../statements/include_type */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/include_type.js");
+const constant_1 = __webpack_require__(/*! ../statements/constant */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/constant.js");
+const constants_1 = __webpack_require__(/*! ./constants */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/structures/constants.js");
 class Data {
     static runSyntax(node, input) {
         var _a;
@@ -35445,46 +35512,6 @@ class Data {
             }
             else if (c instanceof nodes_1.StatementNode && ctyp instanceof Statements.IncludeType) {
                 // INCLUDES
-                /*
-                const typeToken = c.findFirstExpression(Expressions.TypeName)?.getFirstToken();
-                const typeName = typeToken?.getStr();
-        
-                let foundId = input.scope.findType(typeName);
-                if (foundId === undefined) {
-                  foundId = input.scope.findVariable(typeName);
-                }
-        
-                let found = foundId?.getType();
-                if (found === undefined) {
-                  const f = input.scope.getDDIC().lookupTableOrView(typeName).type;
-                  if (f instanceof TypedIdentifier) {
-                    found = f.getType();
-                  } else {
-                    found = f;
-                  }
-                } else {
-                  input.scope.addReference(typeToken, foundId, ReferenceType.TypeReference, input.filename);
-                }
-                if (found instanceof Basic.VoidType) {
-                  if (table === true) {
-                    const ttyp = new Basic.TableType(found, {withHeader: true, keyType: Basic.TableKeyType.default});
-                    return new TypedIdentifier(name, input.filename, ttyp);
-                  } else {
-                    return new TypedIdentifier(name, input.filename, found);
-                  }
-                }
-                if (found instanceof Basic.UnknownType) {
-                  return new TypedIdentifier(name, input.filename, new Basic.UnknownType("unknown type, " + typeName));
-                }
-                if (found instanceof Basic.TableType && found.isWithHeader()) {
-                  found = found.getRowType();
-                }
-                if (!(found instanceof Basic.StructureType)) {
-                  const message = "not structured, " + typeName;
-                  input.issues.push(syntaxIssue(input, typeToken!, message));
-                  return new TypedIdentifier(name, input.filename, Basic.VoidType.get(CheckSyntaxKey));
-                }
-        */
                 const found = new include_type_1.IncludeType().runSyntax(c, input);
                 if (found instanceof Basic.VoidType) {
                     if (table === true) {
@@ -35535,6 +35562,18 @@ class Data {
                     input.scope.addType(found);
                 }
             }
+            else if (c instanceof nodes_1.StatementNode && ctyp instanceof Statements.Constant) {
+                const found = new constant_1.Constant().runSyntax(c, input);
+                if (found) {
+                    input.scope.addIdentifier(found);
+                }
+            }
+            else if (c instanceof nodes_1.StructureNode && ctyp instanceof Structures.Constants) {
+                const { type: found, values: _ } = new constants_1.Constants().runSyntax(c, input);
+                if (found) {
+                    input.scope.addIdentifier(found);
+                }
+            }
         }
     }
 }
@@ -35956,6 +35995,7 @@ const modify_entities_1 = __webpack_require__(/*! ./statements/modify_entities *
 const commit_entities_1 = __webpack_require__(/*! ./statements/commit_entities */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/commit_entities.js");
 const _syntax_input_1 = __webpack_require__(/*! ./_syntax_input */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_syntax_input.js");
 const assert_error_1 = __webpack_require__(/*! ./assert_error */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/assert_error.js");
+const field_group_1 = __webpack_require__(/*! ./statements/field_group */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/field_group.js");
 // -----------------------------------
 const map = {};
 function addToMap(handler) {
@@ -36086,6 +36126,7 @@ if (Object.keys(map).length === 0) {
     addToMap(new translate_1.Translate());
     addToMap(new modify_internal_1.ModifyInternal());
     addToMap(new read_textpool_1.ReadTextpool());
+    addToMap(new field_group_1.FieldGroup());
     addToMap(new editor_call_1.EditorCall());
     addToMap(new delete_memory_1.DeleteMemory());
 }
@@ -54559,7 +54600,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.224";
+        return "2.113.226";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

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