@abaplint/transpiler 2.11.24 → 2.11.26

package/build/src/expressions/compare.js

@@ -85,7 +85,7 @@ class CompareTranspiler {
         const chain = node.findDirectExpression(core_1.Expressions.MethodCallChain);
         if (chain) {
             const name = chain.getFirstToken().getStr();
-            if (new core_1.BuiltIn().isPredicate(name)) {
+            if (core_1.BuiltIn.isPredicate(name)) {
                 // todo, this is not completely correct if there is a method shadowing the name
                 return new chunk_1.Chunk().appendString(`abap.compare.eq(` + traversal.traverse(chain).getCode() + `, abap.builtin.abap_true)`);
             }

package/build/src/expressions/index.d.ts

@@ -24,6 +24,7 @@ export * from "./message_number";
 export * from "./method_call_body";
 export * from "./method_call_chain";
 export * from "./method_call_param";
+export * from "./new_object";
 export * from "./method_call";
 export * from "./method_parameters";
 export * from "./method_source";

package/build/src/expressions/index.js

@@ -40,6 +40,7 @@ __exportStar(require("./message_number"), exports);
 __exportStar(require("./method_call_body"), exports);
 __exportStar(require("./method_call_chain"), exports);
 __exportStar(require("./method_call_param"), exports);
+__exportStar(require("./new_object"), exports);
 __exportStar(require("./method_call"), exports);
 __exportStar(require("./method_parameters"), exports);
 __exportStar(require("./method_source"), exports);

package/build/src/expressions/method_call_chain.js

@@ -26,6 +26,9 @@ class MethodCallChainTranspiler {
             else if (c instanceof core_1.Nodes.ExpressionNode && c.get() instanceof core_1.Expressions.FieldChain) {
                 ret.appendChunk(traversal.traverse(c));
             }
+            else if (c instanceof core_1.Nodes.ExpressionNode && c.get() instanceof core_1.Expressions.NewObject) {
+                ret.appendChunk(traversal.traverse(c));
+            }
             else if (c instanceof core_1.Nodes.ExpressionNode && c.get() instanceof core_1.Expressions.ClassName) {
                 ret = new chunk_1.Chunk().append(traversal.lookupClassOrInterface(c.getFirstToken().getStr(), c.getFirstToken()), c, traversal);
             }

package/build/src/expressions/new_object.d.ts

@@ -0,0 +1,8 @@
+import { Nodes } from "@abaplint/core";
+import { IExpressionTranspiler } from "./_expression_transpiler";
+import { Traversal } from "../traversal";
+import { Chunk } from "../chunk";
+export declare class NewObjectTranspiler implements IExpressionTranspiler {
+    transpile(node: Nodes.ExpressionNode, traversal: Traversal): Chunk;
+    private findConstructor;
+}

package/build/src/expressions/new_object.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NewObjectTranspiler = void 0;
+const core_1 = require("@abaplint/core");
+const abaplint = require("@abaplint/core");
+const chunk_1 = require("../chunk");
+const type_name_or_infer_1 = require("./type_name_or_infer");
+const transpile_types_1 = require("../transpile_types");
+class NewObjectTranspiler {
+    transpile(node, traversal) {
+        const ret = new chunk_1.Chunk();
+        const typeNameOrInfer = node.findDirectExpression(core_1.Expressions.TypeNameOrInfer);
+        if (typeNameOrInfer === undefined) {
+            throw new Error("NewObjectTranspiler: TypeNameOrInfer not found");
+        }
+        let para = "";
+        const parameters = node.findFirstExpression(abaplint.Expressions.ParameterListS);
+        if (parameters) {
+            para = traversal.traverse(parameters).getCode();
+        }
+        const type = new type_name_or_infer_1.TypeNameOrInfer().findType(typeNameOrInfer, traversal);
+        if (type instanceof abaplint.BasicTypes.ObjectReferenceType) {
+            if (node.getChildren()[3].get() instanceof abaplint.Expressions.Source) {
+                // single default parameter
+                const scope = traversal.findCurrentScopeByToken(typeNameOrInfer.getFirstToken());
+                const cdef = traversal.findClassDefinition(type.getIdentifierName(), scope);
+                const constr = this.findConstructor(cdef, scope);
+                const pname = constr?.getParameters().getDefaultImporting()?.toLowerCase();
+                para = `{${pname}: ${traversal.traverse(node.getChildren()[3]).getCode()}}`;
+            }
+            const clas = traversal.lookupClassOrInterface(type.getIdentifierName(), node.getFirstToken());
+            ret.appendString(transpile_types_1.TranspileTypes.toType(type) + ".set(await (new " + clas + "()).constructor_(" + para + "))");
+        }
+        else {
+            throw new Error("NewObjectTranspiler: only ObjectReferenceType currently handled, todo");
+        }
+        return ret;
+    }
+    findConstructor(cdef, spag) {
+        let def = cdef;
+        while (def !== undefined) {
+            const method = def?.getMethodDefinitions().getByName("CONSTRUCTOR");
+            if (method) {
+                return method;
+            }
+            const name = def.getSuperClass();
+            if (name) {
+                def = spag?.findClassDefinition(name);
+            }
+            else {
+                return undefined;
+            }
+        }
+    }
+}
+exports.NewObjectTranspiler = NewObjectTranspiler;
+//# sourceMappingURL=new_object.js.map

package/build/src/expressions/source.js

@@ -103,6 +103,10 @@ class SourceTranspiler {
                 ret.append("abap.builtin.boolc(", c, traversal);
                 post.append(")", c, traversal);
             }
+            else if (c instanceof core_1.Nodes.TokenNodeRegex && c.getFirstToken().getStr().toUpperCase() === "XSDBOOL") {
+                ret.append("abap.builtin.xsdbool(", c, traversal);
+                post.append(")", c, traversal);
+            }
             else if (c instanceof core_1.Nodes.TokenNode && c.getFirstToken().getStr().toUpperCase() === "VALUE") {
                 const typ = node.findDirectExpression(core_1.Expressions.TypeNameOrInfer);
                 if (typ === undefined) {

package/build/src/expressions/type_name_or_infer.js

@@ -5,14 +5,15 @@ const chunk_1 = require("../chunk");
 const transpile_types_1 = require("../transpile_types");
 class TypeNameOrInfer {
     findType(node, traversal) {
-        let type;
+        //    let type: AbstractType | undefined;
         const scope = traversal.findCurrentScopeByToken(node.getFirstToken());
-        if (node.concatTokens() === "#") {
-            type = traversal.lookupInferred(node, scope);
-        }
-        else {
-            type = traversal.lookupType(node.getFirstChild(), scope);
-        }
+        //    if (node.concatTokens() === "#") {
+        const type = traversal.lookupInferred(node, scope);
+        /*
+      } else {
+        type = traversal.lookupType(node.getFirstChild() as Nodes.ExpressionNode, scope);
+      }
+        */
         if (type === undefined) {
             throw new Error("TypeNameOrInfer, type not found: " + node.concatTokens());
         }

package/build/src/traversal.js

@@ -604,6 +604,7 @@ this.INTERNAL_ID = abap.internalIdCounter++;\n`;
         }
         return ret;
     }
+    // todo: delete this method?
     lookupType(node, scope) {
         if (scope === undefined) {
             return undefined;
@@ -673,9 +674,10 @@ this.INTERNAL_ID = abap.internalIdCounter++;\n`;
     lookupInferred(node, scope) {
         if (scope === undefined) {
             return undefined;
-        }
-        else if (node.concatTokens() !== "#") {
+            /*
+          } else if (node.concatTokens() !== "#") {
             throw new Error("lookupInferred, unexpected, " + node.get());
+            */
         }
         return this.findInferredTypeReference(node.getFirstToken());
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.11.24",
+  "version": "2.11.26",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -29,7 +29,7 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.113.168",
+    "@abaplint/core": "^2.113.172",
     "source-map": "^0.7.6"
   },
   "devDependencies": {