@abaplint/core 2.113.182 → 2.113.184

package/build/src/abap/2_statements/expressions/source.js

@@ -29,7 +29,7 @@ class Source extends combi_1.Expression {
         const conv = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("CONV", _1.TypeNameOrInfer, lparenNoSpace, _1.ConvBody, rparenNoSpace, (0, combi_1.optPrio)(after)), version_1.Version.OpenABAP);
         const swit = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("SWITCH", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.SwitchBody, rparenNoSpace, (0, combi_1.optPrio)(after)));
         const value = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("VALUE", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.ValueBody, rparenNoSpace, (0, combi_1.optPrio)(after)), version_1.Version.OpenABAP);
-        const cond = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("COND", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.CondBody, rparenNoSpace, (0, combi_1.optPrio)(after)));
+        const cond = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("COND", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.CondBody, rparenNoSpace, (0, combi_1.optPrio)(after)), version_1.Version.OpenABAP);
         const reff = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("REF", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), Source, (0, combi_1.optPrio)("OPTIONAL"), rparen), version_1.Version.OpenABAP);
         const exact = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("EXACT", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), Source, rparen, (0, combi_1.optPrio)(after)));
         const filter = (0, combi_1.ver)(version_1.Version.v740sp08, (0, combi_1.seq)("FILTER", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.FilterBody, rparen));

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

@@ -11,7 +11,7 @@ class Raise {
         const exporting = (0, combi_1.seq)("EXPORTING", expressions_1.ParameterListS);
         const from = (0, combi_1.seq)("TYPE", expressions_1.ClassName, (0, combi_1.opt)((0, combi_1.alt)((0, combi_1.ver)(version_1.Version.v750, (0, combi_1.alt)(mess, messid)), (0, combi_1.ver)(version_1.Version.v752, "USING MESSAGE"))), (0, combi_1.optPrio)(exporting));
         const pre = (0, combi_1.altPrio)((0, combi_1.seq)((0, combi_1.optPrio)("RESUMABLE"), "EXCEPTION"), "SHORTDUMP");
-        const clas = (0, combi_1.seq)(pre, (0, combi_1.altPrio)(from, (0, combi_1.ver)(version_1.Version.v752, expressions_1.Source), expressions_1.SimpleSource2));
+        const clas = (0, combi_1.seq)(pre, (0, combi_1.altPrio)(from, (0, combi_1.ver)(version_1.Version.v752, expressions_1.Source, version_1.Version.OpenABAP), expressions_1.SimpleSource2));
         const ret = (0, combi_1.seq)("RAISE", (0, combi_1.altPrio)(clas, expressions_1.ExceptionName));
         return ret;
     }

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

@@ -113,7 +113,7 @@ class FieldChain {
                     input.issues.push((0, _syntax_input_1.syntaxIssue)(input, current.getFirstToken(), message));
                     return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
                 }
-                table_expression_1.TableExpression.runSyntax(current, input);
+                table_expression_1.TableExpression.runSyntax(current, input, context);
                 if (!(context instanceof basic_1.VoidType)) {
                     context = context.getRowType();
                 }

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

@@ -1,16 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TableExpression = void 0;
+const nodes_1 = require("../../nodes");
 const Expressions = require("../../2_statements/expressions");
 const source_1 = require("./source");
+const basic_1 = require("../../types/basic");
+const component_chain_1 = require("./component_chain");
 class TableExpression {
-    static runSyntax(node, input) {
+    static runSyntax(node, input, rowType) {
         if (node === undefined) {
             return;
         }
-        for (const s of node.findDirectExpressions(Expressions.Source)) {
+        let context = rowType;
+        if (context instanceof basic_1.TableType) {
+            context = context.getRowType();
+        }
+        if (node.getChildren().length === 3) {
+            const s = node.findDirectExpression(Expressions.Source);
+            source_1.Source.runSyntax(s, input, context);
+        }
+        else if (node.findDirectTokenByText("INDEX")) {
+            const s = node.findDirectExpression(Expressions.Source);
             source_1.Source.runSyntax(s, input);
         }
+        else {
+            let fieldType = undefined;
+            for (const c of node.getChildren()) {
+                if (c instanceof nodes_1.ExpressionNode && c.get() instanceof Expressions.ComponentChainSimple) {
+                    fieldType = component_chain_1.ComponentChain.runSyntax(context, c, input);
+                }
+                else if (c instanceof nodes_1.ExpressionNode && c.get() instanceof Expressions.Source) {
+                    source_1.Source.runSyntax(c, input, fieldType);
+                }
+            }
+        }
     }
 }
 exports.TableExpression = TableExpression;

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

@@ -101,7 +101,7 @@ class Target {
                     input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                     return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
                 }
-                table_expression_1.TableExpression.runSyntax(current, input);
+                table_expression_1.TableExpression.runSyntax(current, input, context);
                 if (!(context instanceof basic_1.VoidType)) {
                     context = context.getRowType();
                 }

package/build/src/abap/5_syntax/statements/include_type.js

@@ -9,15 +9,22 @@ const _syntax_input_1 = require("../_syntax_input");
 const assert_error_1 = require("../assert_error");
 class IncludeType {
     runSyntax(node, input) {
-        var _a, _b;
+        var _a, _b, _c;
         const components = [];
         const iname = node.findFirstExpression(Expressions.TypeName);
         if (iname === undefined) {
             throw new assert_error_1.AssertError("IncludeType, unexpected node structure");
         }
         const name = iname.getFirstToken().getStr();
+        const isStructure = node.findDirectTokenByText("STRUCTURE") !== undefined;
         let ityp = new basic_types_1.BasicTypes(input).parseType(iname);
-        const as = (_a = node.findExpressionAfterToken("AS")) === null || _a === void 0 ? void 0 : _a.concatTokens();
+        if (ityp instanceof basic_1.VoidType && isStructure) {
+            const found = (_a = input.scope.findVariable(name)) === null || _a === void 0 ? void 0 : _a.getType();
+            if (found) {
+                ityp = found;
+            }
+        }
+        const as = (_b = node.findExpressionAfterToken("AS")) === null || _b === void 0 ? void 0 : _b.concatTokens();
         if (as && ityp instanceof basic_1.StructureType) {
             ityp = new basic_1.StructureType(ityp.getComponents().concat([{
                     name: as,
@@ -25,7 +32,18 @@ class IncludeType {
                     asInclude: true,
                 }]));
         }
-        const suffix = (_b = node.findExpressionAfterToken("SUFFIX")) === null || _b === void 0 ? void 0 : _b.concatTokens();
+        else if (ityp instanceof basic_1.TableType && isStructure) {
+            ityp = ityp.getRowType();
+        }
+        else if (ityp instanceof basic_1.VoidType) {
+            return ityp;
+        }
+        if (!(ityp instanceof basic_1.StructureType)) {
+            const message = "not structured, " + name;
+            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, iname.getFirstToken(), message));
+            return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+        }
+        const suffix = (_c = node.findExpressionAfterToken("SUFFIX")) === null || _c === void 0 ? void 0 : _c.concatTokens();
         if (suffix && ityp instanceof basic_1.StructureType) {
             const components = [];
             for (const c of ityp.getComponents()) {

package/build/src/abap/5_syntax/structures/data.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Data = void 0;
-const _syntax_input_1 = require("../_syntax_input");
 const data_1 = require("../statements/data");
-const _reference_1 = require("../_reference");
 const nodes_1 = require("../../nodes");
 const type_1 = require("../statements/type");
 const _typed_identifier_1 = require("../../types/_typed_identifier");
@@ -12,9 +10,10 @@ const Basic = require("../../types/basic");
 const Expressions = require("../../2_statements/expressions");
 const Statements = require("../../2_statements/statements");
 const Structures = require("../../3_structures/structures");
+const include_type_1 = require("../statements/include_type");
 class Data {
     static runSyntax(node, input) {
-        var _a, _b;
+        var _a;
         const fouth = (_a = node.getFirstChild()) === null || _a === void 0 ? void 0 : _a.getChildren()[3];
         const isCommonPart = fouth instanceof nodes_1.TokenNode && fouth.concatTokens() === "COMMON";
         if (isCommonPart) {
@@ -49,25 +48,47 @@ class Data {
             }
             else if (c instanceof nodes_1.StatementNode && ctyp instanceof Statements.IncludeType) {
                 // INCLUDES
-                const typeToken = (_b = c.findFirstExpression(Expressions.TypeName)) === null || _b === void 0 ? void 0 : _b.getFirstToken();
-                const typeName = typeToken === null || typeToken === void 0 ? void 0 : typeToken.getStr();
+                /*
+                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);
+                  foundId = input.scope.findVariable(typeName);
                 }
-                let found = foundId === null || foundId === void 0 ? void 0 : foundId.getType();
+        
+                let found = foundId?.getType();
                 if (found === undefined) {
-                    const f = input.scope.getDDIC().lookupTableOrView(typeName).type;
-                    if (f instanceof _typed_identifier_1.TypedIdentifier) {
-                        found = f.getType();
-                    }
-                    else {
-                        found = f;
-                    }
+                  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();
                 }
-                else {
-                    input.scope.addReference(typeToken, foundId, _reference_1.ReferenceType.TypeReference, input.filename);
+                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) {
                         const ttyp = new Basic.TableType(found, { withHeader: true, keyType: Basic.TableKeyType.default });
@@ -77,18 +98,7 @@ class Data {
                         return new _typed_identifier_1.TypedIdentifier(name, input.filename, found);
                     }
                 }
-                if (found instanceof Basic.UnknownType) {
-                    return new _typed_identifier_1.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((0, _syntax_input_1.syntaxIssue)(input, typeToken, message));
-                    return new _typed_identifier_1.TypedIdentifier(name, input.filename, Basic.VoidType.get(_syntax_input_1.CheckSyntaxKey));
-                }
-                for (const c of found.getComponents()) {
+                for (const c of found) {
                     components.push(c);
                 }
             }

package/build/src/registry.js

@@ -67,7 +67,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.182";
+        return "2.113.184";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/build/src/rules/downport.js

@@ -2858,6 +2858,9 @@ ${indentation}    output = ${uniqueName}.\n`;
     }
     replaceLineFunctions(node, lowFile, highSyntax, highFile) {
         var _a, _b;
+        if (this.lowReg.getConfig().getVersion() === version_1.Version.OpenABAP) {
+            return undefined;
+        }
         const spag = highSyntax.spaghetti.lookupPosition(node.getFirstToken().getStart(), lowFile.getFilename());
         for (const r of (spag === null || spag === void 0 ? void 0 : spag.getData().references) || []) {
             if (r.referenceType !== _reference_1.ReferenceType.BuiltinMethodReference) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.113.182",
+    "version": "2.113.184",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",