@abaplint/cli 2.103.6 → 2.103.7

package/build/cli.js

@@ -1167,95 +1167,8 @@ exports.Lexer = void 0;
 const position_1 = __webpack_require__(/*! ../../position */ "./node_modules/@abaplint/core/build/src/position.js");
 const virtual_position_1 = __webpack_require__(/*! ../../virtual_position */ "./node_modules/@abaplint/core/build/src/virtual_position.js");
 const tokens_1 = __webpack_require__(/*! ./tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
-class Buffer {
-    constructor() {
-        this.buf = "";
-    }
-    add(s) {
-        this.buf = this.buf + s;
-        return this.buf;
-    }
-    get() {
-        return this.buf;
-    }
-    clear() {
-        this.buf = "";
-    }
-    countIsEven(char) {
-        let count = 0;
-        for (let i = 0; i < this.buf.length; i += 1) {
-            if (this.buf.charAt(i) === char) {
-                count += 1;
-            }
-        }
-        return count % 2 === 0;
-    }
-}
-class Stream {
-    constructor(raw) {
-        this.offset = -1;
-        this.raw = raw;
-        this.row = 0;
-        this.col = 0;
-    }
-    advance() {
-        if (this.currentChar() === "\n") {
-            this.col = 1;
-            this.row = this.row + 1;
-        }
-        if (this.offset === this.raw.length) {
-            return false;
-        }
-        this.col = this.col + 1;
-        this.offset = this.offset + 1;
-        return true;
-    }
-    getCol() {
-        return this.col;
-    }
-    getRow() {
-        return this.row;
-    }
-    prevChar() {
-        if (this.offset - 1 < 0) {
-            return "";
-        }
-        return this.raw.substr(this.offset - 1, 1);
-    }
-    prevPrevChar() {
-        if (this.offset - 2 < 0) {
-            return "";
-        }
-        return this.raw.substr(this.offset - 2, 2);
-    }
-    currentChar() {
-        if (this.offset < 0) {
-            return "\n"; // simulate newline at start of file to handle star(*) comments
-        }
-        else if (this.offset >= this.raw.length) {
-            return "";
-        }
-        return this.raw.substr(this.offset, 1);
-    }
-    nextChar() {
-        if (this.offset + 2 > this.raw.length) {
-            return "";
-        }
-        return this.raw.substr(this.offset + 1, 1);
-    }
-    nextNextChar() {
-        if (this.offset + 3 > this.raw.length) {
-            return this.nextChar();
-        }
-        return this.raw.substr(this.offset + 1, 2);
-    }
-    getRaw() {
-        return this.raw;
-    }
-    getOffset() {
-        return this.offset;
-    }
-}
+const lexer_buffer_1 = __webpack_require__(/*! ./lexer_buffer */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/lexer_buffer.js");
+const lexer_stream_1 = __webpack_require__(/*! ./lexer_stream */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/lexer_stream.js");
 class Lexer {
     constructor() {
         this.ModeNormal = 1;
@@ -1463,8 +1376,8 @@ class Lexer {
         this.buffer.clear();
     }
     process(raw) {
-        this.stream = new Stream(raw.replace(/\r/g, ""));
-        this.buffer = new Buffer();
+        this.stream = new lexer_stream_1.LexerStream(raw.replace(/\r/g, ""));
+        this.buffer = new lexer_buffer_1.LexerBuffer();
         const splits = {};
         splits[" "] = true;
         splits[":"] = true;
@@ -1609,6 +1522,125 @@ exports.Lexer = Lexer;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/abap/1_lexer/lexer_buffer.js":
+/*!****************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/1_lexer/lexer_buffer.js ***!
+  \****************************************************************************/
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.LexerBuffer = void 0;
+class LexerBuffer {
+    constructor() {
+        this.buf = "";
+    }
+    add(s) {
+        this.buf = this.buf + s;
+        return this.buf;
+    }
+    get() {
+        return this.buf;
+    }
+    clear() {
+        this.buf = "";
+    }
+    countIsEven(char) {
+        let count = 0;
+        for (let i = 0; i < this.buf.length; i += 1) {
+            if (this.buf.charAt(i) === char) {
+                count += 1;
+            }
+        }
+        return count % 2 === 0;
+    }
+}
+exports.LexerBuffer = LexerBuffer;
+//# sourceMappingURL=lexer_buffer.js.map
+
+/***/ }),
+
+/***/ "./node_modules/@abaplint/core/build/src/abap/1_lexer/lexer_stream.js":
+/*!****************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/1_lexer/lexer_stream.js ***!
+  \****************************************************************************/
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.LexerStream = void 0;
+class LexerStream {
+    constructor(raw) {
+        this.offset = -1;
+        this.raw = raw;
+        this.row = 0;
+        this.col = 0;
+    }
+    advance() {
+        if (this.currentChar() === "\n") {
+            this.col = 1;
+            this.row = this.row + 1;
+        }
+        if (this.offset === this.raw.length) {
+            return false;
+        }
+        this.col = this.col + 1;
+        this.offset = this.offset + 1;
+        return true;
+    }
+    getCol() {
+        return this.col;
+    }
+    getRow() {
+        return this.row;
+    }
+    prevChar() {
+        if (this.offset - 1 < 0) {
+            return "";
+        }
+        return this.raw.substr(this.offset - 1, 1);
+    }
+    prevPrevChar() {
+        if (this.offset - 2 < 0) {
+            return "";
+        }
+        return this.raw.substr(this.offset - 2, 2);
+    }
+    currentChar() {
+        if (this.offset < 0) {
+            return "\n"; // simulate newline at start of file to handle star(*) comments
+        }
+        else if (this.offset >= this.raw.length) {
+            return "";
+        }
+        return this.raw.substr(this.offset, 1);
+    }
+    nextChar() {
+        if (this.offset + 2 > this.raw.length) {
+            return "";
+        }
+        return this.raw.substr(this.offset + 1, 1);
+    }
+    nextNextChar() {
+        if (this.offset + 3 > this.raw.length) {
+            return this.nextChar();
+        }
+        return this.raw.substr(this.offset + 1, 2);
+    }
+    getRaw() {
+        return this.raw;
+    }
+    getOffset() {
+        return this.offset;
+    }
+}
+exports.LexerStream = LexerStream;
+//# sourceMappingURL=lexer_stream.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/abstract_token.js":
 /*!*************************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/abstract_token.js ***!
@@ -34654,6 +34686,7 @@ __exportStar(__webpack_require__(/*! ./expression_node */ "./node_modules/@abapl
 __exportStar(__webpack_require__(/*! ./statement_node */ "./node_modules/@abaplint/core/build/src/abap/nodes/statement_node.js"), exports);
 __exportStar(__webpack_require__(/*! ./structure_node */ "./node_modules/@abaplint/core/build/src/abap/nodes/structure_node.js"), exports);
 __exportStar(__webpack_require__(/*! ./token_node */ "./node_modules/@abaplint/core/build/src/abap/nodes/token_node.js"), exports);
+__exportStar(__webpack_require__(/*! ./token_node_regex */ "./node_modules/@abaplint/core/build/src/abap/nodes/token_node_regex.js"), exports);
 //# sourceMappingURL=index.js.map
 
 /***/ }),
@@ -35274,7 +35307,7 @@ exports.StructureNode = StructureNode;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.TokenNodeRegex = exports.TokenNode = void 0;
+exports.TokenNode = void 0;
 class TokenNode {
     constructor(token) {
         this.token = token;
@@ -35305,10 +35338,25 @@ class TokenNode {
     }
 }
 exports.TokenNode = TokenNode;
-class TokenNodeRegex extends TokenNode {
+//# sourceMappingURL=token_node.js.map
+
+/***/ }),
+
+/***/ "./node_modules/@abaplint/core/build/src/abap/nodes/token_node_regex.js":
+/*!******************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/nodes/token_node_regex.js ***!
+  \******************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.TokenNodeRegex = void 0;
+const token_node_1 = __webpack_require__(/*! ./token_node */ "./node_modules/@abaplint/core/build/src/abap/nodes/token_node.js");
+class TokenNodeRegex extends token_node_1.TokenNode {
 }
 exports.TokenNodeRegex = TokenNodeRegex;
-//# sourceMappingURL=token_node.js.map
+//# sourceMappingURL=token_node_regex.js.map
 
 /***/ }),
 
@@ -42171,6 +42219,7 @@ class Help {
             switch (node.constructor.name) {
                 case "TokenNode":
                 case "TokenNodeRegex":
+                    // @ts-ignore
                     extra = node.get().constructor.name + ", \"" + node.get().getStr() + "\"";
                     break;
                 case "ExpressionNode":
@@ -50918,7 +50967,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.103.6";
+        return "2.103.7";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -58408,24 +58457,40 @@ ${indentation}    output = ${uniqueName}.\n`;
                 if (cdef && cdef.getMethodDefinitions === undefined) {
                     return undefined; // something wrong
                 }
-                const importing = (_c = cdef === null || cdef === void 0 ? void 0 : cdef.getMethodDefinitions().getByName("CONSTRUCTOR")) === null || _c === void 0 ? void 0 : _c.getParameters().getDefaultImporting();
+                const importing = (_c = this.findConstructor(cdef, spag)) === null || _c === void 0 ? void 0 : _c.getParameters().getDefaultImporting();
                 if (importing) {
                     extra += " EXPORTING " + importing + " = " + source;
                 }
                 else if (spag === undefined) {
-                    extra += " SpagUndefined";
+                    extra += " SpagUndefined ERROR";
                 }
                 else if (cdef === undefined) {
-                    extra += " ClassDefinitionNotFound";
+                    extra += " ClassDefinitionNotFound ERROR";
                 }
                 else {
-                    extra += " SomeError";
+                    extra += " SomeError ERROR";
                 }
             }
         }
         const abap = `CREATE OBJECT ${name}${extra}.`;
         return abap;
     }
+    findConstructor(cdef, spag) {
+        let def = cdef;
+        while (def !== undefined) {
+            const method = def === null || def === void 0 ? void 0 : def.getMethodDefinitions().getByName("CONSTRUCTOR");
+            if (method) {
+                return method;
+            }
+            const name = def.getSuperClass();
+            if (name) {
+                def = spag === null || spag === void 0 ? void 0 : spag.findClassDefinition(name);
+            }
+            else {
+                return undefined;
+            }
+        }
+    }
 }
 exports.Downport = Downport;
 //# sourceMappingURL=downport.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.103.6",
+    "version": "2.103.7",
     "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.6",
+        "@abaplint/core": "^2.103.7",
         "@types/chai": "^4.3.10",
         "@types/glob": "^7.2.0",
         "@types/minimist": "^1.2.5",