@abaplint/transpiler 2.10.13 → 2.10.15

package/build/src/index.js

@@ -5,7 +5,6 @@ const abaplint = require("@abaplint/core");
 const validation_1 = require("./validation");
 Object.defineProperty(exports, "config", { enumerable: true, get: function () { return validation_1.config; } });
 const unit_test_1 = require("./unit_test");
-const keywords_1 = require("./keywords");
 const types_1 = require("./types");
 Object.defineProperty(exports, "UnknownTypesEnum", { enumerable: true, get: function () { return types_1.UnknownTypesEnum; } });
 const db_1 = require("./db");
@@ -39,7 +38,6 @@ class Transpiler {
     }
     async run(reg, progress) {
         reg.parse();
-        new keywords_1.Keywords(this.options?.keywords).handle(reg);
         this.validate(reg);
         const dbSetup = new db_1.DatabaseSetup(reg).run(this.options);
         const output = {

package/build/src/keywords.d.ts

@@ -1,10 +1 @@
-import * as abaplint from "@abaplint/core";
 export declare const DEFAULT_KEYWORDS: string[];
-/** Replaces javascript keywords in ABAP source code, in-memory only */
-export declare class Keywords {
-    private readonly keywords;
-    constructor(keywords?: string[]);
-    handle(reg: abaplint.IRegistry): void;
-    private handleMacro;
-    private traverse;
-}

package/build/src/keywords.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Keywords = exports.DEFAULT_KEYWORDS = void 0;
-const abaplint = require("@abaplint/core");
+exports.DEFAULT_KEYWORDS = void 0;
 // https://www.w3schools.com/js/js_reserved.asp
 exports.DEFAULT_KEYWORDS = [
     "abstract", "arguments", "await",
@@ -20,96 +19,8 @@ exports.DEFAULT_KEYWORDS = [
     "switch", "synchronized", "this",
     "throw", "throws", "transient", "true",
     "try", "typeof", "var", "void",
+    "delete",
     "volatile", "while", "yield"
 ];
 // "with"
-// "delete"
-/** Replaces javascript keywords in ABAP source code, in-memory only */
-class Keywords {
-    constructor(keywords) {
-        this.keywords = [];
-        if (keywords !== undefined) {
-            this.keywords = keywords;
-        }
-        else {
-            this.keywords = exports.DEFAULT_KEYWORDS;
-        }
-    }
-    handle(reg) {
-        if (this.keywords.length === 0) {
-            return;
-        }
-        reg.parse();
-        for (const o of reg.getObjects()) {
-            if (!(o instanceof abaplint.ABAPObject)) {
-                continue;
-            }
-            for (const f of o.getABAPFiles()) {
-                const tokens = [];
-                for (const s of f.getStatements()) {
-                    if (s.get() instanceof abaplint.MacroCall) {
-                        tokens.push(...this.handleMacro(s));
-                    }
-                    else {
-                        tokens.push(...this.traverse(s, f));
-                    }
-                }
-                if (tokens.length === 0) {
-                    continue;
-                }
-                const rows = f.getRawRows();
-                for (const t of tokens.reverse()) {
-                    const original = rows[t.getRow() - 1];
-                    const index = t.getEnd().getCol() - 1;
-                    rows[t.getRow() - 1] = original.substring(0, index) + "_" + original.substring(index);
-                }
-                reg.updateFile(new abaplint.MemoryFile(f.getFilename(), rows.join("\n")));
-            }
-        }
-        reg.parse();
-    }
-    handleMacro(node) {
-        const tokens = [];
-        for (const token of node.getTokens()) {
-            for (const k of this.keywords) {
-                const lower = token.getStr().toLowerCase();
-                if (k === lower
-                    || "!" + k === lower
-                    || lower.endsWith("~" + k)) {
-                    tokens.push(token);
-                }
-            }
-        }
-        return tokens;
-    }
-    traverse(node, file) {
-        const ret = [];
-        for (const c of node.getChildren()) {
-            if (c instanceof abaplint.Nodes.TokenNodeRegex) {
-                const token = c.getFirstToken();
-                const start = token.getStart();
-                if (start instanceof abaplint.VirtualPosition) {
-                    continue;
-                }
-                for (const k of this.keywords) {
-                    const lower = token.getStr().toLowerCase();
-                    if (k === lower
-                        || "!" + k === lower
-                        || lower.endsWith("~" + k)) {
-                        ret.push(token);
-                        break;
-                    }
-                }
-            }
-            else if (c instanceof abaplint.Nodes.TokenNode) {
-                continue;
-            }
-            else {
-                ret.push(...this.traverse(c, file));
-            }
-        }
-        return ret;
-    }
-}
-exports.Keywords = Keywords;
 //# sourceMappingURL=keywords.js.map

package/build/src/statements/data.js

@@ -26,7 +26,7 @@ class DataTranspiler {
             value = "\n" + traversal.setValues(found, found.getName());
         }
         else {
-            value = DataTranspiler.buildValue(node, found.getName().toLowerCase(), traversal);
+            value = DataTranspiler.buildValue(node, traversal_1.Traversal.prefixVariable(found.getName().toLowerCase()), traversal);
         }
         const ret = new chunk_1.Chunk()
             .appendString("let ")

package/build/src/traversal.js

@@ -585,7 +585,7 @@ class Traversal {
                 }
             }
         };
-        handle(val, name);
+        handle(val, Traversal.prefixVariable(name));
         return ret;
     }
     buildInternalName(name, def) {

package/build/src/validation.js

@@ -2,14 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Validation = exports.config = void 0;
 const core_1 = require("@abaplint/core");
-const keywords_1 = require("./keywords");
 const types_1 = require("./types");
 exports.config = {
     "global": {
         "files": "/**/*.*",
-        "skipGeneratedGatewayClasses": true,
-        "skipGeneratedPersistentClasses": true,
-        "skipGeneratedFunctionGroups": true,
     },
     "syntax": {
         "version": core_1.Version.OpenABAP,
@@ -119,18 +115,6 @@ class Validation {
             exports.config.rules["check_syntax"] = true;
         }
         exports.config.rules["forbidden_identifier"]["check"] = ["^unique\\d+$"];
-        if (this.options?.keywords === undefined) {
-            for (const d of keywords_1.DEFAULT_KEYWORDS) {
-                const add = "^" + d + "$";
-                exports.config.rules["forbidden_identifier"]["check"].push(add);
-            }
-        }
-        else {
-            for (const d of this.options.keywords) {
-                const add = "^" + d + "$";
-                exports.config.rules["forbidden_identifier"]["check"].push(add);
-            }
-        }
         if (this.options?.unknownTypes === types_1.UnknownTypesEnum.runtimeError) {
             // this is not a constant, just a regex that happens to not match anything
             exports.config.syntax.errorNamespace = "VOID_EVERYTHING";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.10.13",
+  "version": "2.10.15",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",