@abaplint/transpiler 2.5.76 → 2.5.77

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/build/src/statements/call.d.ts +1 -0
  2. package/build/src/statements/call.js +42 -29
  3. package/package.json +2 -2
package/build/src/statements/call.d.ts CHANGED
@@ -4,4 +4,5 @@ import { Traversal } from "../traversal";
4
4
  import { Chunk } from "../chunk";
5
5
  export declare class CallTranspiler implements IStatementTranspiler {
6
6
  transpile(node: abaplint.Nodes.StatementNode, traversal: Traversal): Chunk;
7
+ private buildExceptions;
7
8
  }
package/build/src/statements/call.js CHANGED
@@ -6,7 +6,7 @@ const chunk_1 = require("../chunk");
6
6
  const expressions_1 = require("../expressions");
7
7
  class CallTranspiler {
8
8
  transpile(node, traversal) {
9
- var _a, _b, _c, _d, _e;
9
+ var _a, _b, _c, _d;
10
10
  const chain = node.findDirectExpression(abaplint.Expressions.MethodCallChain);
11
11
  if (chain) {
12
12
  let pre = "";
@@ -16,34 +16,12 @@ class CallTranspiler {
16
16
  pre = traversal.traverse(receiving).getCode() + ".set(";
17
17
  post = ")";
18
18
  }
19
+ post += ";";
19
20
  const exceptions = node.findFirstExpression(abaplint.Expressions.ParameterListExceptions);
20
21
  if (exceptions) {
21
- pre = "try {\n" + pre;
22
- }
23
- post += ";";
24
- if (exceptions) {
25
- post += `\nabap.builtin.sy.get().subrc.set(0);
26
- } catch (e) {
27
- if (e.classic) {
28
- switch (e.classic.toUpperCase()) {\n`;
29
- for (const e of exceptions.findAllExpressions(abaplint.Expressions.ParameterException)) {
30
- const name = e.getFirstToken().getStr().toUpperCase();
31
- const value = (_c = e.findFirstExpression(abaplint.Expressions.SimpleName)) === null || _c === void 0 ? void 0 : _c.getFirstToken().getStr().toUpperCase();
32
- if (value === undefined) {
33
- continue;
34
- }
35
- if (name === "OTHERS") {
36
- post += `default: abap.builtin.sy.get().subrc.set(${value}); break;\n`;
37
- }
38
- else {
39
- post += `case "${name}": abap.builtin.sy.get().subrc.set(${value}); break;\n`;
40
- }
41
- }
42
- post += ` }
43
- } else {
44
- throw e;
45
- }
46
- }`;
22
+ const build = this.buildExceptions(exceptions);
23
+ pre = build.pre + pre;
24
+ post += build.post;
47
25
  }
48
26
  const chainChunk = traversal.traverse(chain);
49
27
  let chainCode = chainChunk.getCode();
@@ -59,7 +37,7 @@ if (e.classic) {
59
37
  const methodSource = node.findDirectExpression(abaplint.Expressions.MethodSource);
60
38
  if (methodSource) {
61
39
  let body = "";
62
- const nameToken = (_d = methodSource.getLastChild()) === null || _d === void 0 ? void 0 : _d.getFirstToken();
40
+ const nameToken = (_c = methodSource.getLastChild()) === null || _c === void 0 ? void 0 : _c.getFirstToken();
63
41
  const m = nameToken ? traversal.findMethodReference(nameToken, traversal.findCurrentScopeByToken(nameToken)) : undefined;
64
42
  const methodCallBody = node.findDirectExpression(abaplint.Expressions.MethodCallBody);
65
43
  if (methodCallBody) {
@@ -67,12 +45,18 @@ if (e.classic) {
67
45
  }
68
46
  let pre = "";
69
47
  let post = "";
70
- const receiving = (_e = node.findFirstExpression(abaplint.Expressions.MethodParameters)) === null || _e === void 0 ? void 0 : _e.findExpressionAfterToken("RECEIVING");
48
+ const receiving = (_d = node.findFirstExpression(abaplint.Expressions.MethodParameters)) === null || _d === void 0 ? void 0 : _d.findExpressionAfterToken("RECEIVING");
71
49
  if (receiving) {
72
50
  const target = traversal.traverse(receiving.findDirectExpression(abaplint.Expressions.Target));
73
51
  pre = target.getCode() + ".set(";
74
52
  post = ")";
75
53
  }
54
+ const exceptions = node.findFirstExpression(abaplint.Expressions.ParameterListExceptions);
55
+ if (exceptions) {
56
+ const build = this.buildExceptions(exceptions);
57
+ pre = build.pre + pre;
58
+ post += build.post;
59
+ }
76
60
  let ms = new expressions_1.MethodSourceTranspiler(pre).transpile(methodSource, traversal).getCode();
77
61
  if (ms === "await super.get().constructor") {
78
62
  // semantics of constructors in JS vs ABAP is different, so the "constructor_" has been introduced,
@@ -85,6 +69,35 @@ if (e.classic) {
85
69
  }
86
70
  throw new Error("CallTranspiler, todo");
87
71
  }
72
+ buildExceptions(node) {
73
+ var _a;
74
+ let pre = "";
75
+ let post = "";
76
+ pre = "try {\n" + pre;
77
+ post += `\nabap.builtin.sy.get().subrc.set(0);
78
+ } catch (e) {
79
+ if (e.classic) {
80
+ switch (e.classic.toUpperCase()) {\n`;
81
+ for (const e of node.findAllExpressions(abaplint.Expressions.ParameterException)) {
82
+ const name = e.getFirstToken().getStr().toUpperCase();
83
+ const value = (_a = e.findFirstExpression(abaplint.Expressions.SimpleName)) === null || _a === void 0 ? void 0 : _a.getFirstToken().getStr().toUpperCase();
84
+ if (value === undefined) {
85
+ continue;
86
+ }
87
+ if (name === "OTHERS") {
88
+ post += `default: abap.builtin.sy.get().subrc.set(${value}); break;\n`;
89
+ }
90
+ else {
91
+ post += `case "${name}": abap.builtin.sy.get().subrc.set(${value}); break;\n`;
92
+ }
93
+ }
94
+ post += ` }
95
+ } else {
96
+ throw e;
97
+ }
98
+ }`;
99
+ return { pre, post };
100
+ }
88
101
  }
89
102
  exports.CallTranspiler = CallTranspiler;
90
103
  //# sourceMappingURL=call.js.map
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@abaplint/transpiler",
3
- "version": "2.5.76",
3
+ "version": "2.5.77",
4
4
  "description": "Transpiler",
5
5
  "main": "build/src/index.js",
6
6
  "typings": "build/src/index.d.ts",
@@ -28,7 +28,7 @@
28
28
  "author": "abaplint",
29
29
  "license": "MIT",
30
30
  "dependencies": {
31
- "@abaplint/core": "^2.97.4",
31
+ "@abaplint/core": "^2.97.5",
32
32
  "source-map": "^0.7.4"
33
33
  },
34
34
  "devDependencies": {