@abaplint/transpiler 2.10.32 → 2.10.34

package/build/src/expressions/method_source.js

@@ -45,7 +45,7 @@ class MethodSourceTranspiler {
             }
             else if (child.get() instanceof core_1.Expressions.Dynamic) {
                 const second = child.getChildren()[1];
-                const lookupException = traversal.lookupClassOrInterface("'CX_SY_DYN_CALL_ILLEGAL_METHOD'", child.getFirstToken(), true);
+                //        const lookupException = traversal.lookupClassOrInterface("'CX_SY_DYN_CALL_ILLEGAL_METHOD'", child.getFirstToken(), true);
                 if (second.get() instanceof core_1.Expressions.FieldChain && second instanceof core_1.Nodes.ExpressionNode) {
                     if (call.endsWith(".")) {
                         call = call.substring(0, call.length - 1);
@@ -56,19 +56,22 @@ class MethodSourceTranspiler {
                     call = `abap.dynamicCallLookup(${call}, ${traversal.traverse(second).getCode()})`;
                 }
                 else if (second.get() instanceof core_1.Expressions.Constant) {
-                    if (call === "") {
-                        call = "this.";
+                    if (call.endsWith(".")) {
+                        call = call.substring(0, call.length - 1);
                     }
-                    else if (call.endsWith(".") === false) {
-                        call += ".";
+                    if (call === "") {
+                        call = "this";
                     }
-                    call += second.getFirstToken().getStr().replace(/[\'\`]/g, "").toLowerCase().replace("~", "$").trimEnd();
+                    const methodName = second.getFirstToken().getStr().replace(/[\'\`]/g, "").toLowerCase().replace("~", "$").trimEnd();
+                    call = `abap.dynamicCallLookup(${call}, "${methodName}")`;
                 }
                 else {
                     ret.appendString("MethodSourceTranspiler-Unexpected");
                 }
+                /*
                 ret.appendString(`if (${call} === undefined && ${lookupException} === undefined) { throw "CX_SY_DYN_CALL_ILLEGAL_METHOD not found"; }\n`);
                 ret.appendString(`if (${call} === undefined) { throw new ${lookupException}(); }\n`);
+                */
             }
             else if (child.get() instanceof core_1.Expressions.MethodName
                 || child.get() instanceof core_1.Expressions.AttributeName) {

package/build/src/statements/class_implementation.js

@@ -23,7 +23,6 @@ static INTERNAL_TYPE = 'CLAS';
 static INTERNAL_NAME = '${traversal.buildInternalName(token.getStr(), def)}';
 static IMPLEMENTED_INTERFACES = [${this.findImplementedByClass(traversal, def, scope).map(e => `"` + e.toUpperCase() + `"`).join(",")}];
 static ATTRIBUTES = {${traversal.buildAttributes(def, scope).join(",\n")}};
-static FRIENDS_ACCESS_STATIC = {}; // todo
 static METHODS = {${traversal.buildMethods(def, scope).join(",\n")}};`, node, traversal);
     }
     findImplementedInterface(traversal, def, scope) {

package/build/src/structures/class_definition.js

@@ -25,7 +25,6 @@ class ${className?.toLowerCase()} {
   static IMPLEMENTED_INTERFACES = [];
   static INTERNAL_NAME = 'ABSTRACT_CLASS_INTERNAL_NAME';
   static ATTRIBUTES = {};
-  static FRIENDS_ACCESS_STATIC = {};
   async constructor_() {
     this.me = new abap.types.ABAPObject();
     this.me.set(this);

package/build/src/unit_test.js

@@ -224,16 +224,20 @@ async function run() {
                     ret += `  meth.skip();\n`;
                     continue;
                 }
+                const callSpecial = (name) => {
+                    let ret = "";
+                    ret += `        if (test.${name}) await test.${name}();\n`;
+                    ret += `        if (test.FRIENDS_ACCESS_INSTANCE.${name}) await test.FRIENDS_ACCESS_INSTANCE.${name}();\n`;
+                    ret += `        if (test.FRIENDS_ACCESS_INSTANCE.SUPER && test.FRIENDS_ACCESS_INSTANCE.SUPER.${name}) await test.FRIENDS_ACCESS_INSTANCE.SUPER.${name}();\n`;
+                    return ret;
+                };
                 ret += `      {\n        const test = await (new ${lc}()).constructor_();\n`;
-                // todo, some refactoring here,
-                ret += `        if (test.setup) await test.setup();\n`;
-                ret += `        if (test.FRIENDS_ACCESS_INSTANCE.setup) await test.FRIENDS_ACCESS_INSTANCE.setup();\n`;
-                ret += `        if (test.FRIENDS_ACCESS_INSTANCE.SUPER && test.FRIENDS_ACCESS_INSTANCE.SUPER.setup) await test.FRIENDS_ACCESS_INSTANCE.SUPER.setup();\n`;
+                ret += callSpecial("setup");
                 ret += `        console.log("${st.obj.getName()}: running ${lc}->${m}");\n`;
                 ret += `        meth = locl.addMethod("${m}");\n`;
                 ret += `        await test.FRIENDS_ACCESS_INSTANCE.${m}();\n`;
                 ret += `        meth.pass();\n`;
-                ret += `        if (test.teardown) await test.teardown();\n`;
+                ret += callSpecial("teardown");
                 ret += `      }\n`;
             }
             ret += `      if (${lc}.class_teardown) await ${lc}.class_teardown();\n`;

package/package.json

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